git: 7659a4f98c6c - main - Revert "tcp bbr: improve retransmit timout calculation"

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Sun, 15 Nov 2026 19:03:14 UTC
The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=7659a4f98c6c8e9f38b8fffba43d17f67a56acd1

commit 7659a4f98c6c8e9f38b8fffba43d17f67a56acd1
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2026-11-15 19:01:56 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2026-11-15 19:01:56 +0000

    Revert "tcp bbr: improve retransmit timout calculation"
    
    This reverts commit 47ef696a769644e7ca1f2a3129818f39640b30a9.
    I referenced the wrong review.
---
 sys/netinet/tcp_stacks/bbr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 49b5902f5ee4..7e3023c02179 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -594,7 +594,8 @@ activate_rxt:
 			if (tp->t_srtt == 0)
 				tov = BBR_INITIAL_RTO;
 			else
-				tov = TICKS_2_USEC(tp->t_srtt + (tp->t_rttvar << (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))) >> TCP_RTT_SHIFT;
+				tov = ((uint64_t)(TICKS_2_USEC(tp->t_srtt) +
+				    ((uint64_t)TICKS_2_USEC(tp->t_rttvar) * (uint64_t)4)) >> TCP_RTT_SHIFT);
 			if (tp->t_rxtshift)
 				tov *= tcp_backoff[tp->t_rxtshift];
 			if (tov > time_since_sent)