diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-28 19:24:39 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-28 19:24:39 +0900 |
| commit | 871da0a761dc967d9bd79c0d4b4cb3828c0281a1 (patch) | |
| tree | 5f0d0b02bde533de08ef07d5e670f0815be84d3e /include | |
| parent | 267146d44718771aa0b375e78b33c81d137db09d (diff) | |
| parent | c26e91f8b9b8e1fd252e07c1f60e50220cd7ebab (diff) | |
| download | linux-871da0a761dc967d9bd79c0d4b4cb3828c0281a1.tar.gz linux-871da0a761dc967d9bd79c0d4b4cb3828c0281a1.tar.bz2 linux-871da0a761dc967d9bd79c0d4b4cb3828c0281a1.zip | |
Merge branch 'tcp-more-perns-sysctls'
Eric Dumazet says:
====================
tcp: move 12 sysctls to namespaces
Ideally all TCP sysctls should be per netns.
This patch series takes care of 12 sysctls.
Remains the ones that need discussion :
sysctl_tcp_mem, sysctl_tcp_rmem, sysctl_tcp_wmem, and sysctl_tcp_max_orphans
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netns/ipv4.h | 12 | ||||
| -rw-r--r-- | include/net/tcp.h | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index f4622e28db3a..141ba82b5efb 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -142,6 +142,18 @@ struct netns_ipv4 { int sysctl_tcp_app_win; int sysctl_tcp_adv_win_scale; int sysctl_tcp_frto; + int sysctl_tcp_nometrics_save; + int sysctl_tcp_moderate_rcvbuf; + int sysctl_tcp_tso_win_divisor; + int sysctl_tcp_workaround_signed_windows; + int sysctl_tcp_limit_output_bytes; + int sysctl_tcp_challenge_ack_limit; + int sysctl_tcp_min_tso_segs; + int sysctl_tcp_min_rtt_wlen; + int sysctl_tcp_autocorking; + int sysctl_tcp_invalid_ratelimit; + int sysctl_tcp_pacing_ss_ratio; + int sysctl_tcp_pacing_ca_ratio; struct inet_timewait_death_row tcp_death_row; int sysctl_max_syn_backlog; int sysctl_tcp_fastopen; diff --git a/include/net/tcp.h b/include/net/tcp.h index 18f047501f53..092d606fcc16 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -247,22 +247,9 @@ extern int sysctl_tcp_max_orphans; extern long sysctl_tcp_mem[3]; extern int sysctl_tcp_wmem[3]; extern int sysctl_tcp_rmem[3]; -extern int sysctl_tcp_nometrics_save; -extern int sysctl_tcp_moderate_rcvbuf; -extern int sysctl_tcp_tso_win_divisor; -extern int sysctl_tcp_workaround_signed_windows; #define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */ -extern int sysctl_tcp_limit_output_bytes; -extern int sysctl_tcp_challenge_ack_limit; -extern int sysctl_tcp_min_tso_segs; -extern int sysctl_tcp_min_rtt_wlen; -extern int sysctl_tcp_autocorking; -extern int sysctl_tcp_invalid_ratelimit; -extern int sysctl_tcp_pacing_ss_ratio; -extern int sysctl_tcp_pacing_ca_ratio; - extern atomic_long_t tcp_memory_allocated; extern struct percpu_counter tcp_sockets_allocated; extern unsigned long tcp_memory_pressure; @@ -1305,7 +1292,8 @@ static inline void tcp_slow_start_after_idle_check(struct sock *sk) } /* Determine a window scaling and initial window to offer. */ -void tcp_select_initial_window(int __space, __u32 mss, __u32 *rcv_wnd, +void tcp_select_initial_window(const struct sock *sk, int __space, + __u32 mss, __u32 *rcv_wnd, __u32 *window_clamp, int wscale_ok, __u8 *rcv_wscale, __u32 init_rcv_wnd); |