Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Feb 2025 20:47:19 GMT
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 221ac9e07859 - stable/14 - TCP RACK: remove code that cannot be reached
Message-ID:  <202502052047.515KlJgq085024@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by tuexen:

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

commit 221ac9e07859fd50e98a1ef035c3019983065af2
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2025-01-04 14:22:40 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2025-02-05 09:47:30 +0000

    TCP RACK: remove code that cannot be reached
    
    No functional change intended.
    
    Reviewed by:            rrs
    CID:                    1523797
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D48301
    
    (cherry picked from commit 41af5eeefc2c11d0e301f9f4476ba50214a8a584)
---
 sys/netinet/tcp_stacks/rack.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index 6bed750145e9..a8542c093f74 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -15630,12 +15630,6 @@ rack_timer_audit(struct tcpcb *tp, struct tcp_rack *rack, struct sockbuf *sb)
 			if (tmr_up == PACE_TMR_DELACK)
 				/* We are supposed to have delayed ack up and we do */
 				return;
-		} else if (sbavail(&tptosocket(tp)->so_snd) && (tmr_up == PACE_TMR_RXT)) {
-			/*
-			 * if we hit enobufs then we would expect the possibility
-			 * of nothing outstanding and the RXT up (and the hptsi timer).
-			 */
-			return;
 		} else if (((V_tcp_always_keepalive ||
 			     rack->rc_inp->inp_socket->so_options & SO_KEEPALIVE) &&
 			    (tp->t_state <= TCPS_CLOSING)) &&



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502052047.515KlJgq085024>