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

Commit ee48c3d7 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma' and 'mlx4' into for-linus

parents 2c4ab624 f781a22f

drivers/infiniband/hw/mlx4/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, 
		}



		wc->slid	   = be16_to_cpu(cqe->rlid);

		wc->sl		   = be16_to_cpu(cqe->sl_vid >> 12);

		wc->sl		   = be16_to_cpu(cqe->sl_vid) >> 12;

		g_mlpath_rqpn	   = be32_to_cpu(cqe->g_mlpath_rqpn);

		wc->src_qp	   = g_mlpath_rqpn & 0xffffff;

		wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f;