Merge branch 'mlx4' into for-next
This commit is contained in:
commit
a835fb3095
@ -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,
|
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);
|
||||||
|
Loading…
Reference in New Issue
Block a user