refresh

diff --git a/meta b/meta
index 2191de0bf19b920206d24447d4fc0fbd9fd2fe98..7cdce6d25d87e14b9f724db1f672f29f6b2cccc8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 861186694140f083f081a674dd8d769888b3e232
-Head: 33353302e8d0342a9453698609232d99fe26d30d
+Previous: 1d3a1dd02b0576e0b209010849c2bf6a6f99a01f
+Head: ac51c1095f505373a6ec54b8f1d990259fb34d97
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
-  oobinline: 1bc11aabfd85f0763819b21e3321afbcc884513b
-  refresh-temp: 33353302e8d0342a9453698609232d99fe26d30d
+  oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
 Unapplied:
   fstat: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
   dbg-out: e2940be2ceb62a8d2765a10656e98152ef8b3707

diff --git a/patches/oobinline b/patches/oobinline
index 5332a7e736e221092d2414c5900464af276e9041..43197094b1bfb3168ebaa882444ed39a35f8d983 100644 (file)
--- a/patches/oobinline
+++ b/patches/oobinline
@@ -1,5 +1,5 @@
 Bottom: 7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
-Top:    7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
+Top:    3ea2748a5c41b11a2e7033c56bddd938d2770b6c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 21:31:12 -0700
 
@@ -13,4 +13,26 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index b9105a1..996cb2f 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1820,6 +1820,10 @@ int rsetsockopt(int socket, int level, int optname,
+                       opt_on = *(int *) optval;
+                       ret = 0;
+                       break;
++              case SO_OOBINLINE:
++                      opt_on = *(int *) optval;
++                      ret = 0;
++                      break;
+               default:
+                       break;
+               }
+@@ -1898,6 +1902,7 @@ int rgetsockopt(int socket, int level, int optname,
+               switch (optname) {
+               case SO_REUSEADDR:
+               case SO_KEEPALIVE:
++              case SO_OOBINLINE:
+                       *((int *) optval) = !!(rs->so_opts & (1 << optname));
+                       *optlen = sizeof(int);
+                       break;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9bbd81f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: 7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
-Top:    3ea2748a5c41b11a2e7033c56bddd938d2770b6c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 21:33:24 -0700
-
-Refresh of oobinline
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index b9105a1..996cb2f 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1820,6 +1820,10 @@ int rsetsockopt(int socket, int level, int optname,
-                       opt_on = *(int *) optval;
-                       ret = 0;
-                       break;
-+              case SO_OOBINLINE:
-+                      opt_on = *(int *) optval;
-+                      ret = 0;
-+                      break;
-               default:
-                       break;
-               }
-@@ -1898,6 +1902,7 @@ int rgetsockopt(int socket, int level, int optname,
-               switch (optname) {
-               case SO_REUSEADDR:
-               case SO_KEEPALIVE:
-+              case SO_OOBINLINE:
-                       *((int *) optval) = !!(rs->so_opts & (1 << optname));
-                       *optlen = sizeof(int);
-                       break;