git: 751882926dc0 - main - tcp bbr: improve persits timeout computation

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

URL: https://cgit.FreeBSD.org/src/commit/?id=751882926dc0bb1f7a4834c4b5e8d951cee61c7c

commit 751882926dc0bb1f7a4834c4b5e8d951cee61c7c
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2026-11-15 20:21:14 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2026-11-15 20:21:14 +0000

    tcp bbr: improve persits timeout computation
    
    t_srtt and t_rttvar use different lengths of fractions, therefore use
    the appropriate shift value.
    
    Reviewed by:            Peter Lei
    MFC after:              3 days
    MFC to:                 stable/15
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D61600
---
 sys/netinet/tcp_stacks/bbr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 49b5902f5ee4..3b9a06bd7ad1 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -540,7 +540,7 @@ bbr_get_persists_timer_val(struct tcpcb *tp, struct tcp_bbr *bbr)
 		var = 0;
 	} else {
 		srtt = ((uint64_t)TICKS_2_USEC(tp->t_srtt) >> TCP_RTT_SHIFT);
-		var = ((uint64_t)TICKS_2_USEC(tp->t_rttvar) >> TCP_RTT_SHIFT);
+		var = ((uint64_t)TICKS_2_USEC(tp->t_rttvar) >> TCP_RTTVAR_SHIFT);
 	}
 	TCPT_RANGESET_NOSLOP(ret_val, ((srtt + var) * tcp_backoff[tp->t_rxtshift]),
 	    bbr_persist_min, bbr_persist_max);