Refresh of rs-with-acm

diff --git a/src/acm.c b/src/acm.c
index e9733c6862eb45c862530795c7af56293cc2d42b..5bdeb88dac4a38bb30733209328331a31fb71e32 100755 (executable)
--- a/src/acm.c
+++ b/src/acm.c
@@ -86,7 +86,7 @@ static void ucma_set_server_port(void)
        }
 }
 
-void ucma_acm_init(void)
+void ucma_ib_init(void)
 {
        struct sockaddr_in addr;
        static int init;

diff --git a/src/addrinfo.c b/src/addrinfo.c
index 573fb42c1443ab935629b55c6eab7323024dd3d2..2da35f0126389feac23077d03277074f5767b6bb 100755 (executable)
--- a/src/addrinfo.c
+++ b/src/addrinfo.c
@@ -231,7 +231,7 @@ int rdma_getaddrinfo(char *node, char *service,
        }
 
        if (!(rai->ai_flags & RAI_PASSIVE))
-               ucma_acm_resolve(&rai, hints);
+               ucma_ib_resolve(&rai, hints);
 
        *res = rai;
        return 0;

diff --git a/src/cma.c b/src/cma.c
index c0cd407dcfce2387593e60985ba50566c60ba68e..f688c4c24b098a05c31bc1953959b6b076856ffb 100755 (executable)
--- a/src/cma.c
+++ b/src/cma.c
@@ -128,7 +128,7 @@ int af_ib_support;
 
 static void ucma_cleanup(void)
 {
-       ucma_acm_cleanup();
+       ucma_ib_cleanup();
 
        if (cma_dev_cnt) {
                while (cma_dev_cnt--) {

diff --git a/src/cma.h b/src/cma.h
index c673bda7a8c215c124163c0da91dbeca2a902142..2ee47675d83cb5e1a00531c5170c3a1cf24f30bc 100644 (file)
--- a/src/cma.h
+++ b/src/cma.h
@@ -119,11 +119,11 @@ extern int af_ib_support;
 #define RAI_ROUTEONLY          0x01000000
 
 #ifdef USE_IB_ACM
-void ucma_acm_cleanup();
-void ucma_acm_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
+void ucma_ib_cleanup();
+void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
 #else
-#define ucma_acm_cleanup()
-#define ucma_acm_resolve(x, y)
+#define ucma_ib_cleanup()
+#define ucma_ib_resolve(x, y)
 #endif
 
 /* Define path record definition if using older version of libibverbs */