diff --git a/root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch b/root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch index 32913f78..44055724 100644 --- a/root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch +++ b/root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch @@ -393,7 +393,7 @@ new file mode 100644 index 000000000000..875ebfef5a03 --- /dev/null +++ b/net/ipv4/tcp_bbr2.c -@@ -0,0 +1,2674 @@ +@@ -0,0 +1,2671 @@ +/* BBR (Bottleneck Bandwidth and RTT) congestion control, v2 + * + * BBRv2 is a model-based congestion control algorithm that aims for low @@ -3013,15 +3013,12 @@ index 000000000000..875ebfef5a03 + /* bbr_adapt_lower_bounds() needs cwnd before + * we suffered an RTO, to update inflight_lo: + */ -+ WARN_ON_ONCE(bbr->prior_cwnd == 0); -+ WARN_ON_ONCE(bbr->prior_cwnd == ~0U); -+ bbr->inflight_lo = bbr->prior_cwnd; ++ bbr->inflight_lo = ++ max(tp->snd_cwnd, bbr->prior_cwnd); + } + bbr_debug(sk, 0, &rs, &ctx); + } else if (bbr->prev_ca_state == TCP_CA_Loss && + new_state != TCP_CA_Loss) { -+ WARN_ON_ONCE(bbr->prior_cwnd == 0); -+ WARN_ON_ONCE(bbr->prior_cwnd == ~0U); + tp->snd_cwnd = max(tp->snd_cwnd, bbr->prior_cwnd); + bbr->try_fast_path = 0; /* bound cwnd using latest model */ + }