From 04452b4a8edb1d0ef54f0b8515d04ae1fd4cc5ff Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 21 May 2012 16:42:57 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/conn-err     | 30 ++++++++++++++++++++++++++++--
 patches/refresh-temp | 36 ------------------------------------
 3 files changed, 31 insertions(+), 42 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index a765ebb9..97fadfa6 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: cff619ddb8d98733142ec4e9ef8b5715e32f0d6b
-Head: d4b4bcf93641ac99642cc26f8ba36c669c5f1925
+Previous: 23f393eb02867b8079a30cbfaf89b1187c7f4b13
+Head: 4a2106a2b53475a275408d9676b145eb2e7da63d
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816
-  conn-err: e9d57bbed166fab9de45fa3482b0abdaff1bb2ed
-  refresh-temp: d4b4bcf93641ac99642cc26f8ba36c669c5f1925
+  conn-err: 4a2106a2b53475a275408d9676b145eb2e7da63d
 Unapplied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7
diff --git a/patches/conn-err b/patches/conn-err
index e95732ce..db379c53 100644
--- a/patches/conn-err
+++ b/patches/conn-err
@@ -1,5 +1,5 @@
 Bottom: 7292817ed24068611ad6cac825c4f26c8476920e
-Top:    7292817ed24068611ad6cac825c4f26c8476920e
+Top:    d9ab75e22bbc8454eec1cfd91c4d0f8a4eebd314
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-21 16:39:46 -0700
 
@@ -10,4 +10,30 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+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:
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 754397fd..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,36 +0,0 @@
-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:
-- 
2.41.0