refresh

diff --git a/meta b/meta
index 85f1e7f9d7173aa8cfff4aa6d3961f17cc34316e..8fa91c069e65b811410ec16be094ec09371a3ff5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e70f54d9d173ba21af5a0597aba980887e317ff9
-Head: b2f3f7a16d0a4a773a98dcf2da14c613d34fcea7
+Previous: 7dda67f5ddc5e152040762659ea1c8c1b105f10f
+Head: 47348de149bd19aa0f7d1ee293e5c2157c181c26
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -10,8 +10,7 @@ Applied:
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
   gai: 9730577d0bf4f053ec4c96eaa6d894144a75ce58
   getreq: 1ef2ab06b60a1192a1b2af253d75e187ecc68381
-  ep: 4b8e8ab4a74053455780a17dac4867c65ecc2a84
-  refresh-temp: b2f3f7a16d0a4a773a98dcf2da14c613d34fcea7
+  ep: 47348de149bd19aa0f7d1ee293e5c2157c181c26
 Unapplied:
   samples: 49aaf5034e9e0ac961147823cc5e058837938d03
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172

diff --git a/patches/ep b/patches/ep
index c1d507d4ead6c6bd20955ecd173c36b22d6609fe..82667d455e73ef1ce748c90c53b65df1a6d96bd8 100644 (file)
--- a/patches/ep
+++ b/patches/ep
@@ -1,5 +1,5 @@
 Bottom: 1b24ee5b94208659c35ecaca9bdab5e9a4235614
-Top:    fd6fd978fad041ba4d202022ad2955f69f8bbdea
+Top:    20a010e4b9995e87e5aa659a2021d1dc6550af60
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 11:10:48 -0700
 
@@ -9,53 +9,55 @@ librdmacm: add rdma_create_ep and rdma_destroy_ep
 ---
 
 diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-index 489fa66..606795e 100644
