refresh

diff --git a/meta b/meta
index a9756c4a15a0934123c96105961aee8a2ec631b1..57b77ff4d9b96e40636ff4301cc63d912d2dff2d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 7e5fb1bc94ce58d218e07931d87b238ca66e50f2
-Head: 377fab749ccaea3febc590dce14f175c19d6a99e
+Previous: aefb3d59ba14a7781fbc9c916c0700fd2193d893
+Head: fb4600fea3faf2a8a2207a0233aa8ec46196db88
 Applied:
   mc_dest_refcnt: a3ad57a67a619f535c54bf3552ee720eed29d4dd
-  refresh-temp: b17ae2811a54e776a567b3af855685cea599d1b7
-  refresh-temp-0: 377fab749ccaea3febc590dce14f175c19d6a99e
+  refresh-temp: fb4600fea3faf2a8a2207a0233aa8ec46196db88
 Unapplied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   daemonize: fa67959cf1b176ad53b6feaa446cf284c37bd87c

diff --git a/patches/refresh-temp b/patches/refresh-temp
index 131a09d1bea54fa5253dfef44be883833caa14c2..23548d596cef0fcf83be08e4e462d09b446a8639 100644 (file)
--- a/patches/refresh-temp
+++ b/patches/refresh-temp
@@ -1,5 +1,5 @@
 Bottom: b0bae9f13e357fe01c3e0e890cc06e7fe5b01317
-Top:    b0bae9f13e357fe01c3e0e890cc06e7fe5b01317
+Top:    e36db38fed50062ef294584f071684b8cb1093fb
 Author: sean.hefty@intel.com <sean.hefty@intel.com>
 Date:   2012-04-03 17:04:24 -0700
 
@@ -7,4 +7,15 @@ Refresh of mc_dest_refcnt
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index d47f9d6..cff9113 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -762,6 +762,7 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
+               }
+       }
+ 
++      atomic_set(&dest.refcnt, 1);
+       dest->state = ACM_READY;
+       acm_log(1, "join successful\n");
+ out:

diff --git a/patches/refresh-temp-0 b/patches/refresh-temp-0
deleted file mode 100644 (file)
index f870b88..0000000
--- a/patches/refresh-temp-0
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: b0bae9f13e357fe01c3e0e890cc06e7fe5b01317
-Top:    e36db38fed50062ef294584f071684b8cb1093fb
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-03 17:13:30 -0700
-
-Refresh of refresh-temp
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index d47f9d6..cff9113 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -762,6 +762,7 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
-               }
-       }
- 
-+      atomic_set(&dest.refcnt, 1);
-       dest->state = ACM_READY;
-       acm_log(1, "join successful\n");
- out: