From nobody Wed Feb 05 20:31:54 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 4YpBjQ6SHYz5mM9h; Wed, 05 Feb 2025 20:31:54 +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 4YpBjQ5zG5z3FgG; Wed, 05 Feb 2025 20:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787514; 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=PGjp26kqLzRRX48b3ZWHs+22dmCYrC4dU9WfJYQ0ohI=; b=nrRwWhgcB99G26JsXqVSLb7i9pXVZllNlHsp+Uz6dWfy7zehwwLiBEux9Mkm6JBXhMTG9f F4ACTy/5zOOFvFNEyM3nDHOoYBjVkwY5PfO5Fh+nG9LP/qsC6ydK6h8s91e4U1pjGOoMXx 8Ugc9rvLSAmCJ+kuQLaZi+A4GA4sSsViPAPt/+pARk0W4poy0FgIFteNg6aoWfzgc4j7FL kkPkEJ+tYBlUT1BVySfoqpTytunHf4nMzpBBTOohutd00I4HDDG6CQQWQP7a7iZdyIaBzs EaC/6AB1pAz5LeRyYeeIfiINHVoprsHhL/zrxMITWT/P0P0fxrEfjAx4ULoz9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787514; 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=PGjp26kqLzRRX48b3ZWHs+22dmCYrC4dU9WfJYQ0ohI=; b=fD2qbykhcJ4ZepFTW4fc9FgFq4YENVAgAypTJR++sQ3fb+AtnUVTTvRXztjsqtjoLZk0e+ pbNmCkGL/qxw1lkJFLDA/OrFf4qBEKbzU/eWfkQBHmj7ldmP/YNkvhCOrbqq78bRnp5Lt2 gkl+EOg2g1aOQ4zOWgb0xkLoZuz7Vk/2HoFX29gMtKw8JHY2UTXXwjeo2ctR+vfqy09O9T aeLuq1NSvKBeZAK6tr+G+L3tcmoh5XVmSFvK8jxXRSauPdOXpuprVE99MLZDToNI5Fu+uY mpuyleuMiZ0FkT28AaKdq4ynAErYjhfrnFOo79T4an77RSOL+7TbIAFUYgWljA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787514; a=rsa-sha256; cv=none; b=rJAxBTLEPsiZeHtUpramqnj3s9AC+5m7MtyIRzeDZV06eSd6fI0tbpmbz8TRvPVVHffQyg k5SnEC/1PD2xMlyihP0zAg3O1p8SSGGDi7LA53ZG+yncPlNIAhtmYzmfpNPJbEPBhvwgSI TwnWQfZCFaM7UHOGXzgsPP0nzKrt4649IpXNGwxR4l1bEO7wQOsqwr6ZbKd2kMRW7yTKr4 EAtJljSmkOtqoeqnWZrEyM9JM4sbkrsqEUZiLrUI4GrKtTBrlKTYW/27yqntvcEkeRLn/k Anj6c7fp4YFhySWkAZ2Jr70Ve+8lCWP35o7LcvXhGBju76mzjhBre4Y9VR21pA== 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 4YpBjQ5Sffz16cp; Wed, 05 Feb 2025 20:31:54 +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 515KVsna062377; Wed, 5 Feb 2025 20:31:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KVsvn062374; Wed, 5 Feb 2025 20:31:54 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:31:54 GMT Message-Id: <202502052031.515KVsvn062374@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: 8a246cebc105 - stable/14 - TCP BBR: remove code which is never executed 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/14 X-Git-Reftype: branch X-Git-Commit: 8a246cebc1051defe8af945590db3476e4f4676d Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8a246cebc1051defe8af945590db3476e4f4676d commit 8a246cebc1051defe8af945590db3476e4f4676d Author: Michael Tuexen AuthorDate: 2025-01-01 17:39:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:32:16 +0000 TCP BBR: remove code which is never executed USEC_2_TICKS() returns at least 1. Reviewed by: rrs CID: 1523775 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D4827 (cherry picked from commit 1781324db2bc22a971a33c5a063036b2775055c6) --- 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 b9cfdf312c8c..be428ed8082b 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6318,8 +6318,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