[librdmacm,3/3] init: Remove USE_IB_ACM configuration option

Commit Message

Hefty, Sean July 18, 2013, 7:52 p.m. UTC

From: Sean Hefty <[e-mail]>

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 <[e-mail]>
---
 configure.ac |    3 ---
 src/acm.c    |    3 ---
 src/cma.h    |    6 ------
 3 files changed, 0 insertions(+), 12 deletions(-)

Patch

diff --git a/configure.ac b/configure.ac
index b4303c6..59c5eb1 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]), [])
-
 dnl Checks close on exec support
 AC_CHECK_HEADERS([fcntl.h sys/socket.h])
 
diff --git a/src/acm.c b/src/acm.c
index 09c5d4e..04cddee 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
 #define ACM_VERSION             1
 
 #define ACM_OP_RESOLVE          0x01
@@ -453,5 +452,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