refresh

diff --git a/meta b/meta
index 6a66f74d8568ffef0240d08b298c197575d702ee..8e4be1ebf319d0e04681ecf8ae41a55bb2877d8a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: a783c78c4edcc232c6547c2fe4d3a4b8036b4edd
-Head: 40e8085b7ea32a642e2fb45b4da2c6dbe1b7aad7
+Previous: 2da7f92b4a7c361bae1d1c78a3436eb380cc23e3
+Head: 9eb853b70f4f3a13a876971d9e01cda955d95072
 Applied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
   rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008
-  shut_wr: 3c0a743cefee44fc24b5a6fcb8a043f77bf39a53
-  refresh-temp: 40e8085b7ea32a642e2fb45b4da2c6dbe1b7aad7
+  shut_wr: 9eb853b70f4f3a13a876971d9e01cda955d95072
 Unapplied:
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 28d5670..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 8366a50fa5ca152bee136892dff4bc184f12b4cd
-Top:    a67f701fbc904bcaea2ce884e38088db7feaff9d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-27 14:58:01 -0700
-
-Refresh of shut_wr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index e3da27f..419e9df 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -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)
-                       goto out;
-       }

diff --git a/patches/shut_wr b/patches/shut_wr
index f27bff96d4d76f5ad6c33c763ad5998281c95583..e5fb2c2092fcaba7ea9684701c8c12cc20d8f404 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
 Bottom: 47c055283ab722851373ec3c7f8affac14e1f08b
-Top:    8366a50fa5ca152bee136892dff4bc184f12b4cd
+Top:    a67f701fbc904bcaea2ce884e38088db7feaff9d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 14:19:54 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index c833d46..e3da27f 100644
+index c833d46..419e9df 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -96,7 +96,8 @@ enum {
@@ -196,7 +196,7 @@ index c833d46..e3da27f 100644
        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)
++              if (ret)
                        goto out;
        }