From: Sean Hefty Date: Tue, 26 Jun 2012 23:57:50 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1a726060b889c7cd221f1df0b30f488c0410d617;p=~shefty%2Flibrdmacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index f18ef619..b6cdee2e 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: cf43fde79636a9dafc97d1368300b6826362b2e7 -Head: cd25f6908f2a9aa48fd1fabe07fc3fd59b042bb9 +Previous: af2c472ce7e3e9cff54f2ea840a5e4babf7373af +Head: 53b41316a9900eeb58c6e7d4d41631a1c880da63 Applied: v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008 shut_wr: cd25f6908f2a9aa48fd1fabe07fc3fd59b042bb9 + refresh-temp: 53b41316a9900eeb58c6e7d4d41631a1c880da63 Unapplied: rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..3cc884df --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,22 @@ +Bottom: 05a5cd3651f670e432b95b931b9a56acfd6820c7 +Top: 971825c3c112e14db9db5ba78fbe42a1f9fde63d +Author: Sean Hefty +Date: 2012-06-26 16:57:50 -0700 + +Refresh of shut_wr + +--- + +diff --git a/src/rsocket.c b/src/rsocket.c +index 5fc5404..4eb1ce1 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -888,6 +888,8 @@ 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_connect_rd; + } + break; + default: