refresh

diff --git a/meta b/meta
index cbdb7b7cd66e17fc1ff9fe7d436da64db3aa31be..cb88d581f7f2dc52f2b8c550e4619eb3796222a4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: c1e724db870414f234ec5fe8e067f9a35096ba8c
-Head: 0ae80c899c8cdf23c9dd8db0a934fd87c259c455
+Previous: c7a3339a61fc7596904d932ac8916fb0eff83994
+Head: 596a40878930661e8157160015cf4cf0f98460af
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816
-  conn-err: 4bd520ce45cf7ce7e33f94f9507c0d6d74eae2bd
-  refresh-temp: 0ae80c899c8cdf23c9dd8db0a934fd87c259c455
+  conn-err: 596a40878930661e8157160015cf4cf0f98460af
 Unapplied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7

diff --git a/patches/conn-err b/patches/conn-err
index ac2e38cbb23f08a14923c73525f7243996469ede..379963089a342fe0144714b04b77e8c9e16e5ce5 100644 (file)
--- a/patches/conn-err
+++ b/patches/conn-err
@@ -1,5 +1,5 @@
 Bottom: 7292817ed24068611ad6cac825c4f26c8476920e
-Top:    a4f930386d1079ec83f29bd0c722114770f6554d
+Top:    3913d172c2d623b9aa46a39a6b725092c2b0d3ca
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-21 16:39: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 104b318..cd8a962 100644
+index 104b318..34ff421 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -448,7 +448,8 @@ static int client_connect(void)
@@ -24,15 +24,18 @@ index 104b318..cd8a962 100644
  
        ret = getaddrinfo(dst_addr, port, NULL, &res);
        if (ret) {
-@@ -477,6 +478,13 @@ static int client_connect(void)
+@@ -477,6 +478,16 @@ static int client_connect(void)
                ret = do_poll(&fds);
                if (ret)
                        goto err;
 +
 +              len = sizeof err;
 +              ret = getsockopt(rs, SOL_SOCKET, SO_ERROR, &err, &len);
-+              if (ret || err) {
-+                      ret = ret ? ret : err;
++              if (ret)
++                      goto err;
++              if (err) {
++                      ret = rdma_seterrno(err);
++                      perror("async rconnect")
 +                      goto err;
 +              }
        }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index de662e5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,27 +0,0 @@
-Bottom: a4f930386d1079ec83f29bd0c722114770f6554d
-Top:    3913d172c2d623b9aa46a39a6b725092c2b0d3ca
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-21 16:46:34 -0700
-
-Refresh of conn-err
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index cd8a962..34ff421 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -481,8 +481,11 @@ static int client_connect(void)
- 
-               len = sizeof err;
-               ret = getsockopt(rs, SOL_SOCKET, SO_ERROR, &err, &len);
--              if (ret || err) {
--                      ret = ret ? ret : err;
-+              if (ret)
-+                      goto err;
-+              if (err) {
-+                      ret = rdma_seterrno(err);
-+                      perror("async rconnect")
-                       goto err;
-               }
-       }