refresh (create temporary patch)

diff --git a/meta b/meta
index 2d5f4f5a4336f0977fef71f6bdf8ba08d2f8e2b6..a765ebb9e236b7daa85cda3e3c3e93131fef8b75 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: bfa4f54ae4354133b2e4bb19e77e429b4d153119
-Head: e9d57bbed166fab9de45fa3482b0abdaff1bb2ed
+Previous: cff619ddb8d98733142ec4e9ef8b5715e32f0d6b
+Head: d4b4bcf93641ac99642cc26f8ba36c669c5f1925
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816
   conn-err: e9d57bbed166fab9de45fa3482b0abdaff1bb2ed
+  refresh-temp: d4b4bcf93641ac99642cc26f8ba36c669c5f1925
 Unapplied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..754397f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,36 @@
+Bottom: 7292817ed24068611ad6cac825c4f26c8476920e
+Top:    d9ab75e22bbc8454eec1cfd91c4d0f8a4eebd314
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-05-21 16:42:56 -0700
+
+Refresh of conn-err
+
+---
+
+diff --git a/examples/rstream.c b/examples/rstream.c
+index 104b318..393b40f 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -448,7 +448,7 @@ static int client_connect(void)
+ {
+       struct addrinfo *res;
+       struct pollfd fds;
+-      int ret, rs;
++      int ret, rs, err, len;
+ 
+       ret = getaddrinfo(dst_addr, port, NULL, &res);
+       if (ret) {
+@@ -477,6 +477,13 @@ 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;
++                      goto err;
++              }
+       }
+ 
+ free: