aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-10-27 10:47:22 -0400
committerDavid S. Miller <davem@davemloft.net>2017-10-28 06:24:38 -0400
commit4540c0cf98b8892a642d2453eec20ae3eb5696fb (patch)
treed793e62f62c382f50f4cd7f65fe4a8005a1e725f /net/ipv4/tcp_input.c
parentec36e416f06f6a8659281053fdc46ce484ad2211 (diff)
tcp: Namespace-ify sysctl_tcp_moderate_rcvbuf
Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 90d76f1c8f96..ce481325115f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -84,7 +84,6 @@ int sysctl_tcp_challenge_ack_limit = 1000;
84 84
85int sysctl_tcp_max_orphans __read_mostly = NR_FILE; 85int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
86int sysctl_tcp_min_rtt_wlen __read_mostly = 300; 86int sysctl_tcp_min_rtt_wlen __read_mostly = 300;
87int sysctl_tcp_moderate_rcvbuf __read_mostly = 1;
88int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2; 87int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;
89 88
90#define FLAG_DATA 0x01 /* Incoming frame contained data. */ 89#define FLAG_DATA 0x01 /* Incoming frame contained data. */
@@ -411,7 +410,7 @@ static void tcp_fixup_rcvbuf(struct sock *sk)
411 /* Dynamic Right Sizing (DRS) has 2 to 3 RTT latency 410 /* Dynamic Right Sizing (DRS) has 2 to 3 RTT latency
412 * Allow enough cushion so that sender is not limited by our window 411 * Allow enough cushion so that sender is not limited by our window
413 */ 412 */
414 if (sysctl_tcp_moderate_rcvbuf) 413 if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf)
415 rcvmem <<= 2; 414 rcvmem <<= 2;
416 415
417 if (sk->sk_rcvbuf < rcvmem) 416 if (sk->sk_rcvbuf < rcvmem)
@@ -602,7 +601,7 @@ void tcp_rcv_space_adjust(struct sock *sk)
602 * <prev RTT . ><current RTT .. ><next RTT .... > 601 * <prev RTT . ><current RTT .. ><next RTT .... >
603 */ 602 */
604 603
605 if (sysctl_tcp_moderate_rcvbuf && 604 if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf &&
606 !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { 605 !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
607 int rcvwin, rcvmem, rcvbuf; 606 int rcvwin, rcvmem, rcvbuf;
608 607