From nobody Wed Feb 05 20:49:37 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 4YpC5t4xFVz5mNPg; Wed, 05 Feb 2025 20:49:38 +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 4YpC5s3pGhz3QWj; Wed, 05 Feb 2025 20:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788577; 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=DjPjENrsCyFcCmRX59QE+3LZrenCtKrRZrZxyStno3k=; b=ysqfRIRVITNBIxOGmGqqQ8eOKS8BclxjPHbO0KXasEekL/I60AP5BtZDMK05nyFSu+vj6K 5Fj8dHnQxOrfcxkdbYngmmmUgc91EloiRNkF3hrNUiqhOT6NbOkhBRczOralcD3hatd6Ig wN+k7Q1RFyrG/rZFB4XAKqc0+7f5puwkZhNoIsfCKqfsdrAmQ3jBEB4kObg1wtk/AvLPKC qd4N85RXAvqNoHx/3ef261AImzFmUfBRqSiV16CRtJBhW+Lw1db3AKHGlNMY9Gul9avioO K55/USxR9WMGNNSIf3Kf3oCtOLz86oA9mzM+zEPU8fluEkyzxC17XiyO4GZV0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788577; 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=DjPjENrsCyFcCmRX59QE+3LZrenCtKrRZrZxyStno3k=; b=xHgi0yDr8OWOrCLXECLHkM1LS4sUDSEdPCa9BUzd7kguj6Xof8hgF4Tj/FzGlQO/hOaNTT xEk6k9ySzcl21TzmcK2YRSE/T3ox346fb7DROcjv20bmpyZ+yVSvj2MRT52CvsiPQzIGkS YvCK99p8j6VDapsGB3R0hkn6DrkV5JrtFN5EG5g0Y0zCPiniJ+094QbNhy+G+MAGxtOSoF Car97l90uxxn5NfhlFuIMgWdwW/rNcKcksYScA5f4Y2QbJHNaqOTTZR6349Ni5mCzCDI61 EChDWFMF1fGztHMGJMtzhi5xUu/YrRu/qSWR+BTW7qePYTk0pwIDAv7lIDF96w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788577; a=rsa-sha256; cv=none; b=CMfl1RXOomioC91cMB3ID/wlo5Kx10vnWgl2d21fB6/159YYyangiGfDTmW99+AnrQ1jyU e2etqL/jG/SWo1Zg2sPGJqWWlYjHG7cY98v38PuYJu2Nu8fAFnqoO849slk33MDTn02hbh kZqHwCJhJPQIeejFGVNKP3gp79ITtCkju8EXyGceozokUhe8SutG4vBKIM4ZE8/lN3+Mug YLDYmtTp/lpdbxMcTFaBhV7ccOjtcYeLd2PISe1bwq6BLAgvDfDGv0HB4q7SgdSUKf2uoB u2r7pGU6V+W0hMhQUu3+SzMfvMA43fIvREinuaMyguk/8YEP2BIxqCrJApGpJQ== 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 4YpC5s3Lxfz1769; Wed, 05 Feb 2025 20:49:37 +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 515KnbFY085813; Wed, 5 Feb 2025 20:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Knb78085810; Wed, 5 Feb 2025 20:49:37 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:49:37 GMT Message-Id: <202502052049.515Knb78085810@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: 2632e532c431 - stable/14 - TCP BBR: simplify expression 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: 2632e532c431b3ebb1320a50b5ab78f9f24f3627 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2632e532c431b3ebb1320a50b5ab78f9f24f3627 commit 2632e532c431b3ebb1320a50b5ab78f9f24f3627 Author: Michael Tuexen AuthorDate: 2025-01-04 14:25:01 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:49:42 +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 1d030230748f..144b3f25e9c7 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5542,7 +5542,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);