diff options
| author | Jakub Kicinski <[email protected]> | 2022-09-01 19:58:02 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2022-09-01 19:58:02 +0000 |
| commit | 60ad1100d525699bce83690757ff3077c6ab83ab (patch) | |
| tree | fd25eb112f4d52f4f5209bb0c83b6c36d25793ae /net/ipv4/tcp_ipv4.c | |
| parent | net: sched: gred: remove NULL check before free table->tab in gred_destroy() (diff) | |
| parent | Merge tag 'net-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-60ad1100d525699bce83690757ff3077c6ab83ab.tar.gz kernel-60ad1100d525699bce83690757ff3077c6ab83ab.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
tools/testing/selftests/net/.gitignore
sort the net-next version and use it
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index cc2ad67f75be..01b31f5c7aba 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -3158,8 +3158,10 @@ static int __net_init tcp_sk_init(struct net *net) net->ipv4.sysctl_tcp_tso_win_divisor = 3; /* Default TSQ limit of 16 TSO segments */ net->ipv4.sysctl_tcp_limit_output_bytes = 16 * 65536; - /* rfc5961 challenge ack rate limiting */ - net->ipv4.sysctl_tcp_challenge_ack_limit = 1000; + + /* rfc5961 challenge ack rate limiting, per net-ns, disabled by default. */ + net->ipv4.sysctl_tcp_challenge_ack_limit = INT_MAX; + net->ipv4.sysctl_tcp_min_tso_segs = 2; net->ipv4.sysctl_tcp_tso_rtt_log = 9; /* 2^9 = 512 usec */ net->ipv4.sysctl_tcp_min_rtt_wlen = 300; |
