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 31b1a0e43b6e8238111bf5a0b09cf28088caf327..6163f564d053543f39fb425845bc71b8c6bc3fc2 100644 (file)
--- 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 6e8e173f26e5bca452d91198f232788589aba753..dfc49599e72c86a228a67e227d039eaf7eb712d9 100644 (file)
--- 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 b575b9b120891c3663d1b7e4fd93383151e76b7f..e6fba8b0c7cf1b2c04ace4f1a70c1d1c193bfbd2 100644 (file)
--- 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