refresh (create temporary patch)

diff --git a/meta b/meta
index c2131ba6807e759c2eeac1f3fa324be5b334dc7d..2a6005e93ed9e82837ea58064a857efba0f0b6f9 100644 (file)
--- 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 (file)
index 0000000..94e4c9a
--- /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\r
+ {\r
+       RDMA_PS_IPOIB   = 0x0002,\r
+-      RDMA_PS_IB              = 0x0003,\r
+       RDMA_PS_TCP             = 0x0106,\r
+       RDMA_PS_UDP             = 0x0111,\r
+ };\r
+ \r
+-#define RDMA_IB_IP_PS_MASK   0xFFFFFFFFFFFF0000ULL\r
+-#define RDMA_IB_IP_PORT_MASK 0x000000000000FFFFULL\r
+-#define RDMA_IB_IP_PS_TCP    0x0000000001060000ULL\r
+-#define RDMA_IB_IP_PS_UDP    0x0000000001110000ULL\r
+-\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 rdma_ib_addr\r
++struct ib_addr\r
+ {\r
+       union ibv_gid   sgid;\r
+       union ibv_gid   dgid;\r
+@@ -107,7 +101,7 @@ struct rdma_addr
+                                                               sizeof(struct sockaddr)];\r
+       union\r
+       {\r
+-              struct rdma_ib_addr     ibaddr;\r
++              struct ib_addr  ibaddr;\r
+       }       addr;\r
+ };\r
+ \r
+@@ -140,10 +134,6 @@ struct rdma_cm_id
+       }       ep;\r
+ \r
+       struct rdma_cm_event            *event;\r
+-      struct ibv_comp_channel         *send_cq_channel;\r
+-      struct ibv_cq                           *send_cq;\r
+-      struct ibv_comp_channel         *recv_cq_channel;\r
+-      struct ibv_cq                           *recv_cq;\r
+ };\r
+ \r
+ enum {\r
+@@ -188,26 +178,6 @@ struct rdma_cm_event
+       }       param;\r
+ };\r
+ \r
+-#define RAI_PASSIVE           0x00000001\r
+-\r
+-struct rdma_addrinfo {\r
+-      int                                             ai_flags;\r
+-      int                                             ai_family;\r
+-      int                                             ai_qp_type;\r
+-      int                                             ai_port_space;\r
+-      socklen_t                               ai_src_len;\r
+-      socklen_t                               ai_dst_len;\r
+-      struct sockaddr                 *ai_src_addr;\r
+-      struct sockaddr                 *ai_dst_addr;\r
+-      char                                    *ai_src_canonname;\r
+-      char                                    *ai_dst_canonname;\r
+-      size_t                                  ai_route_len;\r
+-      void                                    *ai_route;\r
+-      size_t                                  ai_connect_len;\r
+-      void                                    *ai_connect;\r
+-      struct rdma_addrinfo    *ai_next;\r
+-};\r
+-\r
+ /**\r
+  * rdma_create_event_channel - Open a channel used to report communication events.\r
+  * Description:\r
+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\r
+ {\r
+       struct ibv_context      *verbs;\r
+-      struct ibv_pd           *pd;\r
+       uint64_t                        guid;\r
+       int                                     port_cnt;\r
+       uint8_t                         max_initiator_depth;