From nobody Wed Jan 01 17:41:34 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 4YNcb31dKkz5hyP0; Wed, 01 Jan 2025 17:41:35 +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 4YNcb30yf6z4RT2; Wed, 1 Jan 2025 17:41:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735753295; 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=4Zqx0ZeCfq7PfArOilvZtFIVK5N7frmHN5bLYcPNcME=; b=ybJpFzpG6UgN0CBm9QS2WSzCqRWSv46kdiBI5wjfFZttmc3hl0LfhqHU2kM970vKuuxNTB X5wBIqccuf95h6ZPuMDWpnCyKVIm/+STQOTPzp4Cjj7MjNF4kordIltlvAQMiJe2I3+k6j xZwnLXzqh7ZB4iaVxVY4oHj0uReloFqlf/clv2YcmIRjuuVsRFiBdhXAVDAyp+MxNzNp4B kaBock0vO7vPZub/trIqP1Q8o6mr8+TAtWrkmcC/dz89bNVX9rSqHOeJzKYWAR/tL8jYxM 7YDNur2QSyi4VHTb+kq837WjYNivgF3Z+6zEgzezCwtu9SYwtFACDI44McGhFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735753295; 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=4Zqx0ZeCfq7PfArOilvZtFIVK5N7frmHN5bLYcPNcME=; b=sDwKBQNUg42qJcBk+ZmYpVXkXJoT+EkjuqfOuXYjUmy6V4e+VDuDbPCd83QteHqv2mtPcF mJqvzMPzkfmMohuPKxbWaql1K5ou9ReGUCGA8DN+2oYs16qo8Ff84HhkJRcBVZSin/lKTE BOqgsV2WlhK+Vy2crRX0XLtndABS6QreWGz/DRjkWc/ZrBMlOA28WnHgqwIrFFK4+aN5ch rSCkbuIeA7pZLtmIAh2BvrZVlP6jBRX05840nDgFZkEHT365YNConVPTg0XeUFBUJSvjen PdvHE/yGTPtYdFj/LI22m1H4km6fqTjdOq2q8bp7QrIUpf97KnjBCZiVX5agyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735753295; a=rsa-sha256; cv=none; b=SuGUvF4ovt460Bxekx1VOEruDSGBzOfGkZymKSCvaTEHxg/3pDkqpCVaphkF3+8bUhozPt 7SvjRk3bOPacXoYoBPUKLlaXRtIC3RdxKszyuHZ2k+l6553elNcBggUW0mrvPDWZFM294r mZW9WNqi4SfWAuoWvdu9vVgd66y3p+DODyBu+NlR53Q78hUXaCVy8WqYHYDUQKsSs5BaQt vg9UfrOWTo5U5DP6EMOzMyTIOP/iOJL19YR+I/nGG/dgCJ0wDqf09DQpI1dD1Q7k5mnmYM Od+0+75Hll889tNdCX1KMUqUqEbeFZK1zWkOI4xGJFUfEfBwqgs14Dlf5nksBg== 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 4YNcb30Z7RzZGX; Wed, 1 Jan 2025 17:41:35 +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 501HfY6n086504; Wed, 1 Jan 2025 17:41:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501HfYUJ086501; Wed, 1 Jan 2025 17:41:34 GMT (envelope-from git) Date: Wed, 1 Jan 2025 17:41:34 GMT Message-Id: <202501011741.501HfYUJ086501@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: 1781324db2bc - main - TCP BBR: remove code which is never executed 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: 1781324db2bc22a971a33c5a063036b2775055c6 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1781324db2bc22a971a33c5a063036b2775055c6 commit 1781324db2bc22a971a33c5a063036b2775055c6 Author: Michael Tuexen AuthorDate: 2025-01-01 17:39:23 +0000 Commit: Michael Tuexen CommitDate: 2025-01-01 17:39:23 +0000 TCP BBR: remove code which is never executed USEC_2_TICKS() returns at least 1. Reviewed by: rrs CID: 1523775 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D4827 --- sys/netinet/tcp_stacks/bbr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 3c5864007986..c46a1711c34a 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6329,8 +6329,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts) } /* Round it up */ rtt_ticks = USEC_2_TICKS((rtt + (USECS_IN_MSEC - 1))); - if (rtt_ticks == 0) - rtt_ticks = 1; if (tp->t_srtt != 0) { /* * srtt is stored as fixed point with 5 bits after the