refresh (create temporary patch)

diff --git a/meta b/meta
index 4abb9d21d5a917440fd2764ca7a1f3c2aaacd672..c97d55857a19dbbe01d03a6d87d426d89ea7f3d5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 96cb35ef028d51c02f3b6b4c2367749da4628e8d
-Head: f3c9e277e786ae69f9da1105f590b5374a8c740c
+Previous: 603400178559d614dc3c6b02e1c813a274b02062
+Head: 439dd9bff765127e759e4d7d7273357d3aef9acd
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -12,6 +12,7 @@ Applied:
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
   rs-1sge: f3c9e277e786ae69f9da1105f590b5374a8c740c
+  refresh-temp: 439dd9bff765127e759e4d7d7273357d3aef9acd
 Unapplied:
   rs-def-inline: 50d6a49950b5ffc77b971e60c80045c5d70bda2b
   acm-sock: 11767dd5ff9823ee43369fd19a9c624ac4397360

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..f26815b
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,22 @@
+Bottom: dbf2268a62da8784c6ab9033fc297c6d57babbda
+Top:    d6059001f0d2f622720ad871c89e3c1ef4410125
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-05-27 23:56:47 -0700
+
+Refresh of rs-1sge
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index e480bfd..5be242f 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1129,7 +1129,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+               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)) {
+-                      if (xfer_size <= rs->sbuf_bytes_avail - 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);