refresh

diff --git a/meta b/meta
index f1416fb091fd317381c989eaf2f87cf2e62470ff..03656108e0b027f4adf1acbfecd14844eda9244e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: a7c34acb3711d0f318d2a240e5ee29163f6b2d8a
-Head: 371ab9ae31a774d555f8120c600969fd65809318
+Previous: 5cc163797d21bca6f309e0b373b6ebe2ee17cccd
+Head: b6ab68e5c14b28ea22ac8cb5b298a6a0bfa25b99
 Applied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
   rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008
-  shut_wr: c3b8499f9b74637970a84de6affdf64eb85e1a99
-  refresh-temp: 371ab9ae31a774d555f8120c600969fd65809318
+  shut_wr: b6ab68e5c14b28ea22ac8cb5b298a6a0bfa25b99
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 19b8cf8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 1c160ef5df5740a60dc56e2b865de959ae19f00c
-Top:    682d725f0f3e78b58304d69dab7b65bb75b6be16
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-27 09:56:41 -0700
-
-Refresh of shut_wr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 581ecd8..4ecb425 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1741,7 +1741,7 @@ 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);
- 
--      if ((rs->fd_flags & O_NONBLOCK) && (how == SHUT_WR))
-+      if ((rs->fd_flags & O_NONBLOCK) && (rs->state & rs_connected))
-               rs_set_nonblocking(rs, 1);
- 
-       return 0;

diff --git a/patches/shut_wr b/patches/shut_wr
index 183d2301bfe84d771506778a4a4f98933da41baf..0ede9ec761899b067bce22b3ce5e8511359ea114 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
 Bottom: 47c055283ab722851373ec3c7f8affac14e1f08b
-Top:    1c160ef5df5740a60dc56e2b865de959ae19f00c
+Top:    682d725f0f3e78b58304d69dab7b65bb75b6be16
 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 c833d46..581ecd8 100644
+index c833d46..4ecb425 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -96,7 +96,8 @@ enum {
@@ -341,7 +341,7 @@ index c833d46..581ecd8 100644
 +      if (!rs_all_sends_done(rs) && !(rs->state & rs_error))
                rs_process_cq(rs, 0, rs_all_sends_done);
  
-+      if ((rs->fd_flags & O_NONBLOCK) && (how == SHUT_WR))
++      if ((rs->fd_flags & O_NONBLOCK) && (rs->state & rs_connected))
 +              rs_set_nonblocking(rs, 1);
 +
        return 0;