0cdffb29b0
* Change DEV to EDGE * Renaming patches dev folder to edge * Move patches into subdir where they will be archived. * Relink patch directories properly
27 lines
745 B
Diff
27 lines
745 B
Diff
diff --git a/Makefile b/Makefile
|
|
index 9d0715c300b1..275343cf27f7 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
VERSION = 4
|
|
PATCHLEVEL = 14
|
|
-SUBLEVEL = 130
|
|
+SUBLEVEL = 131
|
|
EXTRAVERSION =
|
|
NAME = Petit Gorille
|
|
|
|
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
|
|
index a8772e11dc1c..a5960b9b6741 100644
|
|
--- a/net/ipv4/tcp_output.c
|
|
+++ b/net/ipv4/tcp_output.c
|
|
@@ -1274,7 +1274,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
|
|
if (nsize < 0)
|
|
nsize = 0;
|
|
|
|
- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
|
|
+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) {
|
|
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
|
|
return -ENOMEM;
|
|
}
|