Refresh of use_ib_acm

diff --git a/configure.ac b/configure.ac
index 35d79dd46897d54ec28457cc8bde37636741fdc7..3ce7a6ead68b2d382b62b15c63a7f28438b02031 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/examples/cmatose.c b/examples/cmatose.c
index ca92f11a953ca66ce41ab43206ae49feb485b081..2971ed1a070d058f54230fc82a9f3f4c50a39f33 100644 (file)
--- a/examples/cmatose.c
+++ b/examples/cmatose.c
@@ -44,6 +44,7 @@
 #include <getopt.h>
 
 #include <rdma/rdma_cma.h>
+#include <infiniband/ib.h>
 #include "common.h"
 
 struct cmatest_node {
@@ -510,7 +511,7 @@ static int run_server(void)
 
        memset(&hints, 0, sizeof hints);
        if (addr_type == 'g') {
-               hints.ai_flags = RAI_FAMILY;
+               hints.ai_flags = RAI_FAMILY | RAI_NUMERICHOST;
                hints.ai_family = AF_IB;
        }
        hints.ai_flags |= RAI_PASSIVE;
@@ -591,7 +592,7 @@ static int run_client(void)
 
        memset(&hints, 0, sizeof hints);
        if (addr_type == 'g') {
-               hints.ai_flags = RAI_FAMILY;
+               hints.ai_flags = RAI_FAMILY | RAI_NUMERICHOST;
                hints.ai_family = AF_IB;
        }
        hints.ai_port_space = RDMA_PS_TCP;
@@ -651,7 +652,7 @@ int main(int argc, char **argv)
 {
        int op, ret;
 
-       while ((op = getopt(argc, argv, "s:b:c:C:S:t:p:m")) != -1) {
+       while ((op = getopt(argc, argv, "s:b:c:C:S:t:p:mf:")) != -1) {
                switch (op) {
                case 's':
                        dst_addr = optarg;
@@ -678,6 +679,9 @@ int main(int argc, char **argv)
                case 'm':
                        migrate = 1;
                        break;
+               case 'f':
+                       addr_type = optarg[0];
+                       break;
                default:
                        printf("usage: %s\n", argv[0]);
                        printf("\t[-s server_address]\n");

diff --git a/src/acm.c b/src/acm.c
index c9ca5b56ef4d256aa82eaa76d8e28fce7c29e378..c423bb7290332a6f4395f72eede3c9c20d3e4276 100755 (executable)
--- 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