refresh

diff --git a/meta b/meta
index d30bcd250f563e13c38e74c0f563e6774eb9485a..ee064c155dd89989769f9f84bcca619e91544200 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 3e2a05ecc6c545ee56d602e7b87c64a3acbbb459
-Head: 7afdc7bd8fb498dddc17da88f7402913a51e4b6d
+Previous: fed3462835b91d164a6f35f82d19f7240041f828
+Head: b2b48ba0a9ade70864e201b41e4cc7214081b452
 Applied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
   rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008
-  shut_wr: 761724caeae12d1d82a80f09ba5e6e3935f228df
-  refresh-temp: 7afdc7bd8fb498dddc17da88f7402913a51e4b6d
+  shut_wr: b2b48ba0a9ade70864e201b41e4cc7214081b452
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d7cc1fd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 971825c3c112e14db9db5ba78fbe42a1f9fde63d
-Top:    1264339bc4c5c10bfdee4de6e8d685732a67024a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-26 17:14:23 -0700
-
-Refresh of shut_wr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 4eb1ce1..4ed646b 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -145,9 +145,9 @@ enum rs_state {
-       rs_connecting      = rs_opening |   0x0040,
-       rs_accepting       = rs_opening |   0x0080,
-       rs_connected       =                0x0100,
--      rs_connect_wr      = rs_connected | 0x0200,
--      rs_connect_rd      = rs_connected | 0x0400,
--      rs_connect_rdwr    = rs_connect_rd | rs_connect_wr,
-+      rs_connect_wr      =                0x0200,
-+      rs_connect_rd      =                0x0400,
-+      rs_connect_rdwr    = rs_connected | rs_connect_rd | rs_connect_wr,
-       rs_connect_error   =                0x0800,
-       rs_disconnected    =                0x1000,
-       rs_error           =                0x2000,

diff --git a/patches/shut_wr b/patches/shut_wr
index d8905cb85d283867505b205be2fd327436bb52d4..f73f43085483316ad068708026006f5e31eff968 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
 Bottom: 47c055283ab722851373ec3c7f8affac14e1f08b
-Top:    971825c3c112e14db9db5ba78fbe42a1f9fde63d
+Top:    1264339bc4c5c10bfdee4de6e8d685732a67024a
 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..4eb1ce1 100644
+index c833d46..4ed646b 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -96,7 +96,8 @@ enum {
@@ -46,9 +46,9 @@ index c833d46..4eb1ce1 100644
 +      rs_connecting      = rs_opening |   0x0040,
 +      rs_accepting       = rs_opening |   0x0080,
 +      rs_connected       =                0x0100,
-+      rs_connect_wr      = rs_connected | 0x0200,
-+      rs_connect_rd      = rs_connected | 0x0400,
-+      rs_connect_rdwr    = rs_connect_rd | rs_connect_wr,
++      rs_connect_wr      =                0x0200,
++      rs_connect_rd      =                0x0400,
++      rs_connect_rdwr    = rs_connected | rs_connect_rd | rs_connect_wr,
 +      rs_connect_error   =                0x0800,
 +      rs_disconnected    =                0x1000,
 +      rs_error           =                0x2000,