git: c3322bb4680b - stable/14 - TCP BBR: simplify expression
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Feb 2025 20:45:18 UTC
The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 commit c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2025-01-03 13:22:25 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> CommitDate: 2025-02-05 09:45:17 +0000 TCP BBR: simplify expression rsm cannot be NULL, when calling bbr_update_bbr_info(). So no need to check partially for it. No functional change intended. Reviewed by: rrs CID: 1523803 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48293 (cherry picked from commit 4173a3a009a42c47f1ec2d1cbfb99347aaf195da) --- 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 5a6276a84982..762fb53fcdd7 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6701,7 +6701,7 @@ bbr_update_bbr_info(struct tcp_bbr *bbr, struct bbr_sendmap *rsm, uint32_t rtt, bbr_log_rtt_shrinks(bbr, cts, 0, rtt, __LINE__, BBR_RTTS_NEWRTT, 0); bbr_set_reduced_rtt(bbr, cts, __LINE__); } - bbr_log_type_bbrrttprop(bbr, rtt, (rsm ? rsm->r_end : 0), uts, cts, + bbr_log_type_bbrrttprop(bbr, rtt, rsm->r_end, uts, cts, match, rsm->r_start, rsm->r_flags); apply_filter_min_small(&bbr->r_ctl.rc_rttprop, rtt, cts); if (old_rttprop != bbr_get_rtt(bbr, BBR_RTT_PROP)) {