refresh

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f26815b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-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);

diff --git a/patches/rs-1sge b/patches/rs-1sge
index 4327b6dfa7a72e06d5a32524d269bb13c576b88e..13601e097b9fded6f50da3dfe49e0ae0f37b1041 100644 (file)
--- a/patches/rs-1sge
+++ b/patches/rs-1sge
@@ -1,5 +1,5 @@
 Bottom: 40360dccfdc90246ade8113c0fc63bee52ca7731
-Top:    dbf2268a62da8784c6ab9033fc297c6d57babbda
+Top:    d6059001f0d2f622720ad871c89e3c1ef4410125
 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..e480bfd 100644
+index 1140975..5be242f 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -90,6 +90,10 @@ enum {
@@ -160,7 +160,7 @@ index 1140975..e480bfd 100644
                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);