From nobody Wed Feb 5 20:47:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YpC3D1Mznz5mMyw; Wed, 05 Feb 2025 20:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpC3C6F1Rz3PBG; Wed, 05 Feb 2025 20:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrlG8PzLvFSD6Sqh43qVDvNPQ0s6/vxM9fwgE7lsAT4=; b=fHc89CCMMcv9bFMUlqM0KOTxgYSgTBMTH+hZyuNoqhzLUQop6gCERjy01b305mdaGknUQG +lFtLoXaN17eBXXGuNZiLsOqQ5alIn2dg9rA+lCmmgXjCh6upg9LIm6FkEsUq9hO7MmTi6 9eootfxvtoweYKa3uSFWZh2eoszAREFi/nmpMsHtHdw+NDN6HZAL8WwDhuO1Gbp+XqZsqc 8mho6UIJjDSl4JOqKvQPzy0pSuGlgf6dDS8mp+XM2QI5u/nLJvtJfXrPEbvQTwBPKAxrtk bh/cJK1jLKvjdOsgVQnTTE4q6Dfgd6wivA0slI7i7jwt6tqe99mSAAbxYuzZDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrlG8PzLvFSD6Sqh43qVDvNPQ0s6/vxM9fwgE7lsAT4=; b=Ccqz09rTvQlbr90BPxvnpIbWNTyO5TQhVZeAbCc3dbK1wTbUyq3/L6S26DD7UZJW9JWRIE ehbjLoqZcQTYWLPHXuazWuPuZHh7zkpJD24gpIs3nRB3RHvwGFft2rXkub3OQ+vNyGgSSY ukzI70ehzhO7hCJZ7KJPZI+PfMX1oiJiPVGolaxIdZH366lSDQmRhjmQZPcpdIDwCcbf8B 0e4Nbivesk+y/amtZ3T+OoeCoAQwXrjqP0IutYxML/d66X6VxQANkTh0WXPBC0RK9IolaQ 7w8SwJTOt8sag/ZRtlXCwMESok3v+zWCNFZ7Vpd0R/5WTp2fn7WXfRHMmtoBHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788439; a=rsa-sha256; cv=none; b=DsF78hw+s4DErk8o2Iu7EXWJi60BwY8oJL/w0yGPMVqSmHVGr4ncFytSMzfsgR+mcHzu/0 TNCrQJSG5cWyPzWvxLEgrs9aZGM9iTX6uPw+NXrcLcZMgx1gSbsa1TDe0uMjCPt0RXcKkJ Oiexqy0aTgfyfHSN5qr1w5yxl9onOMjNOtiRIUCVxdCOrQYt+WNPjMLknRtvhCyaFaavVm Cm7j9d08OW9LLlBQKXm++mR+2QAUvR5W+OaTQ2IrfqVNSx9TW0YnPBf3XQ0lcj/UJRqu7P cu3wg8UPVxP8nqmQw94Q3eYlI7V5sKlSqwmCoW45vewULqHOLMXkrpl6nSb+pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YpC3C4xKjz1768; Wed, 05 Feb 2025 20:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 515KlJbX085027; Wed, 5 Feb 2025 20:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KlJgq085024; Wed, 5 Feb 2025 20:47:19 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:47:19 GMT Message-Id: <202502052047.515KlJgq085024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 221ac9e07859 - stable/14 - TCP RACK: remove code that cannot be reached List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 221ac9e07859fd50e98a1ef035c3019983065af2 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=221ac9e07859fd50e98a1ef035c3019983065af2 commit 221ac9e07859fd50e98a1ef035c3019983065af2 Author: Michael Tuexen AuthorDate: 2025-01-04 14:22:40 +0000 Commit: Michael Tuexen 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)) &&