mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 01:02:19 +00:00
27 lines
780 B
Diff
27 lines
780 B
Diff
diff --git a/Makefile b/Makefile
|
|
index b234837e4d07..3addd4c286fa 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
VERSION = 4
|
|
PATCHLEVEL = 19
|
|
-SUBLEVEL = 54
|
|
+SUBLEVEL = 55
|
|
EXTRAVERSION =
|
|
NAME = "People's Front"
|
|
|
|
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
|
|
index 147ed82b73d3..221d9b72423b 100644
|
|
--- a/net/ipv4/tcp_output.c
|
|
+++ b/net/ipv4/tcp_output.c
|
|
@@ -1299,7 +1299,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,
|
|
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 &&
|
|
+ tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) {
|
|
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
|
|
return -ENOMEM;
|
|
}
|