From 27dd746a211df98ca4c34878e58b27fdc76e4e2c Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 30 Oct 2013 15:43:22 -0700
Subject: [PATCH] refresh (create temporary patch)

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

diff --git a/meta b/meta
index 46d30deb..0910b805 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 98909936ce85d15eb2d44f7076a040f3b6e96b0e
-Head: 5d4e689eb55393a1eaab531d3838dac7b7258f2a
+Previous: 4ba9590c98beb6067017447f037629d9205cd416
+Head: 24347d8bbe87341888cada9997c9eb0050843e1d
 Applied:
   shutdown: 5d4e689eb55393a1eaab531d3838dac7b7258f2a
+  refresh-temp: 24347d8bbe87341888cada9997c9eb0050843e1d
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..96c52027
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,74 @@
+Bottom: 5811e9d9c8d5ed97573872408f138609e535b721
+Top:    75b04ca01637eeac4f5b673a12c87917a9126271
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-10-30 15:43:22 -0700
+
+Refresh of shutdown
+
+---
+
+diff --git a/src/cma.c b/src/cma.c
+index 374844c..4f41879 100644
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -1543,22 +1543,25 @@ int rdma_notify(struct rdma_cm_id *id, enum ibv_event_type event)
+ 	return 0;
+ }
+ 
+-int rdma_disconnect(struct rdma_cm_id *id)
++int ucma_shutdown(struct rdma_cm_id *id)
+ {
+-	struct ucma_abi_disconnect cmd;
+-	struct cma_id_private *id_priv;
+-	int ret;
+-
+ 	switch (id->verbs->device->transport_type) {
+ 	case IBV_TRANSPORT_IB:
+-		ret = ucma_modify_qp_err(id);
+-		break;
++		return ucma_modify_qp_err(id);
+ 	case IBV_TRANSPORT_IWARP:
+-		ret = ucma_modify_qp_sqd(id);
+-		break;
++		return ucma_modify_qp_sqd(id);
+ 	default:
+-		ret = ERR(EINVAL);
++		return ERR(EINVAL);
+ 	}
++}
++
++int rdma_disconnect(struct rdma_cm_id *id)
++{
++	struct ucma_abi_disconnect cmd;
++	struct cma_id_private *id_priv;
++	int ret;
++
++	ret = ucma_shutdown(id);
+ 	if (ret)
+ 		return ret;
+ 
+diff --git a/src/cma.h b/src/cma.h
+index e944a9a..4c991b4 100644
+--- a/src/cma.h
++++ b/src/cma.h
+@@ -150,6 +150,7 @@ void ucma_set_sid(enum rdma_port_space ps, struct sockaddr *addr,
+ 		  struct sockaddr_ib *sib);
+ int ucma_max_qpsize(struct rdma_cm_id *id);
+ int ucma_complete(struct rdma_cm_id *id);
++int ucma_shutdown(struct rdma_cm_id *id);
+ 
+ static inline int ERR(int err)
+ {
+diff --git a/src/rsocket.c b/src/rsocket.c
+index f94ddf3..c7a491b 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -3153,7 +3153,7 @@ out:
+ 	if (rs->state & rs_disconnected) {
+ 		/* Generate event by flushing receives to unblock rpoll */
+ 		ibv_req_notify_cq(rs->cm_id->recv_cq, 0);
+-		rdma_disconnect(rs->cm_id);
++		ucma_shutdown(rs->cm_id);
+ 	}
+ 
+ 	return ret;
-- 
2.41.0