refresh

diff --git a/meta b/meta
index 75b62c20730bd2cb70b4950fc43dc59e18ca4e79..3a9b14e9b42d6330f30d01eb16dc8c6302f6140d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: fda6d26dfd503d957f85abd084245e7d31961b51
-Head: a40f732b1a9621751648ff6fb9d6d8b413ba7387
+Previous: 13a0ac8bc09e5882b5d0a459207cea670d0ac7fa
+Head: 1c6b284bff6bb0ebdd9dc743cc62ba3d37240553
 Applied:
-  cm-mra: d8f8bae6e765025bffd48ee3b3017b73d062087c
-  refresh-temp: a40f732b1a9621751648ff6fb9d6d8b413ba7387
+  cm-mra: 1c6b284bff6bb0ebdd9dc743cc62ba3d37240553
 Unapplied:
 Hidden:

diff --git a/patches/cm-mra b/patches/cm-mra
index a9494c2af5f22f197f4f25cb5910d8478d6161ea..2560fb7c76cf4cf865c9d67b26c3cd22022e7fbb 100644 (file)
--- a/patches/cm-mra
+++ b/patches/cm-mra
@@ -1,5 +1,5 @@
 Bottom: d7c667ace9790b0e62352ad738c131d7604ae9f6
-Top:    d7c667ace9790b0e62352ad738c131d7604ae9f6
+Top:    ffc2e2eadd272dbb648380b09e4305242fea4394
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-21 14:32:53 -0700
 
@@ -79,4 +79,24 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
+index ad63b79..64e0903 100644
+--- a/drivers/infiniband/core/cm.c
++++ b/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;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b8aef51..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: d7c667ace9790b0e62352ad738c131d7604ae9f6
-Top:    ffc2e2eadd272dbb648380b09e4305242fea4394
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-21 15:00:45 -0700
-
-Refresh of cm-mra
-
----
-
-diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
-index ad63b79..64e0903 100644
---- a/drivers/infiniband/core/cm.c
-+++ b/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;