From 1fb670260d9d0f23c628c3211018c6cc817a55f3 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 4 Jun 2012 14:35:55 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 23 ----------------------- patches/rs-maxseg | 9 ++++----- 3 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index ce684d4f..62902d15 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: f6b05e68822b6c2e4ac754802b6ddc44a2eada1c -Head: 683de43e30a61ea4b2b7df85258b7a64b9fe6c75 +Previous: 302d239d0a98b5e794a73f46314fba529087c6b0 +Head: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1 Applied: ip6-opt: a459c228426c4d25684dcfd2a4203f013f0b454e rs-shutdown: f16748cbaea650f19805ddc6652895ca88d36a45 - rs-maxseg: 9998ea19ab9ea1cb9e8ad155cabffe95bda02d89 - refresh-temp: 683de43e30a61ea4b2b7df85258b7a64b9fe6c75 + rs-maxseg: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1 Unapplied: buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 65f06c0d..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,23 +0,0 @@ -Bottom: b1ad32563972d70c7a93d5dfe1e6de9eee4512e0 -Top: 729b947f8c52c96a11c4a33ff4ef447cd22cc5d1 -Author: Sean Hefty -Date: 2012-06-04 14:35:54 -0700 - -Refresh of rs-maxseg - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index 90502d3..e899e8a 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -1818,8 +1818,7 @@ int rgetsockopt(int socket, int level, int optname, - *optlen = sizeof(int); - break; - case TCP_MAXSEG: -- *((int *) optval) = (rs->cm_id && rs->cm_id->route && -- rs->cm_id->route.num_paths) ? -+ *((int *) optval) = (rs->cm_id && rs->cm_id->route.num_paths) ? - 1 << (7 + rs->cm_id->route.path_rec->mtu) : - 2048; - *optlen = sizeof(int); diff --git a/patches/rs-maxseg b/patches/rs-maxseg index 5063fdaf..e2dfcc00 100644 --- a/patches/rs-maxseg +++ b/patches/rs-maxseg @@ -1,5 +1,5 @@ Bottom: 684e21cf3e81b4f5bd740456e0fea103e52d7d1f -Top: b1ad32563972d70c7a93d5dfe1e6de9eee4512e0 +Top: 729b947f8c52c96a11c4a33ff4ef447cd22cc5d1 Author: Sean Hefty Date: 2012-06-04 13:22:10 -0700 @@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/rsocket.c b/src/rsocket.c -index a1679f1..90502d3 100644 +index a1679f1..e899e8a 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -1717,6 +1717,9 @@ int rsetsockopt(int socket, int level, int optname, @@ -27,13 +27,12 @@ index a1679f1..90502d3 100644 default: break; } -@@ -1814,6 +1817,13 @@ int rgetsockopt(int socket, int level, int optname, +@@ -1814,6 +1817,12 @@ int rgetsockopt(int socket, int level, int optname, *((int *) optval) = !!(rs->tcp_opts & (1 << optname)); *optlen = sizeof(int); break; + case TCP_MAXSEG: -+ *((int *) optval) = (rs->cm_id && rs->cm_id->route && -+ rs->cm_id->route.num_paths) ? ++ *((int *) optval) = (rs->cm_id && rs->cm_id->route.num_paths) ? + 1 << (7 + rs->cm_id->route.path_rec->mtu) : + 2048; + *optlen = sizeof(int); -- 2.41.0