From: Dotan Barak <dotanb@dev.mellanox.co.il>
Date: Tue, 9 Jan 2007 09:53:07 +0000 (+0200)
Subject: IB/mthca: Allow the QP state transition RESET->RESET
X-Git-Tag: MMI-PSA29.97-13-9~45103^2~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc89afce349a70f73d9c0b6d91a15c4913f071a0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

IB/mthca: Allow the QP state transition RESET->RESET

RESET->RESET is an allowed QP state transition, so mthca should handle
it correctly, by just returning success without involving the firmware.

Signed-off-by: Dotan Barak <dotanb@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
---

diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 224c93dd29eb..71dc84bd4254 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -573,6 +573,11 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
 		goto out;
 	}
 
+	if (cur_state == new_state && cur_state == IB_QPS_RESET) {
+		err = 0;
+		goto out;
+	}
+
 	if ((attr_mask & IB_QP_PKEY_INDEX) &&
 	     attr->pkey_index >= dev->limits.pkey_table_len) {
 		mthca_dbg(dev, "P_Key index (%u) too large. max is %d\n",