From nobody Mon Jan 06 20:27:52 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 4YRm2d02sxz5k9X3; Mon, 06 Jan 2025 20:27:53 +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 4YRm2c5mTcz4XhZ; Mon, 6 Jan 2025 20:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736195272; 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=gBLXqYpc/b2XzaQmv+PT7Fhjf9KulvqoiPQNqHujq88=; b=Ni6n5kAaUzZeY3oh2e6mB9tuVaqLw3Z4KqPjAmwYkz+wW0KYEUR4G5Ew4y2dZerXICBt5D ubo1vv7fbnEUTUePPzcF8NTuV8pUf4ozYMT+Vus6eGMqAqM4dT//7hneTUfGF+hWfFrUq2 P1cYfA6BRbi9DAOfOCAvCSSh37Z5ewTg4PMUs87BCAOZOVKRgciOXlatVJ/gacY7oliaHp jnOsG1KwLGhItgQLlHF9QDNF9n58XqxBMk1bxDScBm1RyN2hKgyxIdYwRjYtTNteOXu4Zq kB+RXyA+RGKbBSIrma9vGRHqfBo+V2AxAU7rS4KQUfYuGi/ZrLS/13fA60GpXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736195272; 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=gBLXqYpc/b2XzaQmv+PT7Fhjf9KulvqoiPQNqHujq88=; b=XG2jfrmxZJHsv1/rxANMY4Ud+2cL2reNMcaIqikwV+ZtBh76NfPY4TU0zB1QXF9oy9RlBT vZYrmOJsdcmj/60dI8rGnW9sPMWCP+a6twvQrh9EXbfKxQAmtFZ42B/1WwGzdzNM/RETAp 6M8rpcuHZQxKSWknPUwt4MaV4cqVti+q7ARxwSNGtq20upr3TkRl3L9v7wc40x5rblQ7yZ MIkJJRMOjr7VcllRllvFNd7jQaiqyJ6l0CbYdBDwU9a9v7fXE92nd9BGCK8py5os35bPWT ln6cmbJlcpt0tElY2Co2PqNxjMC0R88Xb4jile0ukO5Nzh30lhucQdn++1fD9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736195272; a=rsa-sha256; cv=none; b=V2C7pNZQvmr9clzM2u3dCsVSULHklQHYlLrQVeGolBlWuvmexTD9BDmTQEZJCJdRyE+ibH UvRmSZZmFFh+95WGMUWzll/wVpoHFEPji6Vy1r6m2GZbhEnIwaYJ6uTsS9wr7E81+U6wNY d2Cu0aFOv80wSi+op1n7C4igxTujnIpLQogGiy2Wzz1iVsQs5KepHg8MWnGqZQT8h29nx6 t0dGInBG94Yn/EoRERbS+ZSZ+zSYCm1A3HI6DTSFRS0IiPXEJn1n4MOdTGYz0U0enxq7bu /YfVdPN8P6Rzcf2dL4snznhFWrjX+/Y8/f6yxC18yEGrjGBOg/cL+60i/w7jIA== 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 4YRm2c4lMxzfv2; Mon, 06 Jan 2025 20:27:52 +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 506KRqa8070588; Mon, 6 Jan 2025 20:27:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506KRqTq070585; Mon, 6 Jan 2025 20:27:52 GMT (envelope-from git) Date: Mon, 6 Jan 2025 20:27:52 GMT Message-Id: <202501062027.506KRqTq070585@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: 061727efe1e3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 061727efe1e355fb2fde1b05e92718543d05bfe7 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=061727efe1e355fb2fde1b05e92718543d05bfe7 commit 061727efe1e355fb2fde1b05e92718543d05bfe7 Author: Michael Tuexen AuthorDate: 2025-01-06 20:25:58 +0000 Commit: Michael Tuexen CommitDate: 2025-01-06 20:25:58 +0000 TCP BBR: remove dead code No functional change intended. Reviewed by: rrs CID: 1523808 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48338 --- 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 97ff46f0b96b..4600088bd1a1 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)) &&