r7021: Replace deprecated function and structure names with updated names.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/include/rdma/rdma_cma.h b/include/rdma/rdma_cma.h
index 2f415ef0820199f2e169a6149e6e580fcadf6957..917f4344ed82195b9ae7fab0fcb14662869eb4ed 100644 (file)
--- a/include/rdma/rdma_cma.h
+++ b/include/rdma/rdma_cma.h
@@ -81,7 +81,7 @@ struct rdma_addr {
 
 struct rdma_route {
        struct rdma_addr         addr;
-       struct ib_sa_path_rec   *path_rec;
+       struct ibv_sa_path_rec  *path_rec;
        int                      num_paths;
 };
 

diff --git a/include/rdma/rdma_cma_abi.h b/include/rdma/rdma_cma_abi.h
index ca5b173d97eaeeb65ee77b5f5aa70d980c3186f4..05097f0c29f05a4dce9f6cb4c2607905e7bce36c 100644 (file)
--- a/include/rdma/rdma_cma_abi.h
+++ b/include/rdma/rdma_cma_abi.h
@@ -113,7 +113,7 @@ struct ucma_abi_query_route {
 
 struct ucma_abi_query_route_resp {
        __u64 node_guid;
-       struct ib_kern_path_rec ib_route[2];
+       struct ibv_kern_path_rec ib_route[2];
        struct sockaddr_in6 src_addr;
        struct sockaddr_in6 dst_addr;
        __u32 num_paths;

diff --git a/src/cma.c b/src/cma.c
index 26596a3900cdd57b13f3d697a495a6e780e6f3ff..772dabd39c3a52c88d625bc20a6e6bda0608d79d 100644 (file)
--- a/src/cma.c
+++ b/src/cma.c
@@ -410,8 +410,8 @@ static int ucma_query_route(struct rdma_cm_id *id)
 
                id->route.num_paths = resp->num_paths;
                for (i = 0; i < resp->num_paths; i++)
-                       ib_copy_path_rec_from_kern(&id->route.path_rec[i],
-                                                  &resp->ib_route[i]);
+                       ibv_copy_path_rec_from_kern(&id->route.path_rec[i],
+                                                   &resp->ib_route[i]);
        }
 
        memcpy(id->route.addr.addr.ibaddr.sgid.raw, resp->ib_route[0].sgid,
@@ -527,7 +527,7 @@ static int rdma_init_qp_attr(struct rdma_cm_id *id, struct ibv_qp_attr *qp_attr,
        if (ret != size)
                return (ret > 0) ? -ENODATA : ret;
 
-       ib_copy_qp_attr_from_kern(qp_attr, resp);
+       ibv_copy_qp_attr_from_kern(qp_attr, resp);
        *qp_attr_mask = resp->qp_attr_mask;
        return 0;
 }