target/4.19: fix bbr patch again

2020-02-26 20:16:58 +08:00 · 2020-02-26 20:16:58 +08:00 · 13804b9376
commit 13804b9376
parent e45a4957d4
1 changed files with 1 additions and 10 deletions
--- 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);