From nobody Wed Feb 05 20:32:23 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 4YpBk035djz5mLvQ; Wed, 05 Feb 2025 20:32:24 +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 4YpBk00Bvyz3Fqv; Wed, 05 Feb 2025 20:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787544; 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=RHQpM+e+8MbdRIv+ACupeuYR4ihGcFpcJOuV9SphRu8=; b=Z/GQUfv1DUhTyIKGobJP2cYCVMcfdOU5NlLLZaDN9AUHi6h9VEhO11ynXN/drlu7JWe0Rg MhXuy54jg6V9ccrnbqsoO9qs3j0F81fSD/Urtzbk9lx2GiIbcZfzc6eoRS1ptMPzeolw9P qCYYse2FBKfOyH84n1M+0hkqx9Jh6vyNMcuINzAXhSYFdUqbPDwUioghzEskReoqyNFIFp 5jaM+8JYVn1S+lAkOy/x9ELizSC1dhcgR/Ekma/wPoWrNKNeEcgZupmsMwYqwzHfZUQPQi IWsexdnEbsm0C6VdvPKYH/TqEFDdIfM4ZT7h01nwTNg6q6IJ7iC5DRpcEHJ0uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787544; 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=RHQpM+e+8MbdRIv+ACupeuYR4ihGcFpcJOuV9SphRu8=; b=dUPdhwqOR9DFPSg2a23DYd6trgGfYA5upHxeXTeC98B04TtLBXzzKpSpZc7ppqvizoUCEH 7srNXZ8t4yrAU7ZrHAGXUKk7VW0g20RGPA+TL9m5y5AeSqPZzKAMKM4H3Y1xJykFJH3+pm 1CZ03qWEsW3bMqKxuaAJhL9//rBtFWZQ70X0mUtYmcJAR/vyEruVZxI4+OJDztxA48owXI Zx0V6llrP1kdhJQpsqkg29k5uKbR1AYFbPMmoTSScz29eOEx0oPlMhGQl4+qlv/Rg99Qq5 knoPhWQncQvfl8pt3ZhPRIvHx7a+9lzScYmkiqOQVA3J+NIqHQuuyqpCNNcGVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787544; a=rsa-sha256; cv=none; b=eBRJOFqTJsKVFWNt/D/Z3H0TFOqAdTFNB9La+aro4xKqy9N6E8u32TsaXb58laaYXBBCQO VbpUYY0qvq3PDSbJ99H/nI31VlnoWYssZJqZNafnRSUcfpGIrXIgBTYBKJyAXB9AqRp8ua NVqe5leewpSGwibPKnOfWi8GcM+b8c0ZurO09KQhdHAugI1bCmykdO5cu+EI3G3sbhhxGe 2uRv1kVPNFUI+bE5iPIho16++25LCV6dU/T5D4unpBVNoLF7+MTDnc6zUKp59wBnOOVagc xYtTNgt67+wtuIOTyGgKzJrb6nonaPp3wr4JxgP7RzAdnhgfzUunevTJ4v0cgQ== 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 4YpBjz6tSWz16d1; Wed, 05 Feb 2025 20:32:23 +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 515KWNHp062624; Wed, 5 Feb 2025 20:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KWNT7062621; Wed, 5 Feb 2025 20:32:23 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:32:23 GMT Message-Id: <202502052032.515KWNT7062621@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: c8828fec0540 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c8828fec054096216574882b8bcc85d2548cbbd6 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c8828fec054096216574882b8bcc85d2548cbbd6 commit c8828fec054096216574882b8bcc85d2548cbbd6 Author: Michael Tuexen AuthorDate: 2025-01-01 17:39:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:17:38 +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 732879dfab47..cf3317d790c3 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6359,8 +6359,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