From acaa200e9f7797bdcf2ea25a5fdb847f46e6ef1a Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Wed, 26 Feb 2020 20:10:34 +0800 Subject: [PATCH] target/4.19: fix bbr patch again (#43) * quick * quick fix due to tcp.h changes Co-authored-by: CN_SZTL <22235437+1715173329@users.noreply.github.com> --- ...apt-cwnd-based-on-ack-aggregation-estimation.patch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/target/linux/generic/pending-4.19/607-tcp_bbr-adapt-cwnd-based-on-ack-aggregation-estimation.patch b/target/linux/generic/pending-4.19/607-tcp_bbr-adapt-cwnd-based-on-ack-aggregation-estimation.patch index 5dcd680780..fd243ec97f 100644 --- a/target/linux/generic/pending-4.19/607-tcp_bbr-adapt-cwnd-based-on-ack-aggregation-estimation.patch +++ b/target/linux/generic/pending-4.19/607-tcp_bbr-adapt-cwnd-based-on-ack-aggregation-estimation.patch @@ -332,13 +332,4 @@ diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c + bbr->extra_acked[0] = 0; + bbr->extra_acked[1] = 0; + - cmpxchg(&sk->sk_pacing_status, SK_PACING_NONE, SK_PACING_NEEDED); - -diff --git a/include/net/tcp.h b/include/net/tcp.h ---- a/include/net/tcp.h -+++ b/include/net/tcp.h -@@ -1000,2 +1000,3 @@ - bool is_retrans; /* is sample from retransmission? */ -+ bool is_ack_delayed; /* is this (likely) a delayed ACK? */ - }; - + cmpxchg(&sk->sk_pacing_status, SK_PACING_NONE, SK_PACING_NEEDED); \ No newline at end of file