commit

diff --git a/meta b/meta
index e7718edb9e72f7ea8f9c5d5f80272dccddd8f418..e8fab5de61b99be440b7fd7f2a522384271ca347 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 36b4e7c3b059c9ed36a816f571f1eac389dbe9cd
+Previous: eed7ab486cccb536fb6e80e955f676d0f5f3f656
 Head: 75e5b5b17d8a478b4fad5d9ee700edb943b050ba
 Applied:
-  ib-acm: 75e5b5b17d8a478b4fad5d9ee700edb943b050ba
 Unapplied:
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
   addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e

diff --git a/patches/ib-acm b/patches/ib-acm
deleted file mode 100644 (file)
index 986fb84..0000000
--- a/patches/ib-acm
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 251ce87c0cff93e0365c1bd08504d77240b0f0c8
-Top:    b6004c656a03f1cecd7bb483178086496ae46a69
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-01-28 14:56:25 -0800
-
-librdmacm: Define ucma_ib_init when IB_ACM is disabled
-
-ucma_ib_init is only defined if IB_ACM is enabled, which is
-determined by looking for the infiniband/acm.h header file.
-Define ucma_ib_init when IB_ACM is disabled.
-
-Problem reportedy by Suresh Shelvapille <suri@baymicrosystems.com>
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/cma.h b/src/cma.h
-index bdd6a85..b575b9b 100644
---- a/src/cma.h
-+++ b/src/cma.h
-@@ -158,15 +158,16 @@ static inline int ERR(int err)
- }
- 
- int ucma_init();
--void ucma_ib_init();
- extern int af_ib_support;
- 
- #define RAI_ROUTEONLY         0x01000000
- 
- #ifdef USE_IB_ACM
-+void ucma_ib_init();
- void ucma_ib_cleanup();
- void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
- #else
-+#define ucma_ib_init()
- #define ucma_ib_cleanup()
- #define ucma_ib_resolve(x, y)
- #endif