7 files changed, 16 insertions, 8 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 00d6861a6a18..2e89356c46fa 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -1329,7 +1329,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
         qp_new_state = attr_mask & IB_QP_STATE ? attr->qp_state : qp_cur_state;
         if (!smi_reset2init &&
             !ib_modify_qp_is_ok(qp_cur_state, qp_new_state, ibqp->qp_type,
-                                attr_mask)) {
+                                attr_mask, IB_LINK_LAYER_UNSPECIFIED)) {
                 ret = -EINVAL;
                 ehca_err(ibqp->device,
                          "Invalid qp transition new_state=%x cur_state=%x "
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,
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
         if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
-                                attr_mask))
+                                attr_mask, IB_LINK_LAYER_UNSPECIFIED))
                 goto inval;
 
         if (attr_mask & IB_QP_AV) {
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 4f10af2905b5..da6f5fa0c328 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1561,13 +1561,18 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         struct mlx4_ib_qp *qp = to_mqp(ibqp);
         enum ib_qp_state cur_state, new_state;
         int err = -EINVAL;
-
+        int p = attr_mask & IB_QP_PORT ? attr->port_num : qp->port;
         mutex_lock(&qp->mutex);
 
         cur_state = attr_mask & IB_QP_CUR_STATE ? attr->cur_qp_state : qp->state;
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
-        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) {
+        if (cur_state == new_state && cur_state == IB_QPS_RESET)
+                p = IB_LINK_LAYER_UNSPECIFIED;
+
+        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
+                                attr_mask,
+                                rdma_port_get_link_layer(&dev->ib_dev, p))) {
                 pr_debug("qpn 0x%x: invalid attribute mask specified "
                          "for transition %d to %d. qp_type %d,"
                          " attr_mask 0x%x\n",
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 7c6b4ba49bec..ca2936233713 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -1616,7 +1616,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) &&
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 26a684536109..e354b2f04ad9 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -860,7 +860,8 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
 
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
-        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) {
+        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask,
+                                IB_LINK_LAYER_UNSPECIFIED)) {
                 mthca_dbg(dev, "Bad QP transition (transport %d) "
                           "%d->%d with attr 0x%08x\n",
                           qp->transport, cur_state, new_state,
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 7686dceadd29..a0f1c47c333f 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1326,7 +1326,8 @@ int ocrdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                 new_qps = old_qps;
         spin_unlock_irqrestore(&qp->q_lock, flags);
 
-        if (!ib_modify_qp_is_ok(old_qps, new_qps, ibqp->qp_type, attr_mask)) {
+        if (!ib_modify_qp_is_ok(old_qps, new_qps, ibqp->qp_type, attr_mask,
+                                IB_LINK_LAYER_UNSPECIFIED)) {
                 pr_err("%s(%d) invalid attribute mask=0x%x specified for\n"
                        "qpn=0x%x of type=0x%x old_qps=0x%x, new_qps=0x%x\n",
                        __func__, dev->id, attr_mask, qp->id, ibqp->qp_type,
diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index 3cca55b51e54..0cad0c40d742 100644
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -585,7 +585,7 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
         if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
-                                attr_mask))
+                                attr_mask, IB_LINK_LAYER_UNSPECIFIED))
                 goto inval;
 
         if (attr_mask & IB_QP_AV) {