From ea1f8ef53da1856f3b03be3a834ed31530d5b168 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 6 Jun 2012 11:23:30 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/rs-maxseg | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta b/meta index 34f30f07..b19e49d5 100644 --- a/meta +++ b/meta @@ -1,11 +1,11 @@ Version: 1 -Previous: 42056b2e5835ec3ea17de238f8f52a6d2276abfb -Head: 110fcad2ecce39d6888448c19b08791ea193e7f9 +Previous: f6ed25702228538e05d6faeed5a801a12727bffc +Head: b99bd0638e7d22b1b0976a34a58efd352db420b3 Applied: rs-shutdown: 110fcad2ecce39d6888448c19b08791ea193e7f9 + rs-maxseg: b99bd0638e7d22b1b0976a34a58efd352db420b3 Unapplied: ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941 - rs-maxseg: 3593589a3e9bfc8bbaab75b45e090182313a69dc rs-spin: a0d1e796acd395c573a1b6d11dcdae09bd5d1b09 rs-defaults: 789cb60192f30396cc0ad7940fdd402bdce127f0 buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd diff --git a/patches/rs-maxseg b/patches/rs-maxseg index e2dfcc00..be2a33b5 100644 --- a/patches/rs-maxseg +++ b/patches/rs-maxseg @@ -1,5 +1,5 @@ -Bottom: 684e21cf3e81b4f5bd740456e0fea103e52d7d1f -Top: 729b947f8c52c96a11c4a33ff4ef447cd22cc5d1 +Bottom: 5e0be3cec4b1092b15ffff22ce847641d572b180 +Top: e8942df497cda9d853e5bbaa69226ad2ede0b3b9 Author: Sean Hefty Date: 2012-06-04 13:22:10 -0700 @@ -14,10 +14,10 @@ Signed-off-by: Sean Hefty --- diff --git a/src/rsocket.c b/src/rsocket.c -index a1679f1..e899e8a 100644 +index 8f20b4a..2fd106a 100644 --- a/src/rsocket.c +++ b/src/rsocket.c -@@ -1717,6 +1717,9 @@ int rsetsockopt(int socket, int level, int optname, +@@ -1716,6 +1716,9 @@ int rsetsockopt(int socket, int level, int optname, opt_on = *(int *) optval; ret = 0; break; @@ -27,7 +27,7 @@ index a1679f1..e899e8a 100644 default: break; } -@@ -1814,6 +1817,12 @@ int rgetsockopt(int socket, int level, int optname, +@@ -1802,6 +1805,12 @@ int rgetsockopt(int socket, int level, int optname, *((int *) optval) = !!(rs->tcp_opts & (1 << optname)); *optlen = sizeof(int); break; -- 2.41.0