refresh

diff --git a/meta b/meta
index 90fab764ed644b006e59b29bf89c298751e29b09..2c0cbc183f1f780f1b9e10dda9a2f115b7472ad9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 14246947bc419b2347cf13088fede255671509bd
-Head: aa5c73a99463e80ef5206d8cede6ae9dc2fe79a0
+Previous: fc78f0f0e245f90333f6d18ef038489cdbad2610
+Head: 4bd520ce45cf7ce7e33f94f9507c0d6d74eae2bd
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816
-  conn-err: 4a2106a2b53475a275408d9676b145eb2e7da63d
-  refresh-temp: aa5c73a99463e80ef5206d8cede6ae9dc2fe79a0
+  conn-err: 4bd520ce45cf7ce7e33f94f9507c0d6d74eae2bd
 Unapplied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7

diff --git a/patches/conn-err b/patches/conn-err
index db379c5307397443c771571c8d728efa020fed0b..ac2e38cbb23f08a14923c73525f7243996469ede 100644 (file)
--- a/patches/conn-err
+++ b/patches/conn-err
@@ -1,5 +1,5 @@
 Bottom: 7292817ed24068611ad6cac825c4f26c8476920e
-Top:    d9ab75e22bbc8454eec1cfd91c4d0f8a4eebd314
+Top:    a4f930386d1079ec83f29bd0c722114770f6554d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-21 16:39:46 -0700
 
@@ -11,19 +11,20 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 104b318..393b40f 100644
+index 104b318..cd8a962 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
-@@ -448,7 +448,7 @@ static int client_connect(void)
+@@ -448,7 +448,8 @@ static int client_connect(void)
  {
        struct addrinfo *res;
        struct pollfd fds;
 -      int ret, rs;
-+      int ret, rs, err, len;
++      int ret, rs, err;
++      socklen_t len;
  
        ret = getaddrinfo(dst_addr, port, NULL, &res);
        if (ret) {
-@@ -477,6 +477,13 @@ static int client_connect(void)
+@@ -477,6 +478,13 @@ static int client_connect(void)
                ret = do_poll(&fds);
                if (ret)
                        goto err;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f324797..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: d9ab75e22bbc8454eec1cfd91c4d0f8a4eebd314
-Top:    a4f930386d1079ec83f29bd0c722114770f6554d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-21 16:43:48 -0700
-
-Refresh of conn-err
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 393b40f..cd8a962 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -448,7 +448,8 @@ static int client_connect(void)
- {
-       struct addrinfo *res;
-       struct pollfd fds;
--      int ret, rs, err, len;
-+      int ret, rs, err;
-+      socklen_t len;
- 
-       ret = getaddrinfo(dst_addr, port, NULL, &res);
-       if (ret) {