From nobody Wed Feb 5 20:56:58 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 4YpCGL2QG9z5mNqB; Wed, 05 Feb 2025 20:56:58 +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 4YpCGL1yybz3Vpt; Wed, 05 Feb 2025 20:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789018; 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=n0D+4uqGZ6rh2yVZiiZBa6ZN3QcNt9qKhymtJ+QvrvM=; b=WAV5kRbvlxyn413sd3JUlDfozE31KBY+lb6yBeDqAKpDa5qQQeNoyHPEEeDt9QW9ABMzOM MjO47CPI+ISn/qZSDq1fc9Axgd74G9Awwbi2LH8bv+SRK8AGTyf/EKqMd8clFvJXs/KZ8Q p9U9mzm3HqwY8tkGOZdDtV+jKBo3Ex7lp9uzPi33bLl5brx5bH8X1uKkD5S1UPyf/fyiaS CMpkyGDJnGQ81fLYat/mfWBY5trj2v5viR1RN7la1qo9NaoCbazwqIuTJ0CyOBqf9LPt6m ALg7xiUqb8nHdSusdtadG8MSUYGW2Hd/w2hKgPwransIhSJhK1v5OFI25hFC4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789018; 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=n0D+4uqGZ6rh2yVZiiZBa6ZN3QcNt9qKhymtJ+QvrvM=; b=nKd+bcEa1gHNKnDHoBWUfRsTdihmTSyzmmrUNkiWM7OxKodoNQ1fLQ9cc4C8TfITJUF29X 7Rlb2v8HgFjGIg0/OZKOkCiiBwqFy/wSpJExsFNChh1KmpHkvUuMAI++pq8VaH2MFrmNuh 9+XuXvXLzMN1UvPFjN1q3hMx7z3GcTJT3Axbwe30cAXp/lMwtx9aftf1T/S8poZGIXz4k7 nQm4WzMTt8HpOwjW5FTYlzVhITXrplfS/pD5CFLJE4EqkNX0Ek89+RXQ2sTJPN78hE0/S1 pgXr8UaKP+3KBKxXnOMppcXprICotDVSTy7cHS0AJa0iplSL5D33hBlHuaee7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789018; a=rsa-sha256; cv=none; b=hYAFlwjCIB6xd2XV5Sk5awS1CrG1iAMIeoe4EVgH5+mZnHMrHCUw24siyK+A4dnoEvvnDu tBV9wozb2+MVGASCdAmC56tqCQGeSh2++Vo7EqI/ByYoSalB8xqzPwgIrWtfJF3V72y7N2 wULxtZbZsrnh34oP6dc0M/hoIiX9j8eX80wtVr22g1xGHb09cPW7gjqLx6pROKlDekEVIH fHljhZOJaMpopo66zNgyr3UnHeYLip8+zqm6oKylUcjGbJCmAhvXcF4jO+wuVJ3vimJ8O1 ubzgZ8zeaJfbUAZjFND++eIzwqC/nlm3J74h/uI/RuQb6rFbVplraR2qkpttkg== 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 4YpCGL1Jm3z17Rq; Wed, 05 Feb 2025 20:56:58 +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 515KuwnF004843; Wed, 5 Feb 2025 20:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KuwBp004840; Wed, 5 Feb 2025 20:56:58 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:56:58 GMT Message-Id: <202502052056.515KuwBp004840@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: c6f745a3e334 - stable/14 - TCP BBR: remove dead code 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: c6f745a3e33430e83af1d09e96fc670be6ae2118 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c6f745a3e33430e83af1d09e96fc670be6ae2118 commit c6f745a3e33430e83af1d09e96fc670be6ae2118 Author: Michael Tuexen AuthorDate: 2025-01-06 20:25:58 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:56:52 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: rrs CID: 1523808 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48338 (cherry picked from commit 061727efe1e355fb2fde1b05e92718543d05bfe7) --- sys/netinet/tcp_stacks/bbr.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 73751e984125..ce13ec9a54a2 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -978,14 +978,6 @@ bbr_timer_audit(struct tcpcb *tp, struct tcp_bbr *bbr, uint32_t cts, struct sock * and we do */ return; - } else if (sbavail(&inp->inp_socket->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 || inp->inp_socket->so_options & SO_KEEPALIVE) && (tp->t_state <= TCPS_CLOSING)) &&