From c87ce6fec34d9c6c97df938b8dc3a5ebe27b6bc5 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 25 Jun 2012 17:12:24 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 49dc2185..d4fabe9c 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: d7a2b3a030db2e35e040656453c50b0895016dc5 -Head: 84bdc5da587b58be831799eac853c7db9886a22d +Previous: f62cbfbb8bf5b95655cb3d33a36aab03362f5409 +Head: dd6737373d36a3d9feda9961b7bba0e16e548ec6 Applied: v6only: 36dbcc6dd62fc62a0bb8bc3cc82869eb4242fd4f rselect: 1fdb8dc1bff60f2748e148a081aae55b7fa80034 shut_wr: 84bdc5da587b58be831799eac853c7db9886a22d + refresh-temp: dd6737373d36a3d9feda9961b7bba0e16e548ec6 Unapplied: rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..7e7ca706 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,32 @@ +Bottom: 1ae738a42c25e6d2f1c92e4e79e5653b620de2c4 +Top: 0e6b8c5a5f999b6695127164e8c2493cb15abf49 +Author: Sean Hefty +Date: 2012-06-25 17:12:24 -0700 + +Refresh of shut_wr + +--- + +diff --git a/src/rsocket.c b/src/rsocket.c +index 63bf03e..0bba7e5 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -96,8 +96,7 @@ enum { + #define rs_msg_data(imm_data) (imm_data & 0x1FFFFFFF) + + enum { +- RS_CTRL_DISCONNECT, +- RS_CTRL_SHUTDOWN ++ RS_CTRL_DISCONNECT + }; + + struct rs_msg { +@@ -884,8 +883,6 @@ static int rs_poll_cq(struct rsocket *rs) + if (rs_msg_data(imm_data) == RS_CTRL_DISCONNECT) { + rs->state = rs_disconnected; + return ERR(ECONNRESET); +- } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) { +- rs->state = rs_shutdown_rd; + } + break; + default: -- 2.41.0