commit

diff --git a/meta b/meta
index f3a7252972f0f5822980585554563c10fe9b65c0..1c29cd6257dd3e82210302e0905ed0eef2caab45 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 75eed9b3c698f689b78c63405c6be19321cdc44f
+Previous: 62df40bf07afceea718c57998a5abd38a4e225e4
 Head: 2e5b0fc95964f74ea59dd725e849027faa0cd526
 Applied:
-  rselect: 0680bea236f65373732b82d405787cf979ee5c67
   shut_wr: 2e5b0fc95964f74ea59dd725e849027faa0cd526
 Unapplied:
   v6only-kernel: 56e2b4566930fa7b05debec8b247e8dfe9df7ffe

diff --git a/patches/rselect b/patches/rselect
deleted file mode 100644 (file)
index 312fca5..0000000
--- a/patches/rselect
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: b2be28c058bcea1f57039dd4966c64ac692e6bfa
-Top:    af4cc3c64b7827f75b1392c03c0414ad0a869bca
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-25 15:04:52 -0700
-
-rsocket: Set readfds event if rsocket has been disconnected
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index a3c2c6a..012bb5e 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1630,7 +1630,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++;
-               }