diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-01-23 02:24:21 -0500 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-01-23 02:24:21 -0500 |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /drivers/infiniband/hw/ipath/ipath_qp.c | |
| parent | 8f399921ea9a562bc8221258c4b8a7bd69577939 (diff) | |
| parent | 27cdef637c25705b433d5c4deeef4cf8dcb75d6a (diff) | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_qp.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_qp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c index 0857a9c3cd3d..face87602dc1 100644 --- a/drivers/infiniband/hw/ipath/ipath_qp.c +++ b/drivers/infiniband/hw/ipath/ipath_qp.c | |||
| @@ -463,7 +463,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, | |||
| 463 | new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state; | 463 | new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state; |
| 464 | 464 | ||
| 465 | if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, | 465 | if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, |
| 466 | attr_mask)) | 466 | attr_mask, IB_LINK_LAYER_UNSPECIFIED)) |
| 467 | goto inval; | 467 | goto inval; |
| 468 | 468 | ||
| 469 | if (attr_mask & IB_QP_AV) { | 469 | if (attr_mask & IB_QP_AV) { |