pop

diff --git a/meta b/meta
index 04e71a8159422bca24f9e4fc705a745745b1b985..d31610888fedadf27cd433f9c2617da0f3f57177 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 64cd5ce94e9c11d71b9aff5ea13dfe9ffaef3284
-Head: c6663b8beca52500bd665a8487d3edc6388e912c
+Previous: e7bb3bba23e2f32a09802ee00a278da449f09084
+Head: 9f25d83861922ca4b4842c1d81359239c15b0575
 Applied:
+  rs2: 9f25d83861922ca4b4842c1d81359239c15b0575
 Unapplied:
   rs1: 110fcad2ecce39d6888448c19b08791ea193e7f9
-  rs2: b99bd0638e7d22b1b0976a34a58efd352db420b3
   rs3: 9fb978ede0b7b548b7954f01097af337b938020c
   rs4: d1067d98830663fc9a95f6c9a502ac62d8e995a0
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/rs2 b/patches/rs2
index be2a33b55bf9d19f1e18c4a50af250fd9c1388dd..04e57e28f2b23671b4cf55868459794f42df9322 100644 (file)
--- a/patches/rs2
+++ b/patches/rs2
@@ -1,5 +1,5 @@
-Bottom: 5e0be3cec4b1092b15ffff22ce847641d572b180
-Top:    e8942df497cda9d853e5bbaa69226ad2ede0b3b9
+Bottom: d79d5464622c07a1ee7c42051fee5fca02c52207
+Top:    69d5a78d671e7db0e0da70e3702c92eceac177a8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-04 13:22:10 -0700
 
@@ -14,10 +14,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 8f20b4a..2fd106a 100644
+index c111797..e906fd4 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -1716,6 +1716,9 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -1713,6 +1713,9 @@ int rsetsockopt(int socket, int level, int optname,
                        opt_on = *(int *) optval;
                        ret = 0;
                        break;
@@ -27,7 +27,7 @@ index 8f20b4a..2fd106a 100644
                default:
                        break;
                }
-@@ -1802,6 +1805,12 @@ int rgetsockopt(int socket, int level, int optname,
+@@ -1799,6 +1802,12 @@ int rgetsockopt(int socket, int level, int optname,
                        *((int *) optval) = !!(rs->tcp_opts & (1 << optname));
                        *optlen = sizeof(int);
                        break;