diff options
author | Eric Dumazet <edumazet@google.com> | 2017-10-27 10:47:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-28 06:24:38 -0400 |
commit | 9184d8bb448a3d2c2d9f90f1e2f5de625292e769 (patch) | |
tree | 4199b7802435469654fe0f51ab57d0b823f834a5 /net/ipv4/tcp_output.c | |
parent | ceef9ab6be7234f9e49f79769e0da88d1dccfcc7 (diff) |
tcp: Namespace-ify sysctl_tcp_limit_output_bytes
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 5bbed67c27e9..f018892c6a98 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -45,9 +45,6 @@ | |||
45 | 45 | ||
46 | #include <trace/events/tcp.h> | 46 | #include <trace/events/tcp.h> |
47 | 47 | ||
48 | /* Default TSQ limit of four TSO segments */ | ||
49 | int sysctl_tcp_limit_output_bytes __read_mostly = 262144; | ||
50 | |||
51 | static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, | 48 | static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, |
52 | int push_one, gfp_t gfp); | 49 | int push_one, gfp_t gfp); |
53 | 50 | ||
@@ -2215,7 +2212,8 @@ static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb, | |||
2215 | unsigned int limit; | 2212 | unsigned int limit; |
2216 | 2213 | ||
2217 | limit = max(2 * skb->truesize, sk->sk_pacing_rate >> 10); | 2214 | limit = max(2 * skb->truesize, sk->sk_pacing_rate >> 10); |
2218 | limit = min_t(u32, limit, sysctl_tcp_limit_output_bytes); | 2215 | limit = min_t(u32, limit, |
2216 | sock_net(sk)->ipv4.sysctl_tcp_limit_output_bytes); | ||
2219 | limit <<= factor; | 2217 | limit <<= factor; |
2220 | 2218 | ||
2221 | if (refcount_read(&sk->sk_wmem_alloc) > limit) { | 2219 | if (refcount_read(&sk->sk_wmem_alloc) > limit) { |