refresh

diff --git a/meta b/meta
index 22307ee7f12776f77acc36ed89c773ca2e3f885d..e482639dc05738dc1cfb55689c8d8091c4221ed6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 60b9f7dad00e83711ce76c93b47485c79678924b
-Head: 57d091eabde4a61ff91fdb58938ecd2e9ce5991c
+Previous: 327752e2fbf2852763fe56bc91a409fa77cc9846
+Head: 3c70a581f12975b49cd1aac0236f09c6b8fb9950
 Applied:
-  cont_of: a88a9c74ad1e610f1ea24aabe5f1a238b3ad67e2
-  refresh-temp: 57d091eabde4a61ff91fdb58938ecd2e9ce5991c
+  cont_of: 3c70a581f12975b49cd1aac0236f09c6b8fb9950
 Unapplied:
   af-ib-conn: 027cb3c0a4fe70b9a9a65896b5f2e53683328db8
   addrtype: 066c2615bf5399848088a9771093a76c5e205bf1

diff --git a/patches/cont_of b/patches/cont_of
index aaa2c0ea6f6e72c4e4b88f01fbb27045b7976c88..59ee29954fa12787b3e75d9536461ea22462e607 100644 (file)
--- a/patches/cont_of
+++ b/patches/cont_of
@@ -1,5 +1,5 @@
 Bottom: fd25e5104198197967ac10d49db6570c49bf661c
-Top:    fd25e5104198197967ac10d49db6570c49bf661c
+Top:    2d834bd45b50141247cec98ef6807b7374d7cf2e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-21 17:16:09 -0700
 
@@ -12,4 +12,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/cma.c b/src/cma.c
+index d168df6..91bf108 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -124,8 +124,10 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
+ static int abi_ver = RDMA_USER_CM_MAX_ABI_VERSION;
+ int af_ib_support;
+ 
++#ifndef container_of
+ #define container_of(ptr, type, field) \
+       ((type *) ((void *)ptr - offsetof(type, field)))
++#endif
+ 
+ static void ucma_cleanup(void)
+ {

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2a05e02..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: fd25e5104198197967ac10d49db6570c49bf661c
-Top:    2d834bd45b50141247cec98ef6807b7374d7cf2e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-21 17:17:45 -0700
-
-Refresh of cont_of
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index d168df6..91bf108 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -124,8 +124,10 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
- static int abi_ver = RDMA_USER_CM_MAX_ABI_VERSION;
- int af_ib_support;
- 
-+#ifndef container_of
- #define container_of(ptr, type, field) \
-       ((type *) ((void *)ptr - offsetof(type, field)))
-+#endif
- 
- static void ucma_cleanup(void)
- {