summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-03-01 23:51:56 -0800
committerRoland Dreier <rolandd@cisco.com>2010-03-01 23:51:56 -0800
commita835fb30954fe92a569206f9f684a755fbed395c (patch)
treed3c3db2075861dcd0e23d0241a95fbf6ab0c70e2 /drivers/infiniband
parent5c2187f0a184d6c5ec87aab403b79a8bb24a7988 (diff)
parenta478868a1b891da8f3c67c1b933e870df89dca80 (diff)
downloadop-kernel-dev-a835fb30954fe92a569206f9f684a755fbed395c.zip
op-kernel-dev-a835fb30954fe92a569206f9f684a755fbed395c.tar.gz
Merge branch 'mlx4' into for-next
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/mlx4/qp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 2a97c96..b377671 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/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);
OpenPOWER on IntegriCloud