Jelajahi Sumber

Merge branch 'mlx4' into for-next

Roland Dreier 15 tahun lalu
induk
melakukan
a835fb3095
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      drivers/infiniband/hw/mlx4/qp.c

+ 1 - 1
drivers/infiniband/hw/mlx4/qp.c

@@ -1214,7 +1214,7 @@ out:
 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);