refresh

diff --git a/meta b/meta
index f448c2066885db39744d74f41e0a2c7956a1284f..819b9ca2272c68e91fc98d14c749acecb1d860f0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b4d631ca7d2ed11c26e5446d2bb3cd2696e1d1c1
-Head: 127542275d35af3eb7640ac6053f8e54d9dae0dc
+Previous: 0955cc424cbd766f482d0504c1853bf3e187837a
+Head: 0c5be697906823092f0add1e1e340abeb9f444e3
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -9,8 +9,7 @@ Applied:
   max-rdma: 0dd5de47b21e3a7274ec258f969cfb366f7b5e46
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
   gai: 720aaa185b9ce215b2d0678f103ccdf50fa7ffbf
-  getreq: 6395ef43de28c399a398928a776c25c94a0f8765
-  refresh-temp: 127542275d35af3eb7640ac6053f8e54d9dae0dc
+  getreq: 0c5be697906823092f0add1e1e340abeb9f444e3
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/getreq b/patches/getreq
index 852c1ebf827874e1794fadbd0f7d825053b7e8be..ef14004b5c29d48b9560a5cf15d8d1fa4e18cc19 100644 (file)
--- a/patches/getreq
+++ b/patches/getreq
@@ -1,5 +1,5 @@
 Bottom: fb20772a871decb83a5e3e8bdf727c07ca0f6777
-Top:    fb20772a871decb83a5e3e8bdf727c07ca0f6777
+Top:    4e145a3674b7feba90010b276e4fa6facf9716b9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 10:33:20 -0700
 
@@ -8,4 +8,77 @@ librdmacm: add rdma_get_request
 
 ---
 
-
+diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
+index 2ef2868..66932ca 100644
+--- a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
++++ b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
+@@ -417,6 +417,8 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
+ __declspec(dllexport)\r
+ int rdma_listen(struct rdma_cm_id *id, int backlog);\r
+ \r
++int rdma_get_request(struct rdma_cm_id *listen, struct rdma_cm_id **id);\r
++\r
+ /**\r
+  * rdma_accept - Called to accept a connection request.\r
+  * @id: Connection identifier associated with the request.\r
+diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
+index 7240c4d..e9819aa 100644
+--- a/trunk/ulp/librdmacm/src/cma.cpp
++++ b/trunk/ulp/librdmacm/src/cma.cpp
+@@ -918,6 +918,45 @@ int rdma_listen(struct rdma_cm_id *id, int backlog)
+       return 0;\r
+ }\r
+ \r
++int rdma_get_request(struct rdma_cm_id *listen, struct rdma_cm_id **id)
++{
++      struct cma_id_private *id_priv;
++      struct rdma_cm_event *event;
++      int ret;
++
++      id_priv = container_of(listen, struct cma_id_private, id);
++      if (!id_priv->sync) {
++              return rdma_seterrno(EINVAL);
++      }
++
++      if (listen->event) {
++              rdma_ack_cm_event(listen->event);
++              listen->event = NULL;
++      }
++
++      ret = rdma_get_cm_event(listen->channel, &event);
++      if (ret)
++              return ret;
++
++      if (event->status) {
++              ret = rdma_seterrno(event->status);
++              goto err;
++      }
++      
++      if (event->event != RDMA_CM_EVENT_CONNECT_REQUEST) {
++              ret = rdma_seterrno(EINVAL);
++              goto err;
++      }
++
++      *id = event->id;
++      (*id)->event = event;
++      return 0;
++
++err:
++      listen->event = event;
++      return ret;
++}
++\r
+ __declspec(dllexport)\r
+ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)\r
+ {\r
+diff --git a/trunk/ulp/librdmacm/src/cma_exports.src b/trunk/ulp/librdmacm/src/cma_exports.src
+index 8f370be..2d6b336 100644
+--- a/trunk/ulp/librdmacm/src/cma_exports.src
++++ b/trunk/ulp/librdmacm/src/cma_exports.src
+@@ -32,5 +32,6 @@ rdma_set_option
+ rdma_migrate_id\r
+ rdma_getaddrinfo\r
+ rdma_freeaddrinfo\r
++rdma_get_request\r
+ rdmaw_wsa_errno\r
+ #endif

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 18105d7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,83 +0,0 @@
-Bottom: fb20772a871decb83a5e3e8bdf727c07ca0f6777
-Top:    4e145a3674b7feba90010b276e4fa6facf9716b9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 11:08:24 -0700
-
-Refresh of getreq
-
----
-
-diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-index 2ef2868..66932ca 100644
---- a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-+++ b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
-@@ -417,6 +417,8 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
- __declspec(dllexport)\r
- int rdma_listen(struct rdma_cm_id *id, int backlog);\r
- \r
-+int rdma_get_request(struct rdma_cm_id *listen, struct rdma_cm_id **id);\r
-+\r
- /**\r
-  * rdma_accept - Called to accept a connection request.\r
-  * @id: Connection identifier associated with the request.\r
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 7240c4d..e9819aa 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -918,6 +918,45 @@ int rdma_listen(struct rdma_cm_id *id, int backlog)
-       return 0;\r
- }\r
- \r
-+int rdma_get_request(struct rdma_cm_id *listen, struct rdma_cm_id **id)
-+{
-+      struct cma_id_private *id_priv;
-+      struct rdma_cm_event *event;
-+      int ret;
-+
-+      id_priv = container_of(listen, struct cma_id_private, id);
-+      if (!id_priv->sync) {
-+              return rdma_seterrno(EINVAL);
-+      }
-+
-+      if (listen->event) {
-+              rdma_ack_cm_event(listen->event);
-+              listen->event = NULL;
-+      }
-+
-+      ret = rdma_get_cm_event(listen->channel, &event);
-+      if (ret)
-+              return ret;
-+
-+      if (event->status) {
-+              ret = rdma_seterrno(event->status);
-+              goto err;
-+      }
-+      
-+      if (event->event != RDMA_CM_EVENT_CONNECT_REQUEST) {
-+              ret = rdma_seterrno(EINVAL);
-+              goto err;
-+      }
-+
-+      *id = event->id;
-+      (*id)->event = event;
-+      return 0;
-+
-+err:
-+      listen->event = event;
-+      return ret;
-+}
-+\r
- __declspec(dllexport)\r
- int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)\r
- {\r
-diff --git a/trunk/ulp/librdmacm/src/cma_exports.src b/trunk/ulp/librdmacm/src/cma_exports.src
-index 8f370be..2d6b336 100644
---- a/trunk/ulp/librdmacm/src/cma_exports.src
-+++ b/trunk/ulp/librdmacm/src/cma_exports.src
-@@ -32,5 +32,6 @@ rdma_set_option
- rdma_migrate_id\r
- rdma_getaddrinfo\r
- rdma_freeaddrinfo\r
-+rdma_get_request\r
- rdmaw_wsa_errno\r
- #endif