From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 13 Aug 2010 19:59:30 +0000 (-0700)
Subject: librdmacm: change ib_addr to rdma_ib_addr
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=73504ef1f812bea6d1fd59f194f90e5194ca2efa;p=~shefty%2Frdma-win.git

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 d57490e7..46045604 100644
--- 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
 {
 	RDMA_PS_IPOIB	= 0x0002,
+	RDMA_PS_IB		= 0x0003,
 	RDMA_PS_TCP		= 0x0106,
 	RDMA_PS_UDP		= 0x0111,
 };
 
+#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
+
 /*
  * Global qkey value for UDP QPs and multicast groups created via the 
  * RDMA CM.
  */
 #define RDMA_UDP_QKEY 0x01234567
 
-struct ib_addr
+struct rdma_ib_addr
 {
 	union ibv_gid	sgid;
 	union ibv_gid	dgid;
@@ -101,7 +107,7 @@ struct rdma_addr
 								sizeof(struct sockaddr)];
 	union
 	{
-		struct ib_addr	ibaddr;
+		struct rdma_ib_addr	ibaddr;
 	}	addr;
 };