rename

diff --git a/meta b/meta
index b54dd1d927f50679f08b7052f9ff2682b7d369e4..6771b854e697590359870efa7522121a93d964b2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,9 @@
 Version: 1
-Previous: 858977792cf3415071d25c7a0c92dba05270a90b
+Previous: ad493211a9a015fd31b6b17ed2fbec5332e7e939
 Head: b38f4c985b3f1e442dec303886515c816aab43ec
 Applied:
   addrtype: c8173d50d1a8c2bbfb0c4459e05d3941175676b2
-  use_acm: b38f4c985b3f1e442dec303886515c816aab43ec
+  use-acm: b38f4c985b3f1e442dec303886515c816aab43ec
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   acm_msg: 2754edc839f94608e3116068fa7b13936e074d37

diff --git a/patches/use-acm b/patches/use-acm
new file mode 100644 (file)
index 0000000..6196b90
--- /dev/null
+++ b/patches/use-acm
@@ -0,0 +1,71 @@
+Bottom: 0f2efee48a61eb345a7f7dd4ebbf0df79e739ea9
+Top:    bc9105b8cf4060b87bc61c07dc49b43af079589c
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-06-10 10:57:56 -0700
+
+init: Remove USE_IB_ACM configuration option
+
+When the librdmacm is configured, it sets the USE_IB_ACM option
+if infininband/acm.h is found.  We can remove this option with
+very little overhead, which would allow a user to install
+ACM after installing the librdmacm, and the librdmacm would be
+able to make use of ACM.
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+
+---
+
+diff --git a/configure.ac b/configure.ac
+index 31b1a0e..6163f56 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,9 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [],
+ fi
+ fi
+ 
+-AC_CHECK_HEADER(infiniband/acm.h, 
+-      AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), [])
+-
+ AC_CHECK_HEADER(infiniband/acm.h,
+       AC_CHECK_MEMBER(struct acm_msg.resolve_data, [],
+               AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]),
+diff --git a/src/acm.c b/src/acm.c
+index 6e8e173..dfc4959 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -45,7 +45,6 @@
+ #include <infiniband/ib.h>
+ #include <infiniband/sa.h>
+ 
+-#ifdef USE_IB_ACM
+ #include <infiniband/acm.h>
+ 
+ #if DEFINE_ACM_MSG
+@@ -401,5 +400,3 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
+       if (af_ib_support && !(hints->ai_flags & RAI_ROUTEONLY) && (*rai)->ai_route_len)
+               ucma_resolve_af_ib(rai);
+ }
+-
+-#endif /* USE_IB_ACM */
+diff --git a/src/cma.h b/src/cma.h
+index b575b9b..e6fba8b 100644
+--- a/src/cma.h
++++ b/src/cma.h
+@@ -162,15 +162,9 @@ 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
+ 
+ /* Define path record definition if using older version of libibverbs */
+ #ifdef DEFINE_PATH_RECORD

diff --git a/patches/use_acm b/patches/use_acm
deleted file mode 100644 (file)
index 6196b90..0000000
--- a/patches/use_acm
+++ /dev/null
@@ -1,71 +0,0 @@
-Bottom: 0f2efee48a61eb345a7f7dd4ebbf0df79e739ea9
-Top:    bc9105b8cf4060b87bc61c07dc49b43af079589c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-06-10 10:57:56 -0700
-
-init: Remove USE_IB_ACM configuration option
-
-When the librdmacm is configured, it sets the USE_IB_ACM option
-if infininband/acm.h is found.  We can remove this option with
-very little overhead, which would allow a user to install
-ACM after installing the librdmacm, and the librdmacm would be
-able to make use of ACM.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
-
----
-
-diff --git a/configure.ac b/configure.ac
-index 31b1a0e..6163f56 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,9 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [],
- fi
- fi
- 
--AC_CHECK_HEADER(infiniband/acm.h, 
--      AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), [])
--
- AC_CHECK_HEADER(infiniband/acm.h,
-       AC_CHECK_MEMBER(struct acm_msg.resolve_data, [],
-               AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]),
-diff --git a/src/acm.c b/src/acm.c
-index 6e8e173..dfc4959 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -45,7 +45,6 @@
- #include <infiniband/ib.h>
- #include <infiniband/sa.h>
- 
--#ifdef USE_IB_ACM
- #include <infiniband/acm.h>
- 
- #if DEFINE_ACM_MSG
-@@ -401,5 +400,3 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
-       if (af_ib_support && !(hints->ai_flags & RAI_ROUTEONLY) && (*rai)->ai_route_len)
-               ucma_resolve_af_ib(rai);
- }
--
--#endif /* USE_IB_ACM */
-diff --git a/src/cma.h b/src/cma.h
-index b575b9b..e6fba8b 100644
---- a/src/cma.h
-+++ b/src/cma.h
-@@ -162,15 +162,9 @@ 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
- 
- /* Define path record definition if using older version of libibverbs */
- #ifdef DEFINE_PATH_RECORD