From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 28 May 2012 06:55:12 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8c6d88c1fdeb57437cc823b38c5fa48e68b61b61;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 9ac133dc..4abb9d21 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: aa7c2f8d1038005d1cdc31395bdbceaf39750c48
-Head: 2c9b217c2919e0135a4718d91a8be010067a6f28
+Previous: 96cb35ef028d51c02f3b6b4c2367749da4628e8d
+Head: f3c9e277e786ae69f9da1105f590b5374a8c740c
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -11,8 +11,7 @@ Applied:
   pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
-  rs-1sge: 6018dff3bec9f70b2c1373af7919bc7f768356ad
-  refresh-temp: 2c9b217c2919e0135a4718d91a8be010067a6f28
+  rs-1sge: f3c9e277e786ae69f9da1105f590b5374a8c740c
 Unapplied:
   rs-def-inline: 50d6a49950b5ffc77b971e60c80045c5d70bda2b
   acm-sock: 11767dd5ff9823ee43369fd19a9c624ac4397360
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index d1cca65c..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: e8c78258fd1389fa7012b47fe14a62c9d0472281
-Top:    dbf2268a62da8784c6ab9033fc297c6d57babbda
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-27 23:55:11 -0700
-
-Refresh of rs-1sge
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 529c3b0..e480bfd 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1128,8 +1128,12 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
- 			xfer_size = rs->sbuf_bytes_avail;
- 		if (xfer_size > rs->target_sgl[rs->target_sge].length)
- 			xfer_size = rs->target_sgl[rs->target_sge].length;
--		if (xfer_size > rs_sbuf_left(rs))
--			xfer_size = rs_sbuf_left(rs);
-+		if (xfer_size > rs_sbuf_left(rs)) {
-+			if (xfer_size <= rs->sbuf_bytes_avail - rs_sbuf(left(rs)))
-+				rs->ssge.addr = (uintptr_t) rs->sbuf;
-+			else
-+				xfer_size = rs_sbuf_left(rs);
-+		}
- 
- 		if (xfer_size <= rs->sq_inline) {
- 			sge.addr = (uintptr_t) buf;
diff --git a/patches/rs-1sge b/patches/rs-1sge
index a58f87e5..4327b6df 100644
--- a/patches/rs-1sge
+++ b/patches/rs-1sge
@@ -1,5 +1,5 @@
 Bottom: 40360dccfdc90246ade8113c0fc63bee52ca7731
-Top:    e8c78258fd1389fa7012b47fe14a62c9d0472281
+Top:    dbf2268a62da8784c6ab9033fc297c6d57babbda
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-24 14:36:41 -0700
 
@@ -19,7 +19,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 1140975..529c3b0 100644
+index 1140975..e480bfd 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -90,6 +90,10 @@ enum {
@@ -155,12 +155,16 @@ index 1140975..529c3b0 100644
  			} else {
  				rs->ctrl_avail++;
  			}
-@@ -1144,34 +1128,22 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1144,34 +1128,26 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
  			xfer_size = rs->sbuf_bytes_avail;
  		if (xfer_size > rs->target_sgl[rs->target_sge].length)
  			xfer_size = rs->target_sgl[rs->target_sge].length;
-+		if (xfer_size > rs_sbuf_left(rs))
-+			xfer_size = rs_sbuf_left(rs);
++		if (xfer_size > rs_sbuf_left(rs)) {
++			if (xfer_size <= rs->sbuf_bytes_avail - rs_sbuf(left(rs)))
++				rs->ssge.addr = (uintptr_t) rs->sbuf;
++			else
++				xfer_size = rs_sbuf_left(rs);
++		}
  
  		if (xfer_size <= rs->sq_inline) {
  			sge.addr = (uintptr_t) buf;
@@ -199,7 +203,7 @@ index 1140975..529c3b0 100644
  		}
  		if (ret)
  			break;
-@@ -1253,33 +1225,21 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1253,33 +1229,21 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
  			xfer_size = rs->sbuf_bytes_avail;
  		if (xfer_size > rs->target_sgl[rs->target_sge].length)
  			xfer_size = rs->target_sgl[rs->target_sge].length;