From b3ad1f0feab654b02ee84bb60a00248a5dbea769 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 13 Aug 2010 12:47:26 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 ++-
 patches/refresh-temp | 97 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index c2131ba6..2a6005e9 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 2b881b025c72ba4c05b1d8c7728668d8a090c4a9
-Head: ce8f6bfec194e77a017f130eff9b119bdd209769
+Previous: 5bb06f3029c3d3b934b9156041afc63e0450c208
+Head: d6173392ce055b041b30b92c39439a5ebb40bcfd
 Applied:
   sync: ce8f6bfec194e77a017f130eff9b119bdd209769
+  refresh-temp: d6173392ce055b041b30b92c39439a5ebb40bcfd
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..94e4c9a4
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,97 @@
+Bottom: 550485239542183426eb82bdd884e63deb200dba
+Top:    5596d9e17ccdb57ef7098cdb97becd5ae854a6fb
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-08-13 12:47:24 -0700
+
+Refresh of sync
+
+---
+
+diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
+index 0cf7d47..673bd57 100644
+--- a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
++++ b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
+@@ -74,23 +74,17 @@ 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 rdma_ib_addr
++struct ib_addr
+ {
+ 	union ibv_gid	sgid;
+ 	union ibv_gid	dgid;
+@@ -107,7 +101,7 @@ struct rdma_addr
+ 								sizeof(struct sockaddr)];
+ 	union
+ 	{
+-		struct rdma_ib_addr	ibaddr;
++		struct ib_addr	ibaddr;
+ 	}	addr;
+ };
+ 
+@@ -140,10 +134,6 @@ struct rdma_cm_id
+ 	}	ep;
+ 
+ 	struct rdma_cm_event		*event;
+-	struct ibv_comp_channel		*send_cq_channel;
+-	struct ibv_cq				*send_cq;
+-	struct ibv_comp_channel		*recv_cq_channel;
+-	struct ibv_cq				*recv_cq;
+ };
+ 
+ enum {
+@@ -188,26 +178,6 @@ struct rdma_cm_event
+ 	}	param;
+ };
+ 
+-#define RAI_PASSIVE		0x00000001
+-
+-struct rdma_addrinfo {
+-	int						ai_flags;
+-	int						ai_family;
+-	int						ai_qp_type;
+-	int						ai_port_space;
+-	socklen_t				ai_src_len;
+-	socklen_t				ai_dst_len;
+-	struct sockaddr			*ai_src_addr;
+-	struct sockaddr			*ai_dst_addr;
+-	char					*ai_src_canonname;
+-	char					*ai_dst_canonname;
+-	size_t					ai_route_len;
+-	void					*ai_route;
+-	size_t					ai_connect_len;
+-	void					*ai_connect;
+-	struct rdma_addrinfo	*ai_next;
+-};
+-
+ /**
+  * rdma_create_event_channel - Open a channel used to report communication events.
+  * Description:
+diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
+index b2d225d..ce6a95e 100644
+--- a/trunk/ulp/librdmacm/src/cma.cpp
++++ b/trunk/ulp/librdmacm/src/cma.cpp
+@@ -79,7 +79,6 @@ struct cma_id_private
+ struct cma_device
+ {
+ 	struct ibv_context	*verbs;
+-	struct ibv_pd		*pd;
+ 	uint64_t			guid;
+ 	int					port_cnt;
+ 	uint8_t				max_initiator_depth;
-- 
2.46.0