lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 301/346] IB/mlx4: Fix code indentation in QP1 MAD flow
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jack Morgenstein <jackm@dev.mellanox.co.il>

    commit baa0be7026e2f7d1d40bfd45909044169e9e3c68 upstream.

    The indentation in the QP1 GRH flow in procedure build_mlx_header is
    really confusing. Fix it, in preparation for a commit which touches
    this code.

    Fixes: 1ffeb2eb8be9 ("IB/mlx4: SR-IOV IB context objects and proxy/tunnel SQP support")
    Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
    Signed-off-by: Leon Romanovsky <leon@kernel.org>
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/infiniband/hw/mlx4/qp.c | 36 +++++++++++++++++++-----------------
    1 file changed, 19 insertions(+), 17 deletions(-)

    --- a/drivers/infiniband/hw/mlx4/qp.c
    +++ b/drivers/infiniband/hw/mlx4/qp.c
    @@ -2149,24 +2149,26 @@ static int build_mlx_header(struct mlx4_
    sqp->ud_header.grh.flow_label =
    ah->av.ib.sl_tclass_flowlabel & cpu_to_be32(0xfffff);
    sqp->ud_header.grh.hop_limit = ah->av.ib.hop_limit;
    - if (is_eth)
    + if (is_eth) {
    memcpy(sqp->ud_header.grh.source_gid.raw, sgid.raw, 16);
    - else {
    - if (mlx4_is_mfunc(to_mdev(ib_dev)->dev)) {
    - /* When multi-function is enabled, the ib_core gid
    - * indexes don't necessarily match the hw ones, so
    - * we must use our own cache */
    - sqp->ud_header.grh.source_gid.global.subnet_prefix =
    - to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1].
    - subnet_prefix;
    - sqp->ud_header.grh.source_gid.global.interface_id =
    - to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1].
    - guid_cache[ah->av.ib.gid_index];
    - } else
    - ib_get_cached_gid(ib_dev,
    - be32_to_cpu(ah->av.ib.port_pd) >> 24,
    - ah->av.ib.gid_index,
    - &sqp->ud_header.grh.source_gid);
    + } else {
    + if (mlx4_is_mfunc(to_mdev(ib_dev)->dev)) {
    + /* When multi-function is enabled, the ib_core gid
    + * indexes don't necessarily match the hw ones, so
    + * we must use our own cache
    + */
    + sqp->ud_header.grh.source_gid.global.subnet_prefix =
    + to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1].
    + subnet_prefix;
    + sqp->ud_header.grh.source_gid.global.interface_id =
    + to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1].
    + guid_cache[ah->av.ib.gid_index];
    + } else {
    + ib_get_cached_gid(ib_dev,
    + be32_to_cpu(ah->av.ib.port_pd) >> 24,
    + ah->av.ib.gid_index,
    + &sqp->ud_header.grh.source_gid);
    + }
    }
    memcpy(sqp->ud_header.grh.destination_gid.raw,
    ah->av.ib.dgid, 16);
    \
     
     \ /
      Last update: 2016-11-14 04:25    [W:4.587 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site