diff options
author | Eric Dumazet <edumazet@google.com> | 2017-06-07 13:34:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-08 10:53:29 -0400 |
commit | 9bb37ef00e932eb4b989e855245468feb3980700 (patch) | |
tree | 10e2be1fff8c29276c9db723bbf03c276df96664 /net/ipv4/tcp_output.c | |
parent | f930103421f6579719b8252285c94c1195f6e032 (diff) |
tcp: Namespaceify sysctl_tcp_window_scaling
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 45c8e459db49..3f4095010785 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -575,7 +575,7 @@ static unsigned int tcp_syn_options(struct sock *sk, struct sk_buff *skb, | |||
575 | opts->tsecr = tp->rx_opt.ts_recent; | 575 | opts->tsecr = tp->rx_opt.ts_recent; |
576 | remaining -= TCPOLEN_TSTAMP_ALIGNED; | 576 | remaining -= TCPOLEN_TSTAMP_ALIGNED; |
577 | } | 577 | } |
578 | if (likely(sysctl_tcp_window_scaling)) { | 578 | if (likely(sock_net(sk)->ipv4.sysctl_tcp_window_scaling)) { |
579 | opts->ws = tp->rx_opt.rcv_wscale; | 579 | opts->ws = tp->rx_opt.rcv_wscale; |
580 | opts->options |= OPTION_WSCALE; | 580 | opts->options |= OPTION_WSCALE; |
581 | remaining -= TCPOLEN_WSCALE_ALIGNED; | 581 | remaining -= TCPOLEN_WSCALE_ALIGNED; |
@@ -3303,7 +3303,7 @@ static void tcp_connect_init(struct sock *sk) | |||
3303 | tp->advmss - (tp->rx_opt.ts_recent_stamp ? tp->tcp_header_len - sizeof(struct tcphdr) : 0), | 3303 | tp->advmss - (tp->rx_opt.ts_recent_stamp ? tp->tcp_header_len - sizeof(struct tcphdr) : 0), |
3304 | &tp->rcv_wnd, | 3304 | &tp->rcv_wnd, |
3305 | &tp->window_clamp, | 3305 | &tp->window_clamp, |
3306 | sysctl_tcp_window_scaling, | 3306 | sock_net(sk)->ipv4.sysctl_tcp_window_scaling, |
3307 | &rcv_wscale, | 3307 | &rcv_wscale, |
3308 | dst_metric(dst, RTAX_INITRWND)); | 3308 | dst_metric(dst, RTAX_INITRWND)); |
3309 | 3309 | ||