Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel-alx/patches-4.19/0154-4.19.55-all-fixes.patch

    Annotation of /trunk/kernel-alx/patches-4.19/0154-4.19.55-all-fixes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3433 - (hide annotations) (download)
    Fri Aug 2 11:48:00 2019 UTC (4 years, 9 months ago) by niro
    File size: 780 byte(s) 
    -linux-4.19.55
    1 niro 3433 diff --git a/Makefile b/Makefile
    2     index b234837e4d07..3addd4c286fa 100644
    3     --- a/Makefile
    4     +++ b/Makefile
    5     @@ -1,7 +1,7 @@
    6     # SPDX-License-Identifier: GPL-2.0
    7     VERSION = 4
    8     PATCHLEVEL = 19
    9     -SUBLEVEL = 54
    10     +SUBLEVEL = 55
    11     EXTRAVERSION =
    12     NAME = "People's Front"
    13    
    14     diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
    15     index 147ed82b73d3..221d9b72423b 100644
    16     --- a/net/ipv4/tcp_output.c
    17     +++ b/net/ipv4/tcp_output.c
    18     @@ -1299,7 +1299,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,
    19     if (nsize < 0)
    20     nsize = 0;
    21    
    22     - if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
    23     + if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf &&
    24     + tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) {
    25     NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
    26     return -ENOMEM;
    27     }