From c295f93184c062319a837f9171eb23189d306516 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 21 May 2012 16:50:17 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/conn-err | 8 ++++---- patches/refresh-temp | 29 ----------------------------- 3 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index e6350bf1..e85041e8 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: 31ab52698dbffd1e2bc5210be5edeb88f37929ce -Head: 4e4eaa5d48bf784690f545d6a2dece3ebd228fc3 +Previous: 02f72721773d1574f59b757decf25e8a3a2f31b9 +Head: 2d28d3ac1d7536a7ea2e699388b28df61455da6b Applied: destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816 - conn-err: 9cada6bb26cf09985bb6d4f21275829030e61509 - refresh-temp: 4e4eaa5d48bf784690f545d6a2dece3ebd228fc3 + conn-err: 2d28d3ac1d7536a7ea2e699388b28df61455da6b Unapplied: rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4 rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7 diff --git a/patches/conn-err b/patches/conn-err index 608de70d..fef229bc 100644 --- a/patches/conn-err +++ b/patches/conn-err @@ -1,5 +1,5 @@ Bottom: 7292817ed24068611ad6cac825c4f26c8476920e -Top: 43f639f6fd5107bf4b50f4200b055136fa2925b5 +Top: e59c7d297d75ab32441e4182b0c9e524692ce2c2 Author: Sean Hefty Date: 2012-05-21 16:39:46 -0700 @@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty --- diff --git a/examples/rstream.c b/examples/rstream.c -index 104b318..d2f4a9b 100644 +index 104b318..c440f04 100644 --- a/examples/rstream.c +++ b/examples/rstream.c @@ -448,7 +448,8 @@ static int client_connect(void) @@ -30,13 +30,13 @@ index 104b318..d2f4a9b 100644 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; + } } diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 9d59c2c4..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,29 +0,0 @@ -Bottom: 43f639f6fd5107bf4b50f4200b055136fa2925b5 -Top: e59c7d297d75ab32441e4182b0c9e524692ce2c2 -Author: Sean Hefty -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; - } - } -- 2.41.0