From nobody Wed Feb 5 20:49: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 4YpC6929x6z5mNFP; Wed, 05 Feb 2025 20:49: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 4YpC683jqwz3Qkf; Wed, 05 Feb 2025 20:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788592; 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=lKMzKji2h4P8i1v0pWjxqO1XmfqqaX7Dd+IyUUQDsJA=; b=syhWo3Ab+RLI/I3WgAoJAH/waKImX3oQ9VkYpZiJ09z+amvDGakDFCpXPf0t5z7oD94uiI 0hFsoYsn7fhRDLPVqoR13fKzCw0QlLLXCvKBkZ+UMqyMcCO/ZUf5SkdPMK7S1Z4fsPnaQk QN7Kdq8GWpGx5nPl8nZPIhdljWgePn4xUN8ivoj7MMyNcZQEnLWohSpI8ZbeI+fYG/Moii m+0aeoVaBGl7S4DT5usEIHbjyhhDhQUoNWqIr+o3WivzmQbdH4YIaXXq6phC734Sm90Fbu cfheRRUFmuK5/InD6eSius5I7rpW/EbLnFlyDo1iaam73tjU3oNFWndg/Mn0aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788592; 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=lKMzKji2h4P8i1v0pWjxqO1XmfqqaX7Dd+IyUUQDsJA=; b=yn3uOAHOgT/GGotJbxlETrJ/M81IEaVdnTEmKxejYP+S1x6c2aakMBgTVw0YhikayNF9BU InZp4WGfHo7wiJ4sKYJdj8coDmAllIpB1y/JhbrrOxfS11KOlULmSRm941hhp1NaPGxRkc SHLhBCXg13Vo2TOc2CZoAVzuwB+mq0cNo72jSuyuG/IDi3CY6QusoGDSxlDsef+PUlctTs rd0nkMu+9DlqQeXrjHH1lp9hoLwIQywYnO50zeSFqchlivEKJddsU7Nn/sCnrLB4US7frZ 0i/uLeeOdtgUyu7otdVPr0JvJN9VglYIzwBgdXluj5J8Yy5SKnMpwBDojJqbwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788592; a=rsa-sha256; cv=none; b=tAAulK4VK1161dgdBTHHiWhCsMlvQrXadYz0328n4GDfHWkO28KoktcSRlxSxIfn8YjrHS o1D4dYb98WO7qgaxIYvQ74PiLQt6JCvVZjcp/xrwwPBEKLIJUVeTTrIwY+qNrnsmT5UVPL nof3IdB6nxYTPojwnt4shOb37VmuPbwtsG5phyaIOWaF27oigPrZwwWAglHjW/ZnTVxcj7 DCIolRZWpE7i8P//zpm4Qxn8hRA+u9VTnnSqN35stbDsv2Tyl+uwmzKw2zjc+snLaj4Jtc ynHfXkvXWlN4HhbAhsB1BjVZvoLDswNfvWueye8cJjTB0Y1EHG4piQ8qHEqX+Q== 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 4YpC683GPgz166j; Wed, 05 Feb 2025 20:49: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 515KnqFX086008; Wed, 5 Feb 2025 20:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Knq19086005; Wed, 5 Feb 2025 20:49:52 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:49:52 GMT Message-Id: <202502052049.515Knq19086005@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: 4f5788dfca2b - stable/13 - TCP BBR: simplify expression 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4f5788dfca2be357dd3ac7b27493bf08d4351e63 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4f5788dfca2be357dd3ac7b27493bf08d4351e63 commit 4f5788dfca2be357dd3ac7b27493bf08d4351e63 Author: Michael Tuexen AuthorDate: 2025-01-04 14:25:01 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:35:00 +0000 TCP BBR: simplify expression There is no need to check partially for bbr->r_ctl.crte being NULL, since this can't be true in this path. No functional change intended. Reviewed by: rrs CID: 1523810 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48312 (cherry picked from commit 305c40dc552f9c150eacce95c181798031368cd9) --- sys/netinet/tcp_stacks/bbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index a8c2ad547a5d..12152fbddcd9 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5586,7 +5586,7 @@ lost_rate: bbr_type_log_hdwr_pacing(bbr, bbr->r_ctl.crte->ptbl->rs_ifp, rate, - ((bbr->r_ctl.crte == NULL) ? 0 : bbr->r_ctl.crte->rate), + bbr->r_ctl.crte->rate, __LINE__, cts, error);