From 0efae94732114996bd1bf7cdf248dfe610314895 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 21 Jul 2010 23:36:52 +0000
Subject: [PATCH] --- yaml --- r: 206720 b: refs/heads/master c:
 50a025c69ee749d822c301f9bf63dee13c113680 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/infiniband/core/cm.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a9719c2203f8..d191881d254d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f400e5b38a5eeb8a91b481e4f3059611fa4ddce2
+refs/heads/master: 50a025c69ee749d822c301f9bf63dee13c113680
diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c
index ad63b79afac1..64e0903091a8 100644
--- a/trunk/drivers/infiniband/core/cm.c
+++ b/trunk/drivers/infiniband/core/cm.c
@@ -2409,10 +2409,12 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,
 		msg_response = CM_MSG_RESPONSE_REP;
 		break;
 	case IB_CM_ESTABLISHED:
-		cm_state = cm_id->state;
-		lap_state = IB_CM_MRA_LAP_SENT;
-		msg_response = CM_MSG_RESPONSE_OTHER;
-		break;
+		if (cm_id->lap_state == IB_CM_LAP_RCVD) {
+			cm_state = cm_id->state;
+			lap_state = IB_CM_MRA_LAP_SENT;
+			msg_response = CM_MSG_RESPONSE_OTHER;
+			break;
+		}
 	default:
 		ret = -EINVAL;
 		goto error1;