librdmacm: change ib_addr to rdma_ib_addr

Needed to support future AF_IB definition

diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
index d57490e784b6554d7c5ee9a00db3b678a2b5df20..46045604870172a89cdea721eddece986ee463c7 100644 (file)
--- a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
+++ b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
@@ -74,17 +74,23 @@ enum rdma_cm_event_type
 enum rdma_port_space\r
 {\r
        RDMA_PS_IPOIB   = 0x0002,\r
+       RDMA_PS_IB              = 0x0003,
        RDMA_PS_TCP             = 0x0106,\r
        RDMA_PS_UDP             = 0x0111,\r
 };\r
 \r
+#define RDMA_IB_IP_PS_MASK   0xFFFFFFFFFFFF0000ULL
+#define RDMA_IB_IP_PORT_MASK 0x000000000000FFFFULL
+#define RDMA_IB_IP_PS_TCP    0x0000000001060000ULL
+#define RDMA_IB_IP_PS_UDP    0x0000000001110000ULL
+\r
 /*\r
  * Global qkey value for UDP QPs and multicast groups created via the \r
  * RDMA CM.\r
  */\r
 #define RDMA_UDP_QKEY 0x01234567\r
 \r
-struct ib_addr\r
+struct rdma_ib_addr\r
 {\r
        union ibv_gid   sgid;\r
        union ibv_gid   dgid;\r
@@ -101,7 +107,7 @@ struct rdma_addr
                                                                sizeof(struct sockaddr)];\r
        union\r
        {\r
-               struct ib_addr  ibaddr;\r
+               struct rdma_ib_addr     ibaddr;\r
        }       addr;\r
 };\r
 \r