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

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

Merge branch 'mlx4' into for-next

parents 5c2187f0 a478868a

drivers/infiniband/hw/mlx4/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,

			    void *wqe, unsigned *mlx_seg_len)

{

	struct ib_device *ib_dev = &to_mdev(sqp->qp.ibqp.device)->ib_dev;

	struct ib_device *ib_dev = sqp->qp.ibqp.device;

	struct mlx4_wqe_mlx_seg *mlx = wqe;

	struct mlx4_wqe_inline_seg *inl = wqe + sizeof *mlx;

	struct mlx4_ib_ah *ah = to_mah(wr->wr.ud.ah);