RDMA/ucma: Name changes to indicate only IP addresses supported

Several commands into the RDMA CM from user space are restricted to
supporting addresses which fit into a sockaddr_in6 structure: bind
address, resolve address, and join multicast.

With the addition of AF_IB, we need to support addresses which are
larger than sockaddr_in6.  This will be done by adding new commands
that exchange address information using sockaddr_storage.  However, to
support existing applications, we maintain the current commands and
structures, but rename them to indicate that they only support IPv4
and v6 addresses.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h
index ea79253ceb13..79f68f7c9fd2 100644
--- a/include/uapi/rdma/rdma_user_cm.h
+++ b/include/uapi/rdma/rdma_user_cm.h
@@ -45,8 +45,8 @@
 enum {
         RDMA_USER_CM_CMD_CREATE_ID,
         RDMA_USER_CM_CMD_DESTROY_ID,
-        RDMA_USER_CM_CMD_BIND_ADDR,
-        RDMA_USER_CM_CMD_RESOLVE_ADDR,
+        RDMA_USER_CM_CMD_BIND_IP,
+        RDMA_USER_CM_CMD_RESOLVE_IP,
         RDMA_USER_CM_CMD_RESOLVE_ROUTE,
         RDMA_USER_CM_CMD_QUERY_ROUTE,
         RDMA_USER_CM_CMD_CONNECT,
@@ -59,7 +59,7 @@ enum {
         RDMA_USER_CM_CMD_GET_OPTION,
         RDMA_USER_CM_CMD_SET_OPTION,
         RDMA_USER_CM_CMD_NOTIFY,
-        RDMA_USER_CM_CMD_JOIN_MCAST,
+        RDMA_USER_CM_CMD_JOIN_IP_MCAST,
         RDMA_USER_CM_CMD_LEAVE_MCAST,
         RDMA_USER_CM_CMD_MIGRATE_ID,
         RDMA_USER_CM_CMD_QUERY
@@ -96,13 +96,13 @@ struct rdma_ucm_destroy_id_resp {
         __u32 events_reported;
 };
 
-struct rdma_ucm_bind_addr {
+struct rdma_ucm_bind_ip {
         __u64 response;
         struct sockaddr_in6 addr;
         __u32 id;
 };
 
-struct rdma_ucm_resolve_addr {
+struct rdma_ucm_resolve_ip {
         struct sockaddr_in6 src_addr;
         struct sockaddr_in6 dst_addr;
         __u32 id;
@@ -216,7 +216,7 @@ struct rdma_ucm_notify {
         __u32 event;
 };
 
-struct rdma_ucm_join_mcast {
+struct rdma_ucm_join_ip_mcast {
         __u64 response;         /* rdma_ucm_create_id_resp */
         __u64 uid;
         struct sockaddr_in6 addr;