refresh (create temporary patch)

diff --git a/meta b/meta
index 205c8d50405864f0f20a21b0bf771b73d5561cb2..e6350bf1bc6aa59ea7385a81062a7d29ee172974 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 0c74750b6e16532022af17e5ad5cfede0654568e
-Head: 9cada6bb26cf09985bb6d4f21275829030e61509
+Previous: 31ab52698dbffd1e2bc5210be5edeb88f37929ce
+Head: 4e4eaa5d48bf784690f545d6a2dece3ebd228fc3
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816
   conn-err: 9cada6bb26cf09985bb6d4f21275829030e61509
+  refresh-temp: 4e4eaa5d48bf784690f545d6a2dece3ebd228fc3
 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..9d59c2c
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: 43f639f6fd5107bf4b50f4200b055136fa2925b5
+Top:    e59c7d297d75ab32441e4182b0c9e524692ce2c2
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-05-21 16:50:16 -0700
+
+Refresh of conn-err
+
+---
+
+diff --git a/examples/rstream.c b/examples/rstream.c
+index d2f4a9b..c440f04 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -480,13 +480,13 @@ static int client_connect(void)
+                       goto err;
+ 
+               len = sizeof err;
+-              ret = getsockopt(rs, SOL_SOCKET, SO_ERROR, &err, &len);
++              ret = rs_getsockopt(rs, SOL_SOCKET, SO_ERROR, &err, &len);
+               if (ret)
+                       goto err;
+               if (err) {
+                       ret = -1;
+                       errno = err;
+-                      perror("async rconnect")
++                      perror("async rconnect");
+                       goto err;
+               }
+       }