delete

diff --git a/meta b/meta
index 171b123980792a612de3716c23f86370a5b04533..5886124eae44ed3ca69b5e51981334510d74f809 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 2ee55a75a72dae78e23c8b0d8347f51ca3a295ac
+Previous: af25c7ec051570085e0dab790960dbccd415099a
 Head: 4c771a2a498204699ef8e91498214a9814422ee3
 Applied:
   rs2: 9f25d83861922ca4b4842c1d81359239c15b0575
   rs3: 15cd6383ad5db6dea95ed7e25101a3270d2cfb83
   rs4: 4c771a2a498204699ef8e91498214a9814422ee3
 Unapplied:
-  rs1: 110fcad2ecce39d6888448c19b08791ea193e7f9
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
 Hidden:

diff --git a/patches/rs1 b/patches/rs1
deleted file mode 100644 (file)
index 4ecc400..0000000
--- a/patches/rs1
+++ /dev/null
@@ -1,38 +0,0 @@
-Bottom: d79d5464622c07a1ee7c42051fee5fca02c52207
-Top:    5e0be3cec4b1092b15ffff22ce847641d572b180
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-04 13:14:42 -0700
-
-rsocket: Handle SHUT_RD/WR shutdown flags
-
-Sridhar Samudrala <sri@us.ibm.com> reported an error (EOPNOTSUPP)
-after calling select().
-
-The issue is that rshutdown(SHUT_WR) was called before select().
-As part of shutdown, rsockets switches the underlying fd from
-nonblocking to blocking to ensure that previously sent data has
-completed.  shutdown(SHUT_WR) indicates that the socket should be
-kept open for receiving data.
-
-Delay handling the actual shutdown unless SHUT_RDWR is specified,
-or the socket is closed.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index c111797..8f20b4a 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1592,6 +1592,9 @@ int rshutdown(int socket, int how)
-       struct rsocket *rs;
-       int ret = 0;
- 
-+      if (how != SHUT_RDWR)
-+              return 0;
-+
-       rs = idm_at(&idm, socket);
-       if (rs->fd_flags & O_NONBLOCK)
-               rs_set_nonblocking(rs, 0);