The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=134884436681a8eaf23b26435153c637302482d7
commit 134884436681a8eaf23b26435153c637302482d7 Author: Michael Tuexen <[email protected]> AuthorDate: 2024-04-17 14:17:03 +0000 Commit: Michael Tuexen <[email protected]> CommitDate: 2024-04-17 14:17:03 +0000 Revert "tcp rack: fix sending" This reverts commit b5ee7411bfabaf85f226fdfc4f2d8e0515d66691. --- sys/netinet/tcp_stacks/rack.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index b05d19f5cbc2..fa3cd2f4f698 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19927,10 +19927,6 @@ rack_output(struct tcpcb *tp) #endif int32_t idle, sendalot; -<<<<<<< HEAD -======= - uint32_t tot_idle; ->>>>>>> 7df0ef5f48e1 (tcp rack: fix sending) int32_t sub_from_prr = 0; volatile int32_t sack_rxmit; struct rack_sendmap *rsm = NULL; @@ -20168,8 +20164,8 @@ rack_output(struct tcpcb *tp) if ((tp->snd_una == tp->snd_max) && rack->r_ctl.rc_went_idle_time && TSTMP_GT(cts, rack->r_ctl.rc_went_idle_time)) { - tot_idle = (cts - rack->r_ctl.rc_went_idle_time); - if (tot_idle > rack_min_probertt_hold) { + idle = cts - rack->r_ctl.rc_went_idle_time; + if (idle > rack_min_probertt_hold) { /* Count as a probe rtt */ if (rack->in_probe_rtt == 0) { rack->r_ctl.rc_lower_rtt_us_cts = cts; @@ -20180,6 +20176,7 @@ rack_output(struct tcpcb *tp) rack_exit_probertt(rack, cts); } } + idle = 0; } if (rack_use_fsb && (rack->r_ctl.fsb.tcp_ip_hdr) &&
