]> git.openfabrics.org - ~shefty/librdmacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Sat, 22 Sep 2012 00:17:45 +0000 (17:17 -0700)
committerSean Hefty <sean.hefty@intel.com>
Sat, 22 Sep 2012 00:17:45 +0000 (17:17 -0700)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index c009dc43653d9ae9ece8692cd5570db0f494b50e..22307ee7f12776f77acc36ed89c773ca2e3f885d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: d052de7c4c340f707021a18971635e1847b6e329
-Head: a88a9c74ad1e610f1ea24aabe5f1a238b3ad67e2
+Previous: 60b9f7dad00e83711ce76c93b47485c79678924b
+Head: 57d091eabde4a61ff91fdb58938ecd2e9ce5991c
 Applied:
   cont_of: a88a9c74ad1e610f1ea24aabe5f1a238b3ad67e2
+  refresh-temp: 57d091eabde4a61ff91fdb58938ecd2e9ce5991c
 Unapplied:
   af-ib-conn: 027cb3c0a4fe70b9a9a65896b5f2e53683328db8
   addrtype: 066c2615bf5399848088a9771093a76c5e205bf1
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..2a05e02
--- /dev/null
@@ -0,0 +1,24 @@
+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)
+ {