refresh

diff --git a/meta b/meta
index 10a1d335fd970d92af30502420dbd0ca4992750f..d9847452ad51fc37620e12db57b4212fe112615c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 19013aa8188aabe14f60ce075cfd7e9d75c5e9b8
-Head: d0f82a8600e378ce967702690b3b835c777f820b
+Previous: 4f2341592c5595eab8abc3f9797c1cb7030ff531
+Head: 5750822173a5e70c466827411c79d9cddb005799
 Applied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
   rselect: 52ee17ec6697c63e048d2c875371e6ab452c0541
-  shut_wr: be33272d7d5c1d47aad6bca80e8f7c1f9a2aea30
-  refresh-temp: d0f82a8600e378ce967702690b3b835c777f820b
+  shut_wr: 5750822173a5e70c466827411c79d9cddb005799
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d5eeb30..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: a67f701fbc904bcaea2ce884e38088db7feaff9d
-Top:    a67f701fbc904bcaea2ce884e38088db7feaff9d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-27 15:13:18 -0700
-
-Refresh of shut_wr
-
----
-
-

diff --git a/patches/shut_wr b/patches/shut_wr
index e5fb2c2092fcaba7ea9684701c8c12cc20d8f404..ec4363d6f698ef15fd312c08dfbb70ff0df08f62 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -3,10 +3,21 @@ Top:    a67f701fbc904bcaea2ce884e38088db7feaff9d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 14:19:54 -0700
 
-rsocket: Handle SHUT_WR shutdown option
+rsocket: Handle other shutdown option
+
+Handle SHUT_RD and SHUT_WR shutdown options.
 
 In order to handle shutting down the send and receive sides
-separately, we break the connection state into multiple substates.
+separately, we break the connection state into multiple sub-states.
+This allows us to be partially connected (i.e. for either just
+reads or just writes).
+
+Support for SHUT_WR is needed to handle netperf properly, which
+shuts down a socket by having the client use SHUT_WR, followed by
+the server completing the disconnect with SHUT_RDWR.  The following
+patch eliminates an error message from netperf:
+
+'shutdown_control: no response received  errno 95'
 
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>