Commit 061a9f3e authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Greg Kroah-Hartman

IB/mlx4: Fix code indentation in QP1 MAD flow

commit baa0be70 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: 1ffeb2eb ("IB/mlx4: SR-IOV IB context objects and proxy/tunnel SQP support")
Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5626aff4
...@@ -2331,24 +2331,26 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_ud_wr *wr, ...@@ -2331,24 +2331,26 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_ud_wr *wr,
sqp->ud_header.grh.flow_label = sqp->ud_header.grh.flow_label =
ah->av.ib.sl_tclass_flowlabel & cpu_to_be32(0xfffff); ah->av.ib.sl_tclass_flowlabel & cpu_to_be32(0xfffff);
sqp->ud_header.grh.hop_limit = ah->av.ib.hop_limit; 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); memcpy(sqp->ud_header.grh.source_gid.raw, sgid.raw, 16);
else { } else {
if (mlx4_is_mfunc(to_mdev(ib_dev)->dev)) { if (mlx4_is_mfunc(to_mdev(ib_dev)->dev)) {
/* When multi-function is enabled, the ib_core gid /* When multi-function is enabled, the ib_core gid
* indexes don't necessarily match the hw ones, so * indexes don't necessarily match the hw ones, so
* we must use our own cache */ * 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]. sqp->ud_header.grh.source_gid.global.subnet_prefix =
subnet_prefix; to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1].
sqp->ud_header.grh.source_gid.global.interface_id = subnet_prefix;
to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1]. sqp->ud_header.grh.source_gid.global.interface_id =
guid_cache[ah->av.ib.gid_index]; to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1].
} else guid_cache[ah->av.ib.gid_index];
ib_get_cached_gid(ib_dev, } else {
be32_to_cpu(ah->av.ib.port_pd) >> 24, ib_get_cached_gid(ib_dev,
ah->av.ib.gid_index, be32_to_cpu(ah->av.ib.port_pd) >> 24,
&sqp->ud_header.grh.source_gid, NULL); ah->av.ib.gid_index,
&sqp->ud_header.grh.source_gid, NULL);
}
} }
memcpy(sqp->ud_header.grh.destination_gid.raw, memcpy(sqp->ud_header.grh.destination_gid.raw,
ah->av.ib.dgid, 16); ah->av.ib.dgid, 16);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment