From 5b987b9c833e96eb7e42f419d3e737de94a2a539 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 20 May 2020 20:18:49 +0200 Subject: [PATCH] Fix MPTCP patch for 5.4.42 kernel --- root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch b/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch index d6915244..2ebe3630 100644 --- a/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch +++ b/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch @@ -4466,12 +4466,13 @@ diff -aurN linux-5.4/net/ipv4/tcp_input.c mptcp-mptcp_trunk/net/ipv4/tcp_input.c { int eaten; struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue); -@@ -4746,7 +4811,7 @@ +@@ -4746,8 +4811,8 @@ const struct tcp_sock *tp = tcp_sk(sk); int avail = tp->rcv_nxt - tp->copied_seq; -- if (avail < sk->sk_rcvlowat && !sock_flag(sk, SOCK_DONE)) -+ if (avail < sk->sk_rcvlowat && !sock_flag(sk, SOCK_DONE) && !mptcp(tp)) +- if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) && ++ if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) && !mptcp(tp) && + !sock_flag(sk, SOCK_DONE)) return; sk->sk_data_ready(sk);