refresh

diff --git a/meta b/meta
index 252e1894cf924838911f0097aba1eddc29ccbb61..16d40b732c7abb3bbe4ba370dc38242ade2326b4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: f4e1015b13d7e3aae6d557e8aa34841b64ca297b
-Head: d4d85c61dc2a3e87de7d4f038807bce1ca066a20
+Previous: 21ab0d312985e66e3b0388ea0ac894f7de202912
+Head: 76a7691690cd14c123b4a3125598134edd567e1f
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -9,8 +9,7 @@ Applied:
   rs-opt-qpsize: 624840f02ef94f140cdfae9d97c1d0235e4780d2
   rs-opt-inline: b624fedb7c85a3fa5b4911ebfe56815470248832
   pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead
-  rstream-bufsize: 009c81a003aed2c2cc5fca0b48f1a2f913b353c0
-  refresh-temp: d4d85c61dc2a3e87de7d4f038807bce1ca066a20
+  rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
 Unapplied:
   rs-def-qpsize: 1fdfe90077e8dad426a83e7d24391f86a75455c7
   rs-1sge: 44fcb3625bfa10b86d563676e3337e46a64cd65f

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3a53a3d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 0661b1e6af0fde76e36f815c48515f3ef47f9044
-Top:    10c0603e82f16fda92188aa5294c129cab457160
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-27 17:05:53 -0700
-
-Refresh of rstream-bufsize
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 6ff4f1c..df36e34 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -350,7 +350,7 @@ out:
- 
- static void set_options(int rs)
- {
--      int val, ret;
-+      int val;
- 
-       if (buffer_size) {
-               rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &buffer_size,

diff --git a/patches/rstream-bufsize b/patches/rstream-bufsize
index e87da338a7cd861dfcb61e1d1b1ae62b117a3b1e..ffaa7e4af241a8030cf3a246320528c766bdca5b 100644 (file)
--- a/patches/rstream-bufsize
+++ b/patches/rstream-bufsize
@@ -1,5 +1,5 @@
 Bottom: f33552f90d8a633f18fafcbe74fcba702da0d5c4
-Top:    0661b1e6af0fde76e36f815c48515f3ef47f9044
+Top:    10c0603e82f16fda92188aa5294c129cab457160
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-23 11:32:46 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index c440f04..6ff4f1c 100644
+index c440f04..df36e34 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -81,6 +81,7 @@ static int size_option;
@@ -29,7 +29,7 @@ index c440f04..6ff4f1c 100644
 -      int val, optname, ret;
 -      long long bytes;
 -      socklen_t size;
-+      int val, ret;
++      int val;
  
 -      bytes = transfer_size * transfer_count * iterations;
 -      for (optname = SO_SNDBUF; ; optname = SO_RCVBUF) {