From b64277e2e7eeef1b73d604c2f9954aeec59878f9 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 3 Oct 2012 15:38:40 -0700
Subject: [PATCH] commit

---
 meta            |  3 +--
 patches/cont_of | 29 -----------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 patches/cont_of

diff --git a/meta b/meta
index 6ffb72a6..fa82f3e8 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: fba6df8cbf1474020cdd7de9217f73f55a18e15e
+Previous: 7054507e3a373ad1466d7554a9407b88b7bd455d
 Head: 860b1a8784f1846be759eec46770cc723991479c
 Applied:
-  cont_of: e15e607d7759af7446d0184999736512b12d0cb3
   rping: 860b1a8784f1846be759eec46770cc723991479c
 Unapplied:
   af-ib-conn: 5ce5f56950e0ed453c1798aedfa717bd18a2a754
diff --git a/patches/cont_of b/patches/cont_of
deleted file mode 100644
index a1d5f436..00000000
--- a/patches/cont_of
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: ac93da382386d7ab0239b28cdc00d6e3ed4470ea
-Top:    3759227a3e0717b06c5ad98d24b12a338ac460d4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-21 17:16:09 -0700
-
-librdmacm: Place container_of inside #ifdef
-
-verbs.h defines container_of.  Only define it if not defined
-
-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)
- {
-- 
2.46.0