Staging: merge staging patches into Linus's main branch

[karo-tx-linux.git] / include / rdma / rdma_cm.h

diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index df7faf09d66f782f47fdfa845677a5177fdd6ada..4fae903046483f7882cebfeea6777ee43dd37038 100644 (file)
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -67,16 +67,11 @@ enum rdma_port_space {
        RDMA_PS_IPOIB = 0x0002,
        RDMA_PS_TCP   = 0x0106,
        RDMA_PS_UDP   = 0x0111,
-       RDMA_PS_SCTP  = 0x0183
 };
 
 struct rdma_addr {
-       struct sockaddr src_addr;
-       u8              src_pad[sizeof(struct sockaddr_in6) -
-                               sizeof(struct sockaddr)];
-       struct sockaddr dst_addr;
-       u8              dst_pad[sizeof(struct sockaddr_in6) -
-                               sizeof(struct sockaddr)];
+       struct sockaddr_storage src_addr;
+       struct sockaddr_storage dst_addr;
        struct rdma_dev_addr dev_addr;
 };