refresh

diff --git a/meta b/meta
index 32f0cfd5fbb18220928f452894b53c6b91262e27..c7dff55738c59e0f419e30e902d497d647d76214 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 37aafff2588a7fa2eab87093c7ba127284a84e03
-Head: 27c6cdac06e4d5926d6bcecb25b9e80111510487
+Previous: 410e22cb0e6400a77ae651132ba15efd3a8c4181
+Head: 47e92feb945153525ba11190d5b3f296723b2760
 Applied:
-  join-err: ec036ab770b4564aa12c1ab64b2779ad24a07641
-  refresh-temp: 27c6cdac06e4d5926d6bcecb25b9e80111510487
+  join-err: 47e92feb945153525ba11190d5b3f296723b2760
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/join-err b/patches/join-err
index dbf6b9eb54685235185fdc51ad9441e160323f46..37447673f4b0ee574bec75fc2ed6d3bb58b75350 100644 (file)
--- a/patches/join-err
+++ b/patches/join-err
@@ -1,5 +1,5 @@
 Bottom: 928412a7b8def95fbb0369bd768cf27c86985da4
-Top:    928412a7b8def95fbb0369bd768cf27c86985da4
+Top:    c5d7235efb71e1d2c98f3c7f2a12466a9eb7fbac
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2014-04-09 12:04:19 -0700
 
@@ -15,4 +15,36 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 851a258..2134ddc 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -783,12 +783,12 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
+               dest->ah = ibv_create_ah(ep->port->dev->pd, &dest->av);
+               if (!dest->ah) {
+                       acm_log(0, "ERROR - unable to create ah\n");
+-                      goto err1;
++                      goto err2;
+               }
+               ret = ibv_attach_mcast(ep->qp, &mc_rec->mgid, mc_rec->mlid);
+               if (ret) {
+                       acm_log(0, "ERROR - unable to attach QP to multicast group\n");
+-                      goto err2;
++                      goto err3;
+               }
+       }
+ 
+@@ -797,11 +797,12 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
+       acm_log(1, "join successful\n");
+       lock_release(&ep->lock);
+       return;
+-err2:
++err3:
+       ibv_destroy_ah(dest->ah);
+       dest->ah = NULL;
+-err1:
++err2:
+       dest->state = ACM_INIT;
++err1:
+       lock_release(&ep->lock);
+ }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 234a8b1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: 928412a7b8def95fbb0369bd768cf27c86985da4
-Top:    c5d7235efb71e1d2c98f3c7f2a12466a9eb7fbac
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-04-09 12:13:01 -0700
-
-Refresh of join-err
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 851a258..2134ddc 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -783,12 +783,12 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
-               dest->ah = ibv_create_ah(ep->port->dev->pd, &dest->av);
-               if (!dest->ah) {
-                       acm_log(0, "ERROR - unable to create ah\n");
--                      goto err1;
-+                      goto err2;
-               }
-               ret = ibv_attach_mcast(ep->qp, &mc_rec->mgid, mc_rec->mlid);
-               if (ret) {
-                       acm_log(0, "ERROR - unable to attach QP to multicast group\n");
--                      goto err2;
-+                      goto err3;
-               }
-       }
- 
-@@ -797,11 +797,12 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
-       acm_log(1, "join successful\n");
-       lock_release(&ep->lock);
-       return;
--err2:
-+err3:
-       ibv_destroy_ah(dest->ah);
-       dest->ah = NULL;
--err1:
-+err2:
-       dest->state = ACM_INIT;
-+err1:
-       lock_release(&ep->lock);
- }