From 8cb2951471d7c8dc044030c717a3fb262752613e Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 16 Aug 2010 11:08:27 -0700
Subject: [PATCH] refresh (create temporary patch)

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

diff --git a/meta b/meta
index 675d341f..f448c206 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a6c4763618013e98a0c8aef901a403b3bfd85730
-Head: 6395ef43de28c399a398928a776c25c94a0f8765
+Previous: b4d631ca7d2ed11c26e5446d2bb3cd2696e1d1c1
+Head: 127542275d35af3eb7640ac6053f8e54d9dae0dc
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -10,6 +10,7 @@ Applied:
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
   gai: 720aaa185b9ce215b2d0678f103ccdf50fa7ffbf
   getreq: 6395ef43de28c399a398928a776c25c94a0f8765
+  refresh-temp: 127542275d35af3eb7640ac6053f8e54d9dae0dc
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..18105d7f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,83 @@
+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)
+ int rdma_listen(struct rdma_cm_id *id, int backlog);
+ 
++int rdma_get_request(struct rdma_cm_id *listen, struct rdma_cm_id **id);
++
+ /**
+  * rdma_accept - Called to accept a connection request.
+  * @id: Connection identifier associated with the request.
+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;
+ }
+ 
++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;
++}
++
+ __declspec(dllexport)
+ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
+ {
+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
+ rdma_getaddrinfo
+ rdma_freeaddrinfo
++rdma_get_request
+ rdmaw_wsa_errno
+ #endif
-- 
2.46.0