Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[cascardo/linux.git] / include / uapi / rdma / rdma_user_cm.h

diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h
index 895a427..99b80ab 100644 (file)
--- a/include/uapi/rdma/rdma_user_cm.h
+++ b/include/uapi/rdma/rdma_user_cm.h
@@ -63,7 +63,9 @@ enum {
        RDMA_USER_CM_CMD_LEAVE_MCAST,
        RDMA_USER_CM_CMD_MIGRATE_ID,
        RDMA_USER_CM_CMD_QUERY,
-       RDMA_USER_CM_CMD_BIND
+       RDMA_USER_CM_CMD_BIND,
+       RDMA_USER_CM_CMD_RESOLVE_ADDR,
+       RDMA_USER_CM_CMD_JOIN_MCAST
 };
 
 /*
@@ -117,6 +119,16 @@ struct rdma_ucm_resolve_ip {
        __u32 timeout_ms;
 };
 
+struct rdma_ucm_resolve_addr {
+       __u32 id;
+       __u32 timeout_ms;
+       __u16 src_size;
+       __u16 dst_size;
+       __u32 reserved;
+       struct sockaddr_storage src_addr;
+       struct sockaddr_storage dst_addr;
+};
+
 struct rdma_ucm_resolve_route {
        __u32 id;
        __u32 timeout_ms;
@@ -231,6 +243,15 @@ struct rdma_ucm_join_ip_mcast {
        __u32 id;
 };
 
+struct rdma_ucm_join_mcast {
+       __u64 response;         /* rdma_ucma_create_id_resp */
+       __u64 uid;
+       __u32 id;
+       __u16 addr_size;
+       __u16 reserved;
+       struct sockaddr_storage addr;
+};
+
 struct rdma_ucm_get_event {
        __u64 response;
 };