diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-06-17 20:30:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-06-17 20:30:38 +0200 |
| commit | 15b29f5df10905a71491d2737ea423cd4458bc3b (patch) | |
| tree | 579ee36abd7dd2a222ced3aac1a4cf33a327a832 /net/ipv4/tcp.c | |
| parent | 7b41aee921e20b15fb9f12d5042386ed2416f786 (diff) | |
| parent | 33790f2eda7393d422927078597a33475792c82c (diff) | |
Merge 4.4.182 into android-4.4-p
Changes in 4.4.182
tcp: limit payload size of sacked skbs
tcp: tcp_fragment() should apply sane memory limits
tcp: add tcp_min_snd_mss sysctl
tcp: enforce tcp_min_snd_mss in tcp_mtu_probing()
Linux 4.4.182
Change-Id: Idb237d729dbdbfc2d0e41544b19f0d5d6547644b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e9f8443d3b8a..d75fb0efb07f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3190,6 +3190,7 @@ void __init tcp_init(void) int max_rshare, max_wshare, cnt; unsigned int i; + BUILD_BUG_ON(TCP_MIN_SND_MSS <= MAX_TCP_OPTION_SPACE); sock_skb_cb_check_size(sizeof(struct tcp_skb_cb)); percpu_counter_init(&tcp_sockets_allocated, 0, GFP_KERNEL); |