git: 34436bb7cf97 - main - tcp bbr: cleanup

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Sat, 14 Nov 2026 21:27:05 UTC
The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=34436bb7cf971dba1c0dcdb1d45f22fff1a4b6c1

commit 34436bb7cf971dba1c0dcdb1d45f22fff1a4b6c1
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2026-11-14 17:36:42 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2026-11-14 21:17:52 +0000

    tcp bbr: cleanup
    
    No functional change intended.
    
    MFC after:      3 days
    MFC to:         stable/14
    MFC to:         stable/15
    Sponsored by:   Netflix, Inc.
---
 sys/netinet/tcp_stacks/bbr.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 5169b6104393..38b2d1665d4e 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -4897,8 +4897,7 @@ bbr_remxt_tmr(struct tcpcb *tp)
 				 * With this option, we will rack out
 				 * in 1ms increments the rest of the packets.
 				 */
-				rsm->r_flags |= BBR_SACK_PASSED | BBR_MARKED_LOST;
-				rsm->r_flags &= ~BBR_WAS_SACKPASS;
+				rsm->r_flags |= BBR_SACK_PASSED;
 			} else {
 				/*
 				 * With this option we only mark them lost
@@ -4907,10 +4906,10 @@ bbr_remxt_tmr(struct tcpcb *tp)
 				 * us to eventually send more based on what
 				 * ack's come in.
 				 */
-				rsm->r_flags |= BBR_MARKED_LOST;
-				rsm->r_flags &= ~BBR_WAS_SACKPASS;
 				rsm->r_flags &= ~BBR_SACK_PASSED;
 			}
+			rsm->r_flags |= BBR_MARKED_LOST;
+			rsm->r_flags &= ~BBR_WAS_SACKPASS;
 		}
 		trsm = rsm;
 	}