Annotation of /trunk/kernel-alx/patches-4.9/0283-4.9.184-all-fixes.patch
Parent Directory | Revision Log
Revision 3365 -
(hide annotations)
(download)
Wed Jul 3 12:37:00 2019 UTC (5 years, 2 months ago) by niro
File size: 709 byte(s)
Wed Jul 3 12:37:00 2019 UTC (5 years, 2 months ago) by niro
File size: 709 byte(s)
-linux-4.9.184
1 | niro | 3365 | diff --git a/Makefile b/Makefile |
2 | index e63ace93b67b..3b0dd4e90c44 100644 | ||
3 | --- a/Makefile | ||
4 | +++ b/Makefile | ||
5 | @@ -1,6 +1,6 @@ | ||
6 | VERSION = 4 | ||
7 | PATCHLEVEL = 9 | ||
8 | -SUBLEVEL = 183 | ||
9 | +SUBLEVEL = 184 | ||
10 | EXTRAVERSION = | ||
11 | NAME = Roaring Lionus | ||
12 | |||
13 | diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c | ||
14 | index d8c6b833f0ce..0c195b0f4216 100644 | ||
15 | --- a/net/ipv4/tcp_output.c | ||
16 | +++ b/net/ipv4/tcp_output.c | ||
17 | @@ -1185,7 +1185,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, | ||
18 | if (nsize < 0) | ||
19 | nsize = 0; | ||
20 | |||
21 | - if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) { | ||
22 | + if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) { | ||
23 | NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); | ||
24 | return -ENOMEM; | ||
25 | } |