refresh (create temporary patch)

diff --git a/meta b/meta
index 3ab3a45d3b7282f246b28e447beaa59f6a24aebf..5acb7da64e4e738b98ae3a3a5af411136c56a97d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 9298196ff377c293dfbcbb861f2cf9de7069aae6
-Head: 5ff48c0f5c19a7e53e64c31bfea2ad324918023a
+Previous: b54d6195c380a04c4719de01b51a85c4b5c715e7
+Head: 979d34a37836d6efa7457419e52bc70bf4e00212
 Applied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
   rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008
   shut_wr: 5ff48c0f5c19a7e53e64c31bfea2ad324918023a
+  refresh-temp: 979d34a37836d6efa7457419e52bc70bf4e00212
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..c514036
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,40 @@
+Bottom: 393bbdc7ad0ca287d5a2e8f29cfd409aae89e3e6
+Top:    8366a50fa5ca152bee136892dff4bc184f12b4cd
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-06-27 14:46:53 -0700
+
+Refresh of shut_wr
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 8b310c4..e3da27f 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -895,7 +895,7 @@ static int rs_poll_cq(struct rsocket *rs)
+                       case RS_OP_CTRL:
+                               if (rs_msg_data(imm_data) == RS_CTRL_DISCONNECT) {
+                                       rs->state = rs_disconnected;
+-                                      return ERR(ECONNRESET);
++                                      return 0;
+                               } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) {
+                                       rs_shutdown_state(rs, rs_connect_rd);
+                               }
+@@ -1137,7 +1137,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+       fastlock_acquire(&rs->rlock);
+       if (!rs_have_rdata(rs)) {
+               ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata);
+-              if (ret && errno != ECONNRESET)
++              if (ret) // && errno != ECONNRESET)
+                       goto out;
+       }
+ 
+@@ -1456,7 +1456,7 @@ check_cq:
+               rs_process_cq(rs, nonblock, test);
+ 
+               revents = 0;
+-              if ((events & POLLIN) && rs_have_rdata(rs))
++              if ((events & POLLIN) && rs_conn_have_rdata(rs))
+                       revents |= POLLIN;
+               if ((events & POLLOUT) && rs_can_send(rs))
+                       revents |= POLLOUT;