From nobody Sat Jan 04 20:11:11 2025 X-Original-To: dev-commits-src-main@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 4YQWmH72Pyz5jkhM; Sat, 04 Jan 2025 20:11:11 +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 4YQWmH6D4tz4GLp; Sat, 4 Jan 2025 20:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736021471; 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=XE391UuN8FRFSQLa30BQ2jDTNyg09dlgOAUbt8yNVBo=; b=SJ0JrJ2JpJPGICTinrG9OObcS+RtJLh6KvVWH5LJ6lLsxDTmsBKjj48d+OyL/clBEpIaNq YEAMgO5FJwXEJ5NJnNKNgvq5H3W0ZmzlCkgQmN9mmcG1MI/CJe3LspATgXgPqTew6NXiod huuzwnzTaqmsrlKIqpiaWdQXi27BZm66o2YphRwUZnmUyhR2MC9clD2Lo1NbSHPBFsfD84 UAn+xmIJuxr4DRqHbkCjEk5cFkdKLHIo8Z1BXrQo265IRf5onmneALn4iCsGYRmaJGY+Tl IVklx67MEhCQRhb26n2M9Fk4DB7VEfS3r8nIfbzDDgrVnXdII3qJT3Oohrfl2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736021471; 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=XE391UuN8FRFSQLa30BQ2jDTNyg09dlgOAUbt8yNVBo=; b=YdFcxDt1CQAdZL9MmNNAmCjjuUvyw9/0rR+I1yZhqKhrYLXsMNlWa8LO6goKITubT0hhqT r4A/R3tu9rIFNDxnY07I9T7gsctE01Jorn1SckkraBLEhfe3hDT/LUBlUz4BZ/jDwSGpmA THlfPPYdtKDGMOGKjF7lQhbJX8NSfXZe5nUKbE2MmFGcy8HgCp7DDS4F7ua7i1xNKl+UWL w1CL/2j/FG/ouWhhKTVtB4+lRSNz3hDJa6dLHhAE89DEhIST2zkFOFTikm/tFo/VQKUZSq v8RL/7sqRfTJs6awZmeaeBiKJvStF+Fz+F6VWS7hFQdrsNcIZFxYwrkpf6yg8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736021471; a=rsa-sha256; cv=none; b=Au/lyRvjjyDkzv289G7+e8OG4J5/RQS0kiVuCe7clNnmoSrPHDeB4mJtV8/fr77PelaDMo bzgVYKWX3cvteZ1KCvg+kmfFOCUQ0vXD2/Sgg8yOuaK0inASY/WzmI/nFotc4QmU22cb+r dxksK4OPkbcPl6qQO037cSQbNDVRVsN4wnWjUH6j9W0buCKjS2lW69wHQsmKZ4DFqd+Lwv Ih0I/aut5YqTX53w8mQvlT/TLCSG/k1g4ShZgwmgalFpHUOQ7NHKUtQn3UWG4xh4p8koo4 WaEYX0C47GIiyjT+8LRZ+MS6859Zghlg30eapZkJq09SVhBZkHL/mrpa1G/xoA== 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 4YQWmH5pTlz16fn; Sat, 04 Jan 2025 20:11:11 +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 504KBBYU056251; Sat, 4 Jan 2025 20:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504KBBNd056248; Sat, 4 Jan 2025 20:11:11 GMT (envelope-from git) Date: Sat, 4 Jan 2025 20:11:11 GMT Message-Id: <202501042011.504KBBNd056248@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: 4bce1a19fcfa - main - TCP BBR: remove code which is not needed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4bce1a19fcfac0c9f22c11278daa510546ccd3f2 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4bce1a19fcfac0c9f22c11278daa510546ccd3f2 commit 4bce1a19fcfac0c9f22c11278daa510546ccd3f2 Author: Michael Tuexen AuthorDate: 2025-01-04 20:08:43 +0000 Commit: Michael Tuexen CommitDate: 2025-01-04 20:08:43 +0000 TCP BBR: remove code which is not needed rc_bbr_substate is a 3-bit unsigned int, so it can't be larger than or equal to 8. The wrap around already happens. No functional change intended. Reviewed by: rrs CID: 1523795 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48320 --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index ed7e07861ebd..535766a0a1b0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -10313,10 +10313,6 @@ bbr_substate_change(struct tcp_bbr *bbr, uint32_t cts, int32_t line, int dolog) bbr->r_ctl.bbr_smallest_srtt_state2 = bbr->r_ctl.bbr_smallest_srtt_this_state; } bbr->rc_bbr_substate++; - if (bbr->rc_bbr_substate >= BBR_SUBSTATE_COUNT) { - /* Cycle back to first state-> gain */ - bbr->rc_bbr_substate = 0; - } if (bbr_state_val(bbr) == BBR_SUB_GAIN) { /* * We enter the gain(5/4) cycle (possibly less if