From nobody Wed Feb 05 20:57:04 2025 X-Original-To: dev-commits-src-branches@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 4YpCGT0Qt6z5mNt7; Wed, 05 Feb 2025 20:57:05 +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 4YpCGS3hKMz3W3t; Wed, 05 Feb 2025 20:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789024; 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=YWbBy7lmK6GxYGD4XGKB0ICw329UC6QbHthDNXP2WEU=; b=M43E/PVhaIdVLyZVjQrfpFgCLx8g59fEjF6O00ECKHfL40nvunoD7i+wFm+DZcIPcOCyN+ LL+4xA2zF/UtV2na5F2yAu6oeEuRze5VnPzC2MHfmSH3se2Q9cXI336KteduEbA9lYcjGi cuUDGskMcK4WuPv9M+ApztmgT0FqTRYeDb2nD79YeiuMjZLmFoYzbG6GI7CUXPyqnM1KeU yulkcmfsaXlYcFHyTAz9PtFMqL8DrhGag076wnljUSQuzXIkk0onYvYMHXD9Xq81srCNsc ZyFTEYYiG1DmlKJLQtTqJKkruxcjnL1Nq36e7E+vRYhPPcgOjJUPVv7BROOM/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789024; 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=YWbBy7lmK6GxYGD4XGKB0ICw329UC6QbHthDNXP2WEU=; b=pXJXOSDb/yQXSeL3TYL7CyA4ByFY09DnXQcY+RM7Sv8eaTn5ztufBkUHZbxXOymfwzYlVK qk6Fm/x958He9JldtXfTd+KYjR6LSrOi9Zutf9Xw1Yooq216jlxQHfsJMrd4F0GenpyAFK kNMUCDeuXbjl8DR7gA9sjTPDAfutRAiZ1X4ionJjFZo6QyMefFacJPfeA08sKhedxNO1ii OJFCED4qNKDg1Xz60UhzR+QMrta0ZSCVS9xiWsvGkh9DyDYFfyk6qbZDn32NG3t5K551u8 tcUVFRSkdAxRT4NT8WjaEIN6UOp+egQueEMCr8d/+QMJnjA0tMy1f/XK6Epl/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789024; a=rsa-sha256; cv=none; b=W2S18FT/VuRXhtKakSDc1pa8OLEJQEKCVEFS+SpK0UjYYfatGqnaQe8Y5BQ14dsS7PZUPf B891d9DsyIYKCX8Ygb5jb+/bqDUaLAI8ezAOGfZLf2hoQpv8E/guuQShI9RkeUQOs6Ysib 8zbPZXL7mNjdNkvfbX+4zg8gSkQ4vid9hiLT6HwYy41xahvG3qFtSKoS9hizOCrYAef9+1 GXpH+Bt7bIwsGBqIj9sJIV9nQStTyw8b0aiQYrvcSzHD5+vY5aUVltWmdPgvwuYlzSQ7Wx WVTP9RGepDdBuvPh2gUvAkpv/rXr/7ZKouOHJae0hbjqfszg3Czw16lA4Ecl9Q== 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 4YpCGS3HMWz17VV; Wed, 05 Feb 2025 20:57:04 +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 515Kv4Kv005006; Wed, 5 Feb 2025 20:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kv4Gw005003; Wed, 5 Feb 2025 20:57:04 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:57:04 GMT Message-Id: <202502052057.515Kv4Gw005003@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: 88844461a715 - stable/13 - TCP BBR: remove dead code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 88844461a71597a3b57f747cc17b12c5582aa36d Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=88844461a71597a3b57f747cc17b12c5582aa36d commit 88844461a71597a3b57f747cc17b12c5582aa36d Author: Michael Tuexen AuthorDate: 2025-01-06 20:25:58 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:42:09 +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 1fd41b568e1f..7193978f4ff0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -986,14 +986,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)) &&