diff options
| author | Roland Dreier | 2014-01-23 08:24:21 +0100 |
|---|---|---|
| committer | Roland Dreier | 2014-01-23 08:24:21 +0100 |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /drivers/infiniband/hw/mlx5 | |
| parent | Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', ... (diff) | |
| parent | IB/mlx4: Use IS_ENABLED(CONFIG_IPV6) (diff) | |
| download | kernel-qcow2-linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.gz kernel-qcow2-linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.xz kernel-qcow2-linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.zip | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'drivers/infiniband/hw/mlx5')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/qp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 70dd77085db6..ae37fb9bf262 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -1664,7 +1664,8 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state; if (ibqp->qp_type != MLX5_IB_QPT_REG_UMR && - !ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) + !ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask, + IB_LINK_LAYER_UNSPECIFIED)) goto out; if ((attr_mask & IB_QP_PORT) && |