refresh

diff --git a/meta b/meta
index 8bb4181805f754d69721f6a2050c4a3029ad086d..bc2e1a7b1ffcd96fea93cf8ce3dbcdf29588c7e7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: a798b60022cb676bfcb64e99f7f58bbd71b74310
-Head: d3138de74b46d23ce3193d50c853ae68890e68b1
+Previous: ab285c438b3fce31dcf118d7a04542e8c3ee0c17
+Head: 37b02022a84c4755549c3a74ed932b02e40d0509
 Applied:
   rst-afib: 34148679ac24e294b1157d24f240b09e8aa7603a
   ex-afib: f137c61b3e9db128e1614c429c1e382de4448146
-  rs-setroute: cecbb3b118fdd309aabb35d7225daa43bf3f4c6e
-  refresh-temp: d3138de74b46d23ce3193d50c853ae68890e68b1
+  rs-setroute: 37b02022a84c4755549c3a74ed932b02e40d0509
 Unapplied:
   stpath: 42f041c955fcffdaf18c742ee69f4eadab7d138b
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 30ea709..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: c1ab11d740a32967db76710c9719b730964ab841
-Top:    739a68b4f57f0f0eb2ed2dff067ebc5d7d38c39d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-08-02 14:17:03 -0700
-
-Refresh of rs-setroute
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 7768f58..e3406a4 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -3326,6 +3326,7 @@ int rsetsockopt(int socket, int level, int optname,
-                       if ((rs->optval = calloc(optlen, 1))) {
-                               memcpy(rs->optval, optval, optlen);
-                               rs->optlen = optlen;
-+                              ret = 0;
-                       } else {
-                               ret = ERR(ENOMEM);
-                       }

diff --git a/patches/rs-setroute b/patches/rs-setroute
index 940d43e84ceb8ee7fffc7d67ad32079e0f705be8..99fd9af964c253bbff7823a2758464586fedea19 100644 (file)
--- a/patches/rs-setroute
+++ b/patches/rs-setroute
@@ -1,5 +1,5 @@
 Bottom: 69bf5ca32ecd53b5d4e71ae3c190fb165b0b729e
-Top:    c1ab11d740a32967db76710c9719b730964ab841
+Top:    739a68b4f57f0f0eb2ed2dff067ebc5d7d38c39d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-06-10 12:33:20 -0700
 
@@ -31,7 +31,7 @@ index f220c13..efd0db5 100644
  
  int rsetsockopt(int socket, int level, int optname,
 diff --git a/src/rsocket.c b/src/rsocket.c
-index e2b1cc7..7768f58 100644
+index e2b1cc7..e3406a4 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -329,6 +329,8 @@ struct rsocket {
@@ -60,7 +60,7 @@ index e2b1cc7..7768f58 100644
                if (!ret)
                        goto do_connect;
                if (errno == EAGAIN || errno == EWOULDBLOCK)
-@@ -3312,6 +3322,14 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -3312,6 +3322,15 @@ int rsetsockopt(int socket, int level, int optname,
                        rs->target_iomap_size = (uint16_t) rs_scale_to_value(
                                (uint8_t) rs_value_to_scale(*(int *) optval, 8), 8);
                        break;
@@ -68,6 +68,7 @@ index e2b1cc7..7768f58 100644
 +                      if ((rs->optval = calloc(optlen, 1))) {
 +                              memcpy(rs->optval, optval, optlen);
 +                              rs->optlen = optlen;
++                              ret = 0;
 +                      } else {
 +                              ret = ERR(ENOMEM);
 +                      }