From 7e191be5f51fe7881348593a1506a0317d325786 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Mon, 14 Jul 2008 23:48:46 -0700
Subject: [PATCH] --- yaml --- r: 101023 b: refs/heads/master c:
 7c27f358209a8ce7c57b584346d7b611e823f1b1 h: refs/heads/master i:   101021:
 e9592efe9d2768277d804165691e3920c382a30f   101019:
 d24e24a736e43a00e0eae6c899c0f5f1a28fbe8f   101015:
 4897d98ab7f86f2ae4cfd8659bcf0125ef500580   101007:
 e137bc4f3f8b5268e083716d4cf936c7b42be418   100991:
 38dd138160e20ee6ef40e084e0135bfa55e540d6 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/infiniband/hw/mlx4/qp.c | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 15c4ac5b974d..09c0263f5f95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3809ad0972297fbc7ef0585049ef465d9d8d79d
+refs/heads/master: 7c27f358209a8ce7c57b584346d7b611e823f1b1
diff --git a/trunk/drivers/infiniband/hw/mlx4/qp.c b/trunk/drivers/infiniband/hw/mlx4/qp.c
index 76054a72f71b..44bbd6c2e315 100644
--- a/trunk/drivers/infiniband/hw/mlx4/qp.c
+++ b/trunk/drivers/infiniband/hw/mlx4/qp.c
@@ -1132,23 +1132,6 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
 	return err;
 }
 
-static const struct ib_qp_attr mlx4_ib_qp_attr = { .port_num = 1 };
-static const int mlx4_ib_qp_attr_mask_table[IB_QPT_UD + 1] = {
-		[IB_QPT_UD]  = (IB_QP_PKEY_INDEX		|
-				IB_QP_PORT			|
-				IB_QP_QKEY),
-		[IB_QPT_UC]  = (IB_QP_PKEY_INDEX		|
-				IB_QP_PORT			|
-				IB_QP_ACCESS_FLAGS),
-		[IB_QPT_RC]  = (IB_QP_PKEY_INDEX		|
-				IB_QP_PORT			|
-				IB_QP_ACCESS_FLAGS),
-		[IB_QPT_SMI] = (IB_QP_PKEY_INDEX		|
-				IB_QP_QKEY),
-		[IB_QPT_GSI] = (IB_QP_PKEY_INDEX		|
-				IB_QP_QKEY),
-};
-
 int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		      int attr_mask, struct ib_udata *udata)
 {
@@ -1191,15 +1174,6 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 		goto out;
 	}
 
-	if (cur_state == IB_QPS_RESET && new_state == IB_QPS_ERR) {
-		err = __mlx4_ib_modify_qp(ibqp, &mlx4_ib_qp_attr,
-					  mlx4_ib_qp_attr_mask_table[ibqp->qp_type],
-					  IB_QPS_RESET, IB_QPS_INIT);
-		if (err)
-			goto out;
-		cur_state = IB_QPS_INIT;
-	}
-
 	err = __mlx4_ib_modify_qp(ibqp, attr, attr_mask, cur_state, new_state);
 
 out: