From nobody Sat Jan 04 14:24:41 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 4YQN4V3Zg3z5kKdV; Sat, 04 Jan 2025 14:24:42 +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 4YQN4V2Vtdz4XYr; Sat, 4 Jan 2025 14:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000682; 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=3+IuMarKyLTiTHi2QT5wNbw+NfU4FQ0uPGp1qHPPpQY=; b=nLS5K8MFsSRZAoB4j8LSZ7Er0jYgMT2JM8LqCvyuGD664Lct9XnkWoqCKVx5BZFGIDrWiT OIu8vFwlFz647r5qp998KfCbfDDjllevjfYkyanoi4tmhNQB+DAbzdRbZhWwa2hCGqP88+ sjKZqRZRSjsnUArdHfQAkB2D7byHPk5r/1aGKMyq1fhCoWPKYO571M+GSWCixTNwoXJI/T PoxKVBOeJYq+m9SbueqI6+2T/v+z6dlRXY5BbtjrDapOYgFgLNYRhEAoGZKGewQKd9mHq5 nA966WutuPzDmcikxV2nst40P/d3DSif2IszEaKcnyhHKuUxvxqOkzLBPsN3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000682; 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=3+IuMarKyLTiTHi2QT5wNbw+NfU4FQ0uPGp1qHPPpQY=; b=UOv9ZSu2D74Db4IMXcg6fM2TRC16hSt9qqZ5MA7GQDIXQonWdq4adm8pCMegd2ftTZxXgy kBAEi81NQgVVn/hFcxTBYfuFgGVpeH10VgLtzUiNf3YERim1bfvY74D119flHE1MKYBLhC 8JcYuhfFam5mJALwCViyNSNbcxl/s4B3T+0xoIbzaBrgPDCkKQqIQt5a5QSvXYdZ/U3Mb+ r2q39E7bUI7Zaq8Nt3NHokDtx24tdRP05AKkZh7cp2OK5iV9HCQ5+lW42nUnkjwSQG/bGK 1/cPkldf3r05mCBm9PL5CAHGZm66Ywx3VIKOcD5Zl2nW2BVjgHzYgyo113P0Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736000682; a=rsa-sha256; cv=none; b=cqK+qtnXvZDTWPdRxBMpPY0anzCCBhh6OlAX/YVS81/JE3F21XpMYKJxzOidQnnsz6U2N3 Kv8xiBx+pXPbYL00jma11sDlOH0RPT5FEO6vfkJ+Eq0f1izmT7ucUvzyCKmJfrcxeN6ZbC 4g2LZ7kAKqK5OU2ZAbLHACsm/bufPraLyxGti0wJY+jtGFEfNVfivv4QrPenubP2agBQEI KlNF232mHrijAyIu7Rnii0n9kFHLf8ZqxFt/+cmFw2ArbLW5aqhYQsoVqZ8MAY2Ekf1Gk1 9GQx1DfcvkvOTYKYKdBX9HLutpfukddo5KsvyXFqhN3AzpqwTKZK/uVolqXFOw== 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 4YQN4V1Zq4zx3R; Sat, 04 Jan 2025 14:24:42 +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 504EOg4i006791; Sat, 4 Jan 2025 14:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504EOf6H006788; Sat, 4 Jan 2025 14:24:41 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:24:41 GMT Message-Id: <202501041424.504EOf6H006788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 41af5eeefc2c - main - 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/main X-Git-Reftype: branch X-Git-Commit: 41af5eeefc2c11d0e301f9f4476ba50214a8a584 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=41af5eeefc2c11d0e301f9f4476ba50214a8a584 commit 41af5eeefc2c11d0e301f9f4476ba50214a8a584 Author: Michael Tuexen AuthorDate: 2025-01-04 14:22:40 +0000 Commit: Michael Tuexen CommitDate: 2025-01-04 14:22:40 +0000 TCP RACK: remove code that cannot be reached No functional change intended. Reviewed by: rrs CID: 1523797 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48301 --- 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 d7e306186d37..6774acb9d5e6 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -15260,12 +15260,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)) &&