refresh

diff --git a/meta b/meta
index 577a533142f5f24104c7f43182df41000a6cf568..a4601be19162221048b36a425e0f521566c0809a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: c822723ae2551500c6b7e5f434769d6d3f8a1778
-Head: 617ce68e6717eeec3562cce57077e197f465f151
+Previous: 028bc598439df3e0ce1b5284585af8e1f98bee35
+Head: 009c81a003aed2c2cc5fca0b48f1a2f913b353c0
 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: 6ce6ef9fdf294352623f93d9c648487e5f36080b
-  refresh-temp: 617ce68e6717eeec3562cce57077e197f465f151
+  rstream-bufsize: 009c81a003aed2c2cc5fca0b48f1a2f913b353c0
 Unapplied:
   rs-def-qpsize: 81e15fa8ac976f85a9cc0842564ad0edd5744311
   rs-1sge: 87b32f6b164477e6d1917d1a4b7a52e7187f0ea9

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 804cda9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 2a9ddfcac427ec14b8ced1791fd0a106156b6812
-Top:    0661b1e6af0fde76e36f815c48515f3ef47f9044
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-27 17:01:24 -0700
-
-Refresh of rstream-bufsize
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 757a0f6..6ff4f1c 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -351,12 +351,12 @@ out:
- static void set_options(int rs)
- {
-       int val, ret;
--      socklen_t size;
- 
-       if (buffer_size) {
--              size = sizeof buffer_size;
--              rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &buffer_size, size);
--              rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size, size);
-+              rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &buffer_size,
-+                            sizeof buffer_size);
-+              rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size,
-+                            sizeof buffer_size);
-       }
- 
-       val = 1;

diff --git a/patches/rstream-bufsize b/patches/rstream-bufsize
index 478f82e3c560fa1abc5ad7afb08f22d239f16300..e87da338a7cd861dfcb61e1d1b1ae62b117a3b1e 100644 (file)
--- a/patches/rstream-bufsize
+++ b/patches/rstream-bufsize
@@ -1,5 +1,5 @@
 Bottom: f33552f90d8a633f18fafcbe74fcba702da0d5c4
-Top:    2a9ddfcac427ec14b8ced1791fd0a106156b6812
+Top:    0661b1e6af0fde76e36f815c48515f3ef47f9044
 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..757a0f6 100644
+index c440f04..6ff4f1c 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -81,6 +81,7 @@ static int size_option;
@@ -28,8 +28,8 @@ index c440f04..757a0f6 100644
  {
 -      int val, optname, ret;
 -      long long bytes;
+-      socklen_t size;
 +      int val, ret;
-       socklen_t size;
  
 -      bytes = transfer_size * transfer_count * iterations;
 -      for (optname = SO_SNDBUF; ; optname = SO_RCVBUF) {
@@ -47,9 +47,10 @@ index c440f04..757a0f6 100644
 -              if (optname == SO_RCVBUF)
 -                      break;
 +      if (buffer_size) {
-+              size = sizeof buffer_size;
-+              rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &buffer_size, size);
-+              rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size, size);
++              rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &buffer_size,
++                            sizeof buffer_size);
++              rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size,
++                            sizeof buffer_size);
        }
  
        val = 1;