rdma UAPI: Use __kernel_sockaddr_storage

The kernel side is #ifdef'd to this type, and the UAPI header
should use it directly. It has slightly different alignment
requirments from the usual user space version.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h
index 01923d4..d71da36 100644 (file)
--- a/include/uapi/rdma/rdma_user_cm.h
+++ b/include/uapi/rdma/rdma_user_cm.h
@@ -110,7 +110,7 @@ struct rdma_ucm_bind {
        __u32 id;
        __u16 addr_size;
        __u16 reserved;
-       struct sockaddr_storage addr;
+       struct __kernel_sockaddr_storage addr;
 };
 
 struct rdma_ucm_resolve_ip {
@@ -126,8 +126,8 @@ struct rdma_ucm_resolve_addr {
        __u16 src_size;
        __u16 dst_size;
        __u32 reserved;
-       struct sockaddr_storage src_addr;
-       struct sockaddr_storage dst_addr;
+       struct __kernel_sockaddr_storage src_addr;
+       struct __kernel_sockaddr_storage dst_addr;
 };
 
 struct rdma_ucm_resolve_route {
@@ -164,8 +164,8 @@ struct rdma_ucm_query_addr_resp {
        __u16 pkey;
        __u16 src_size;
        __u16 dst_size;
-       struct sockaddr_storage src_addr;
-       struct sockaddr_storage dst_addr;
+       struct __kernel_sockaddr_storage src_addr;
+       struct __kernel_sockaddr_storage dst_addr;
 };
 
 struct rdma_ucm_query_path_resp {
@@ -257,7 +257,7 @@ struct rdma_ucm_join_mcast {
        __u32 id;
        __u16 addr_size;
        __u16 join_flags;
-       struct sockaddr_storage addr;
+       struct __kernel_sockaddr_storage addr;
 };
 
 struct rdma_ucm_get_event {