From mboxrd@z Thu Jan 1 00:00:00 1970 From: sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org Subject: [PATCH librdmacm 3/3] init: Remove USE_IB_ACM configuration option Date: Thu, 18 Jul 2013 12:52:13 -0700 Message-ID: <1374177133-802-3-git-send-email-sean.hefty@intel.com> References: <1374177133-802-1-git-send-email-sean.hefty@intel.com> Return-path: In-Reply-To: <1374177133-802-1-git-send-email-sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sean Hefty List-Id: linux-rdma@vger.kernel.org From: Sean Hefty 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 --- configure.ac | 3 --- src/acm.c | 3 --- src/cma.h | 6 ------ 3 files changed, 0 insertions(+), 12 deletions(-) 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 #include -#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 -- 1.7.3 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html