From nobody Sat Jan 04 14:27:22 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 4YQN7Z4hJjz5kKtB; Sat, 04 Jan 2025 14:27:22 +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 4YQN7Z3m9Zz4Xpg; Sat, 4 Jan 2025 14:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000842; 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=0vcJ2jGwE3aC3xaLuPoHVaFlgQaKE+1N8Tmp36287iA=; b=YkFXes/qFaab4Mgf/47i11lKxuVSDyGKuRi05YbBwKyXefSizH1T0Nhv5m/61kU0uldJml ipFofMN/9Z4tav7yohSvvqHC1/InObEc8IRoeURj7L6dNHSP9JQ5UQqDKVI5pETN8PYL/n lkyoOYBTiyqtCZBtoLerd5UteERhpJ1BxJk64C8Hcrfq/GfaiIo6nEutoDUK/+Nhi0JjTy HcaGfW6dBpiPuqIuQgfpWlNYOKRQuvvF0lgx5To2aG1ye+32kvN6aZSgVFcSF0F60Xrnql D7rCfyVF59nRcQsi96a6/2DpMHuOjZUwSHw0n60j4VnlC1zRHm5ASPAaAQ2g6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736000842; 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=0vcJ2jGwE3aC3xaLuPoHVaFlgQaKE+1N8Tmp36287iA=; b=W1a3CGfa9O+gKyBoYi/PZRBccofNj1SIH+w8PtEESlDnJGRgHMUcA/ZHL+s/p9aBobFLEp SKPRAEBqYv8pKwrJ899LFH9chVRMpNSs2AsAt/dS4LigMM5uOfrsvKTrfg3xxBe/1QomgR HUNXFbtc2dPESv+NeLVbKefMl0FzDEyopmexgdC2w3t9vN+iH+l0Nzo59937l6yXtDllSb YU0bePKnc0sgkTPFAy35To1TJvnomShI1TtB7qIDF+C3P9VZ1ZF/XbO7Hfqa6nwGsAClW7 CerkLGg1S5azTxJTkrOrx3Rb4Dt3hmfJTXh8qeeFIKJfpUAfZzboc021V15wGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736000842; a=rsa-sha256; cv=none; b=rwhmm1/pQp8/wKiffyG7d+Stv9kJrwKJ0negqBR5bi/IFH8P0tK/am4+eGx0ajyaMlCfXk aoWNNP9/DbPnY3aR1PLgU1VcNVGwJVw23y/a5ZdUTnorTLsJmaBzPCXlH9x0hZHNkvAP+n SbNYKvowk/T+3JzgiZAdDZGKSMhKiYvDNee5H9wDJWi+bJsjAJAOAaEfiz80/A3YpZkJ6B dqYUzNVCXCkwE/UkDQ3JZX/pQLRrPk26uQ/ZG1g4qQoIid1hy6Xcu1i5Y/CfBm1FdwMfHN 9/dsJs9OU6dhlEgCdoAQVz0ANhaL8xQRiHgMYTUmyPh7DI+xaOsqQBQQk2I55w== 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 4YQN7Z2tqzzwpd; Sat, 04 Jan 2025 14:27:22 +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 504ERMsL007708; Sat, 4 Jan 2025 14:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 504ERMWF007705; Sat, 4 Jan 2025 14:27:22 GMT (envelope-from git) Date: Sat, 4 Jan 2025 14:27:22 GMT Message-Id: <202501041427.504ERMWF007705@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: 305c40dc552f - main - TCP BBR: simplify expression 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: 305c40dc552f9c150eacce95c181798031368cd9 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=305c40dc552f9c150eacce95c181798031368cd9 commit 305c40dc552f9c150eacce95c181798031368cd9 Author: Michael Tuexen AuthorDate: 2025-01-04 14:25:01 +0000 Commit: Michael Tuexen CommitDate: 2025-01-04 14:25:01 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48312 --- 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 9e1f83df4298..ed7e07861ebd 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -5553,7 +5553,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);