refresh (create temporary patch)

diff --git a/meta b/meta
index c7dff55738c59e0f419e30e902d497d647d76214..d2063ce97fc1c0e40262ab3c347bca824674e38c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 410e22cb0e6400a77ae651132ba15efd3a8c4181
-Head: 47e92feb945153525ba11190d5b3f296723b2760
+Previous: 2ade643129130893aed00310c2a871d02c01f780
+Head: ec3d7e4364ef758a8ee334aa05225b0ce54524e1
 Applied:
   join-err: 47e92feb945153525ba11190d5b3f296723b2760
+  refresh-temp: ec3d7e4364ef758a8ee334aa05225b0ce54524e1
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..6d8d53c
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,49 @@
+Bottom: c5d7235efb71e1d2c98f3c7f2a12466a9eb7fbac
+Top:    17ef417062286b7467e6e5a52c09169cb23128d1
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2014-04-13 14:43:43 -0700
+
+Refresh of join-err
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 2134ddc..fcbe313 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 err2;
++                      goto err1;
+               }
+               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 err3;
++                      goto err2;
+               }
+       }
+ 
+@@ -797,11 +797,9 @@ 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;
+-err3:
++err2:
+       ibv_destroy_ah(dest->ah);
+       dest->ah = NULL;
+-err2:
+-      dest->state = ACM_INIT;
+ err1:
+       lock_release(&ep->lock);
+ }
+@@ -1569,6 +1567,7 @@ static void acm_join_group(struct acm_ep *ep, union ibv_gid *port_gid,
+       acm_log(0, "%s %d pkey 0x%x, sl 0x%x, rate 0x%x, mtu 0x%x\n",
+               ep->port->dev->verbs->device->name, ep->port->port_num,
+               ep->pkey, sl, rate, mtu);
++      ep->mc_dest[ep->mc_cnt].state = ACM_INIT;
+       mad = (struct ib_sa_mad *) umad->data;
+       acm_init_join(mad, port_gid, ep->pkey, tos, tclass, sl, rate, mtu);
+       mc_rec = (struct ib_mc_member_rec *) mad->data;