The branch stable/14 has been updated by tuexen:

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

commit f28415489639df69d4bcda74c1199a6b062ab5cf
Author:     Michael Tuexen <tue...@freebsd.org>
AuthorDate: 2025-01-09 05:27:05 +0000
Commit:     Michael Tuexen <tue...@freebsd.org>
CommitDate: 2025-02-05 10:04:01 +0000

    TCP BBR: remove dead code
    
    No functional change intended.
    
    Reviewed by:            Peter Lei, rrs (earlier version)
    CID:                    1523802
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D48341
    
    (cherry picked from commit e7fbf52a3e38c4bc4249e6541fe7e42ecc119656)
---
 sys/netinet/tcp_stacks/bbr.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index ce13ec9a54a2..66fab54bd010 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -6770,8 +6770,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr,
                        t = cts - rsm->r_tim_lastsent[0];
                else
                        t = 1;
-               if ((int)t <= 0)
-                       t = 1;
                bbr->r_ctl.rc_last_rtt = t;
                bbr_update_bbr_info(bbr, rsm, t, cts, to->to_tsecr, 0,
                                    BBR_RTT_BY_EXACTMATCH, 
rsm->r_tim_lastsent[0], ack_type, to);
@@ -6812,8 +6810,6 @@ bbr_update_rtt(struct tcpcb *tp, struct tcp_bbr *bbr,
                                        t = cts - rsm->r_tim_lastsent[i];
                                else
                                        t = 1;
-                               if ((int)t <= 0)
-                                       t = 1;
                                bbr->r_ctl.rc_last_rtt = t;
                                bbr_update_bbr_info(bbr, rsm, t, cts, 
to->to_tsecr, uts, BBR_RTT_BY_TSMATCHING,
                                                    rsm->r_tim_lastsent[i], 
ack_type, to);

Reply via email to