refresh

diff --git a/meta b/meta
index 8d9d32a3ff0b41066d299ef5e067c92273527c18..f60e42bcc5ad1a813d58e0ab8e69bec1ff23b289 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 4a71916ea0abe5b00da982bd42ea6b47de0230ce
-Head: 838cf5c94dec41384d4ebe0fa8f442d378ef51a0
+Previous: 0f41f2495f9846bb852d74d4698e38bf872bc18a
+Head: 3a1fc5e248717d04e0ca1cebab4b7b11e481e9dd
 Applied:
   v6only: 36dbcc6dd62fc62a0bb8bc3cc82869eb4242fd4f
   rselect: 1fdb8dc1bff60f2748e148a081aae55b7fa80034
-  shut_wr: 2745bf763a8bf2122ec8c1f75aef92387df6220d
-  refresh-temp: 838cf5c94dec41384d4ebe0fa8f442d378ef51a0
+  shut_wr: 3a1fc5e248717d04e0ca1cebab4b7b11e481e9dd
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6462a78..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 0e6b8c5a5f999b6695127164e8c2493cb15abf49
-Top:    fe4d692e928f917ad1c29688c0faf1fbc4bcfd01
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-25 17:23:59 -0700
-
-Refresh of shut_wr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 0bba7e5..8263def 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1457,8 +1457,6 @@ static int rs_poll_rs(struct rsocket *rs, int events,
-               }
-               /* fall through */
-       case rs_connected:
--      case rs_shutdown_rd:
--      case rs_shutdown_wr:
-       case rs_disconnected:
-       case rs_error:
-               rs_process_cq(rs, nonblock, test);

diff --git a/patches/shut_wr b/patches/shut_wr
index 9a969751556b863fd82151ecc935f7e275d7d3f0..073a256718d39182a47ddc8b08c749ee515e1d30 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
 Bottom: 938168c7141b54196d5a134aca1fe7c88dcfb3b5
-Top:    0e6b8c5a5f999b6695127164e8c2493cb15abf49
+Top:    fe4d692e928f917ad1c29688c0faf1fbc4bcfd01
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 14:19:54 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed994fe..0bba7e5 100644
+index ed994fe..8263def 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -321,7 +321,7 @@ static int rs_set_nonblocking(struct rsocket *rs, long arg)
@@ -41,16 +41,7 @@ index ed994fe..0bba7e5 100644
                rs->state = rs_error;
        }
  
-@@ -1457,6 +1457,8 @@ static int rs_poll_rs(struct rsocket *rs, int events,
-               }
-               /* fall through */
-       case rs_connected:
-+      case rs_shutdown_rd:
-+      case rs_shutdown_wr:
-       case rs_disconnected:
-       case rs_error:
-               rs_process_cq(rs, nonblock, test);
-@@ -1466,10 +1468,12 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+@@ -1466,10 +1466,12 @@ static int rs_poll_rs(struct rsocket *rs, int events,
                        revents |= POLLIN;
                if ((events & POLLOUT) && rs_can_send(rs))
                        revents |= POLLOUT;
@@ -67,7 +58,7 @@ index ed994fe..0bba7e5 100644
  
                return revents;
        case rs_connect_error:
-@@ -1690,12 +1694,16 @@ int rshutdown(int socket, int how)
+@@ -1690,12 +1692,16 @@ int rshutdown(int socket, int how)
        struct rsocket *rs;
        int ret = 0;
  
@@ -85,7 +76,7 @@ index ed994fe..0bba7e5 100644
                if (!rs_can_send_ctrl(rs)) {
                        ret = rs_process_cq(rs, 0, rs_can_send_ctrl);
                        if (ret)
-@@ -1711,6 +1719,9 @@ int rshutdown(int socket, int how)
+@@ -1711,6 +1717,9 @@ int rshutdown(int socket, int how)
        if (!rs_all_sends_done(rs) && rs->state != rs_error)
                rs_process_cq(rs, 0, rs_all_sends_done);