Skip to content

L
linux-davinci
Commit a835fb30 authored by Roland Dreier's avatar Roland Dreier
Browse files
Options

Merge branch 'mlx4' into for-next

parents 5c2187f0 a478868a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/infiniband/hw/mlx4/qp.c
View file @ a835fb30
...@@ -1214,7 +1214,7 @@ out: ...@@ -1214,7 +1214,7 @@ out:
static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr, static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
void *wqe, unsigned *mlx_seg_len) 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_mlx_seg *mlx = wqe;
struct mlx4_wqe_inline_seg *inl = wqe + sizeof *mlx; struct mlx4_wqe_inline_seg *inl = wqe + sizeof *mlx;
struct mlx4_ib_ah *ah = to_mah(wr->wr.ud.ah); struct mlx4_ib_ah *ah = to_mah(wr->wr.ud.ah);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment