refresh

diff --git a/meta b/meta
index 1aafe1930e93692d7d4cc37a44d98c86c70a144a..205c8d50405864f0f20a21b0bf771b73d5561cb2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: d4bdd5ca51e2806e08aa1e8a952b637a3c5542af
-Head: 7352ee478c84133ff40a657b7de57e0fcef12c88
+Previous: 0c74750b6e16532022af17e5ad5cfede0654568e
+Head: 9cada6bb26cf09985bb6d4f21275829030e61509
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816
-  conn-err: 596a40878930661e8157160015cf4cf0f98460af
-  refresh-temp: 7352ee478c84133ff40a657b7de57e0fcef12c88
+  conn-err: 9cada6bb26cf09985bb6d4f21275829030e61509
 Unapplied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7

diff --git a/patches/conn-err b/patches/conn-err
index 379963089a342fe0144714b04b77e8c9e16e5ce5..608de70d74c4006abd15f7368fc4d7d17f6f8391 100644 (file)
--- a/patches/conn-err
+++ b/patches/conn-err
@@ -1,5 +1,5 @@
 Bottom: 7292817ed24068611ad6cac825c4f26c8476920e
-Top:    3913d172c2d623b9aa46a39a6b725092c2b0d3ca
+Top:    43f639f6fd5107bf4b50f4200b055136fa2925b5
 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..34ff421 100644
+index 104b318..d2f4a9b 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -448,7 +448,8 @@ static int client_connect(void)
@@ -24,7 +24,7 @@ index 104b318..34ff421 100644
  
        ret = getaddrinfo(dst_addr, port, NULL, &res);
        if (ret) {
-@@ -477,6 +478,16 @@ static int client_connect(void)
+@@ -477,6 +478,17 @@ static int client_connect(void)
                ret = do_poll(&fds);
                if (ret)
                        goto err;
@@ -34,7 +34,8 @@ index 104b318..34ff421 100644
 +              if (ret)
 +                      goto err;
 +              if (err) {
-+                      ret = rdma_seterrno(err);
++                      ret = -1;
++                      errno = err;
 +                      perror("async rconnect")
 +                      goto err;
 +              }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 306ab59..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 3913d172c2d623b9aa46a39a6b725092c2b0d3ca
-Top:    43f639f6fd5107bf4b50f4200b055136fa2925b5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-21 16:47:14 -0700
-
-Refresh of conn-err
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 34ff421..d2f4a9b 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -484,7 +484,8 @@ static int client_connect(void)
-               if (ret)
-                       goto err;
-               if (err) {
--                      ret = rdma_seterrno(err);
-+                      ret = -1;
-+                      errno = err;
-                       perror("async rconnect")
-                       goto err;
-               }