Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

IB/mlx4: Fix code indentation in QP1 MAD flow 



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: 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

drivers/infiniband/hw/mlx4/qp.c

+19 −17
Original line number Diff line number Diff line
@@ -2331,25 +2331,27 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_ud_wr *wr, 
		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 {

		} 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 */

				 * 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

			} 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, NULL);

			}

		}

		memcpy(sqp->ud_header.grh.destination_gid.raw,

		       ah->av.ib.dgid, 16);

	}