+index 489fa66..bec57f0 100644
 --- a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
 +++ b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-@@ -264,6 +264,43 @@ int rdma_create_id(struct rdma_event_channel *channel,
-                                  struct rdma_cm_id **id, void *context,\r
+@@ -265,6 +265,45 @@ int rdma_create_id(struct rdma_event_channel *channel,
                                   enum rdma_port_space ps);\r
  \r
-+/**
-+ * rdma_create_ep - Allocate a communication identifier and qp.
-+ * @id: A reference where the allocated communication identifier will be
-+ *   returned.
-+ * @res: Result from rdma_getaddrinfo, which specifies the source and
-+ *   destination addresses, plus optional routing and connection information.
-+ * @pd: Optional protection domain.  This parameter is ignored if qp_init_attr
-+ *   is NULL.
-+ * @qp_init_attr: Optional attributes for a QP created on the rdma_cm_id.
-+ * Description:
-+ *   Create an identifier and option QP used for communication.
-+ * Notes:
-+ *   If qp_init_attr is provided, then a queue pair will be allocated and
-+ *   associated with the rdma_cm_id.  If a pd is provided, the QP will be
-+ *   created on that PD.  Otherwise, the QP will be allocated on a default
-+ *   PD.
-+ *   The rdma_cm_id will be set to use synchronous operations (connect,
-+ *   listen, and get_request).  To convert to asynchronous operation, the
-+ *   rdma_cm_id should be migrated to a user allocated event channel.
-+ * See also:
-+ *   rdma_create_id, rdma_create_qp, rdma_migrate_id, rdma_connect,
-+ *   rdma_listen
-+ */
-+int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,
-+                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr);
-+
-+/**
-+ * rdma_destroy_ep - Deallocates a communication identifier and qp.
-+ * @id: The communication identifer to destroy.
-+ * Description:
-+ *   Destroys the specified rdma_cm_id and any associated QP created
-+ *   on that id.
-+ * See also:
-+ *   rdma_create_ep
-+ */
-+void rdma_destroy_ep(struct rdma_cm_id *id);
-+\r
  /**\r
++ * rdma_create_ep - Allocate a communication identifier and qp.\r
++ * @id: A reference where the allocated communication identifier will be\r
++ *   returned.\r
++ * @res: Result from rdma_getaddrinfo, which specifies the source and\r
++ *   destination addresses, plus optional routing and connection information.\r
++ * @pd: Optional protection domain.  This parameter is ignored if qp_init_attr\r
++ *   is NULL.\r
++ * @qp_init_attr: Optional attributes for a QP created on the rdma_cm_id.\r
++ * Description:\r
++ *   Create an identifier and option QP used for communication.\r
++ * Notes:\r
++ *   If qp_init_attr is provided, then a queue pair will be allocated and\r
++ *   associated with the rdma_cm_id.  If a pd is provided, the QP will be\r
++ *   created on that PD.  Otherwise, the QP will be allocated on a default\r
++ *   PD.\r
++ *   The rdma_cm_id will be set to use synchronous operations (connect,\r
++ *   listen, and get_request).  To convert to asynchronous operation, the\r
++ *   rdma_cm_id should be migrated to a user allocated event channel.\r
++ * See also:\r
++ *   rdma_create_id, rdma_create_qp, rdma_migrate_id, rdma_connect,\r
++ *   rdma_listen\r
++ */\r
++__declspec(dllexport)\r
++int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,\r
++                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr);\r
++\r
++/**\r
++ * rdma_destroy_ep - Deallocates a communication identifier and qp.\r
++ * @id: The communication identifer to destroy.\r
++ * Description:\r
++ *   Destroys the specified rdma_cm_id and any associated QP created\r
++ *   on that id.\r
++ * See also:\r
++ *   rdma_create_ep\r
++ */\r
++__declspec(dllexport)\r
++void rdma_destroy_ep(struct rdma_cm_id *id);\r
++\r
++/**\r
   * rdma_destroy_id - Release a communication identifier.\r
   * @id: The communication identifier to destroy.\r
+  * Description:\r
 diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
 index f897245..835d020 100644
 --- a/trunk/ulp/librdmacm/src/cma.cpp

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0700fba..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,94 +0,0 @@
-Bottom: fd6fd978fad041ba4d202022ad2955f69f8bbdea
-Top:    20a010e4b9995e87e5aa659a2021d1dc6550af60
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 13:56:05 -0700
-
-Refresh of ep
-
----
-
-diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-index 606795e..bec57f0 100644
---- a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-+++ b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-@@ -264,42 +264,44 @@ int rdma_create_id(struct rdma_event_channel *channel,
-                                  struct rdma_cm_id **id, void *context,\r
-                                  enum rdma_port_space ps);\r
- \r
--/**
-- * rdma_create_ep - Allocate a communication identifier and qp.
-- * @id: A reference where the allocated communication identifier will be
-- *   returned.
-- * @res: Result from rdma_getaddrinfo, which specifies the source and
-- *   destination addresses, plus optional routing and connection information.
-- * @pd: Optional protection domain.  This parameter is ignored if qp_init_attr
-- *   is NULL.
-- * @qp_init_attr: Optional attributes for a QP created on the rdma_cm_id.
-- * Description:
-- *   Create an identifier and option QP used for communication.
-- * Notes:
-- *   If qp_init_attr is provided, then a queue pair will be allocated and
-- *   associated with the rdma_cm_id.  If a pd is provided, the QP will be
-- *   created on that PD.  Otherwise, the QP will be allocated on a default
-- *   PD.
-- *   The rdma_cm_id will be set to use synchronous operations (connect,
-- *   listen, and get_request).  To convert to asynchronous operation, the
-- *   rdma_cm_id should be migrated to a user allocated event channel.
-- * See also:
-- *   rdma_create_id, rdma_create_qp, rdma_migrate_id, rdma_connect,
-- *   rdma_listen
-- */
--int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,
--                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr);
--
--/**
-- * rdma_destroy_ep - Deallocates a communication identifier and qp.
-- * @id: The communication identifer to destroy.
-- * Description:
-- *   Destroys the specified rdma_cm_id and any associated QP created
-- *   on that id.
-- * See also:
-- *   rdma_create_ep
-- */
--void rdma_destroy_ep(struct rdma_cm_id *id);
-+/**\r
-+ * rdma_create_ep - Allocate a communication identifier and qp.\r
-+ * @id: A reference where the allocated communication identifier will be\r
-+ *   returned.\r
-+ * @res: Result from rdma_getaddrinfo, which specifies the source and\r
-+ *   destination addresses, plus optional routing and connection information.\r
-+ * @pd: Optional protection domain.  This parameter is ignored if qp_init_attr\r
-+ *   is NULL.\r
-+ * @qp_init_attr: Optional attributes for a QP created on the rdma_cm_id.\r
-+ * Description:\r
-+ *   Create an identifier and option QP used for communication.\r
-+ * Notes:\r
-+ *   If qp_init_attr is provided, then a queue pair will be allocated and\r
-+ *   associated with the rdma_cm_id.  If a pd is provided, the QP will be\r
-+ *   created on that PD.  Otherwise, the QP will be allocated on a default\r
-+ *   PD.\r
-+ *   The rdma_cm_id will be set to use synchronous operations (connect,\r
-+ *   listen, and get_request).  To convert to asynchronous operation, the\r
-+ *   rdma_cm_id should be migrated to a user allocated event channel.\r
-+ * See also:\r
-+ *   rdma_create_id, rdma_create_qp, rdma_migrate_id, rdma_connect,\r
-+ *   rdma_listen\r
-+ */\r
-+__declspec(dllexport)\r
-+int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,\r
-+                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr);\r
-+\r
-+/**\r
-+ * rdma_destroy_ep - Deallocates a communication identifier and qp.\r
-+ * @id: The communication identifer to destroy.\r
-+ * Description:\r
-+ *   Destroys the specified rdma_cm_id and any associated QP created\r
-+ *   on that id.\r
-+ * See also:\r
-+ *   rdma_create_ep\r
-+ */\r
-+__declspec(dllexport)\r
-+void rdma_destroy_ep(struct rdma_cm_id *id);\r
- \r
- /**\r
-  * rdma_destroy_id - Release a communication identifier.