refresh

diff --git a/meta b/meta
index fe0aaad8e99dccdbd40b652c54b834c61daf6735..6fa00d5fbe12f466524d7dacf726810d74db1bce 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 04d2d04721da24e115aca9d80fd022a18e94cd94
-Head: 57557ddb71cfb85c3ddf29a37699c0e502a468cc
+Previous: a721b2267f24d6739355b2759a2c2acbf615ab93
+Head: c7d28b35d64333c262de3ec972c426423dadccf9
 Applied:
-  mc-refcnt: 4f23053ab33fa519a16374f0b9273ca04798b56a
-  refresh-temp: 57557ddb71cfb85c3ddf29a37699c0e502a468cc
+  mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
 Unapplied:
   af_ib: f14184051293bfceac4f04e46efcf2f329a42aff
   daemonize: 88f657dfa31019f896f6b094f3b638b0f30cd6b5

diff --git a/patches/mc-refcnt b/patches/mc-refcnt
index ca9c6a5001a51443719eb64e92003621554635f9..91f7feb37615cfb7397cd6eaf2191aff2359af3d 100644 (file)
--- a/patches/mc-refcnt
+++ b/patches/mc-refcnt
@@ -1,5 +1,5 @@
 Bottom: b0bae9f13e357fe01c3e0e890cc06e7fe5b01317
-Top:    e36db38fed50062ef294584f071684b8cb1093fb
+Top:    5b43ed5461502081d6ece78807fadbbc55271c1b
 Author: sean.hefty@intel.com <sean.hefty@intel.com>
 Date:   2012-04-03 17:20:35 -0700
 
@@ -14,14 +14,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index d47f9d6..cff9113 100644
+index d47f9d6..818dbcc 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);
++      atomic_set(&dest->refcnt, 1);
        dest->state = ACM_READY;
        acm_log(1, "join successful\n");
  out:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8fff048..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: e36db38fed50062ef294584f071684b8cb1093fb
-Top:    5b43ed5461502081d6ece78807fadbbc55271c1b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-03 17:32:28 -0700
-
-Refresh of mc-refcnt
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index cff9113..818dbcc 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -762,7 +762,7 @@ static void acm_process_join_resp(struct acm_ep *ep, struct ib_user_mad *umad)
-               }
-       }
- 
--      atomic_set(&dest.refcnt, 1);
-+      atomic_set(&dest->refcnt, 1);
-       dest->state = ACM_READY;
-       acm_log(1, "join successful\n");
- out: