From 680b3628d76c4da682114310900df577e3b49bf1 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 29 May 2015 11:25:15 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/refresh-temp | 35 -----------------------------------
 patches/rs-initbufs  | 29 +++++++++++++++++++++++++++--
 3 files changed, 30 insertions(+), 41 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 90616015..8e224fb2 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: cc500679e58df0e5b0cf77282db8177b199c9f73
-Head: a75c69ebd97436dfce5f57f39245466f8b3eb0f8
+Previous: 4c110d361b14b5b2b6cf48d0373ef7037b3c64cb
+Head: 6384ce80e0ff710e4fe24a782cdd6069afc13435
 Applied:
-  rs-initbufs: d21329a1c55ac881a1430bbaeb2b7fea3b8769b4
-  refresh-temp: a75c69ebd97436dfce5f57f39245466f8b3eb0f8
+  rs-initbufs: 6384ce80e0ff710e4fe24a782cdd6069afc13435
 Unapplied:
   raccept-invalid: 8d5251952074622e8be0c9828d5eb573b4a1c6d2
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 3ebac791..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 3556f173e3d38cdf07e4b42632dc27ffd1a6ab1f
-Top:    ba0e63b777474cf9c3176c7ae793e229dbdff16f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-05-29 11:25:14 -0700
-
-Refresh of rs-initbufs
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index bcb253e..95d791c 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -839,10 +839,6 @@ static int rs_create_ep(struct rsocket *rs)
- 	rs_set_qp_size(rs);
- 	if (rs->cm_id->verbs->device->transport_type == IBV_TRANSPORT_IWARP)
- 		rs->opts |= RS_OPT_MSG_SEND;
--	ret = rs_init_bufs(rs);
--	if (ret)
--		return ret;
--
- 	ret = rs_create_cq(rs, rs->cm_id);
- 	if (ret)
- 		return ret;
-@@ -867,6 +863,10 @@ static int rs_create_ep(struct rsocket *rs)
- 	if ((rs->opts & RS_OPT_MSG_SEND) && (rs->sq_inline < RS_MSG_SIZE))
- 		return ERR(ENOTSUP);
- 
-+	ret = rs_init_bufs(rs);
-+	if (ret)
-+		return ret;
-+
- 	for (i = 0; i < rs->rq_size; i++) {
- 		ret = rs_post_recv(rs);
- 		if (ret)
diff --git a/patches/rs-initbufs b/patches/rs-initbufs
index 306b789d..da2f32f0 100644
--- a/patches/rs-initbufs
+++ b/patches/rs-initbufs
@@ -1,5 +1,5 @@
 Bottom: 3556f173e3d38cdf07e4b42632dc27ffd1a6ab1f
-Top:    3556f173e3d38cdf07e4b42632dc27ffd1a6ab1f
+Top:    ba0e63b777474cf9c3176c7ae793e229dbdff16f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2015-05-29 11:24:26 -0700
 
@@ -25,4 +25,29 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index bcb253e..95d791c 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -839,10 +839,6 @@ static int rs_create_ep(struct rsocket *rs)
+ 	rs_set_qp_size(rs);
+ 	if (rs->cm_id->verbs->device->transport_type == IBV_TRANSPORT_IWARP)
+ 		rs->opts |= RS_OPT_MSG_SEND;
+-	ret = rs_init_bufs(rs);
+-	if (ret)
+-		return ret;
+-
+ 	ret = rs_create_cq(rs, rs->cm_id);
+ 	if (ret)
+ 		return ret;
+@@ -867,6 +863,10 @@ static int rs_create_ep(struct rsocket *rs)
+ 	if ((rs->opts & RS_OPT_MSG_SEND) && (rs->sq_inline < RS_MSG_SIZE))
+ 		return ERR(ENOTSUP);
+ 
++	ret = rs_init_bufs(rs);
++	if (ret)
++		return ret;
++
+ 	for (i = 0; i < rs->rq_size; i++) {
+ 		ret = rs_post_recv(rs);
+ 		if (ret)
-- 
2.41.0