refresh

diff --git a/meta b/meta
index fdc04a62f1b0f611710748a04f727c3422b17831..1de56c3121471dd2b8a36db182b376b40b6aa9fa 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 546317244f634ebcd63f250410b50c1cbf872ab6
-Head: 7ef9ea8e3b39f7fbbae0c2ec5732e1257e76c0bc
+Previous: e9684460b9deef525864e1ca867a27f7814a0542
+Head: 1fdb8dc1bff60f2748e148a081aae55b7fa80034
 Applied:
   v6only: 36dbcc6dd62fc62a0bb8bc3cc82869eb4242fd4f
-  rselect: 2a0acf4e53e8222b05a0edccb4e3563c5972d9a5
-  refresh-temp: 7ef9ea8e3b39f7fbbae0c2ec5732e1257e76c0bc
+  rselect: 1fdb8dc1bff60f2748e148a081aae55b7fa80034
 Unapplied:
   shut_wr: a18d1376ce88661c5c65bb65572148444cff6a8b
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d7e13c7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 44f8f1d4ce3fc0356402ae05bbe8b63c973a4865
-Top:    938168c7141b54196d5a134aca1fe7c88dcfb3b5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-25 15:14:04 -0700
-
-Refresh of rselect
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 860c63e..ed994fe 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1631,7 +1631,7 @@ rs_poll_to_select(int nfds, struct pollfd *fds, fd_set *readfds,
-       int i, cnt = 0;
- 
-       for (i = 0; i < nfds; i++) {
--              if (readfds && (fds[i].revents & POLLIN)) {
-+              if (readfds && (fds[i].revents & (POLLIN | POLLHUP))) {
-                       FD_SET(fds[i].fd, readfds);
-                       cnt++;
-               }

diff --git a/patches/rselect b/patches/rselect
index ca73afb08ed4d1b9e984e72a535fc7eb8c1f1845..9d874efe6e678d6b1a1c11939b95cff48b17e17c 100644 (file)
--- a/patches/rselect
+++ b/patches/rselect
@@ -1,5 +1,5 @@
 Bottom: 44f8f1d4ce3fc0356402ae05bbe8b63c973a4865
-Top:    44f8f1d4ce3fc0356402ae05bbe8b63c973a4865
+Top:    938168c7141b54196d5a134aca1fe7c88dcfb3b5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 15:04:52 -0700
 
@@ -10,4 +10,16 @@ SIgned-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 860c63e..ed994fe 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1631,7 +1631,7 @@ rs_poll_to_select(int nfds, struct pollfd *fds, fd_set *readfds,
+       int i, cnt = 0;
+ 
+       for (i = 0; i < nfds; i++) {
+-              if (readfds && (fds[i].revents & POLLIN)) {
++              if (readfds && (fds[i].revents & (POLLIN | POLLHUP))) {
+                       FD_SET(fds[i].fd, readfds);
+                       cnt++;
+               }