refresh

diff --git a/meta b/meta
index 23543982b272ecc24482cd6be4b96c4ace6cd3e2..b836282bf2f9d47497b16689a256bb4eb6ff9f51 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 6a8c1f610e5abd40917e403df7ad25286ba382fb
-Head: f983949534086779f4d852f74c7657d39f231555
+Previous: 0e7805fa056a3e4bab132ba20cd2608e5c194615
+Head: 3f78a720520be5f98889b3b88dbb6344fa227466
 Applied:
-  opt_mc_av: 1c9cb4576f95c0d2cc7bf96d33cc6efe5f6c313d
-  refresh-temp: f983949534086779f4d852f74c7657d39f231555
+  opt_mc_av: 3f78a720520be5f98889b3b88dbb6344fa227466
 Unapplied:
   one_mc_join: ef3728004507256635ad95161cd92811661affbe
   dyn_ah: cb5ff3ef664771b3c243847abef220e0151063ee

diff --git a/patches/opt_mc_av b/patches/opt_mc_av
index 9974de81782f38b7e2a5baed0ffc03271f79b987..c848944548653226920372844201c1966b64c990 100644 (file)
--- a/patches/opt_mc_av
+++ b/patches/opt_mc_av
@@ -1,5 +1,5 @@
 Bottom: 4a725c3b21d37e7ff6d4e2430fc69ddf4d72920a
-Top:    ff1f0e0cc0c31d7a9b01b551462a6a3a0612e4b9
+Top:    613b7a74933df2af9b7b765f153ed3c74a67c4e1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-04-01 14:46:34 -0700
 
@@ -18,18 +18,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 15f2631..0dbc23c 100644
+index 15f2631..3df996b 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -164,6 +164,7 @@ struct acm_send_msg
-       DLIST_ENTRY          entry;
-       struct acm_ep        *ep;
-       struct acm_dest      *dest;
-+      struct ibv_ah        *ah;
-       void                 *context;
-       void                 (*resp_handler)(struct acm_send_msg *req,
-                                            struct ibv_wc *wc, struct acm_mad *resp);
-@@ -724,22 +725,32 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
+@@ -724,22 +724,32 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
        mc_rec = (struct ib_mc_member_rec *) mad->data;
        lock_acquire(&ep->lock);
        index = acm_mc_index(ep, &mc_rec->mgid);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 277f789..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: ff1f0e0cc0c31d7a9b01b551462a6a3a0612e4b9
-Top:    613b7a74933df2af9b7b765f153ed3c74a67c4e1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-04-01 17:52:12 -0700
-
-Refresh of opt_mc_av
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 0dbc23c..3df996b 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -164,7 +164,6 @@ struct acm_send_msg
-       DLIST_ENTRY          entry;
-       struct acm_ep        *ep;
-       struct acm_dest      *dest;
--      struct ibv_ah        *ah;
-       void                 *context;
-       void                 (*resp_handler)(struct acm_send_msg *req,
-                                            struct ibv_wc *wc, struct acm_mad *resp);