From nobody Wed Feb 5 20:45:24 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 4YpC113YnSz5mMyd; Wed, 05 Feb 2025 20:45:25 +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 4YpC102dljz3MVt; Wed, 05 Feb 2025 20:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788324; 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=0B78whOHm6rFpkm1Vbttjx1HbkGkCsEKdDKaYsHR8yk=; b=o+t31Wbttz+3bW0x0DaSRUwlWlhBRXdbQ1gKuZzi08mv86GX9bxZcvTBztwifkvKOCHIZL xnWLnpSDJtMmKb7HjPzAJJRKVtQ77fG2B9XLfiBAAGAnDnLhISuezWsa6lJlPJiamKLwdU asW/L+Cv68bNz4rjNfDZGHiq45swerWd/7ZUsscmYscdkhop0M3M5Alaufvb6dKmBj5T3z zUrJV/EartHjRT32iv91VJ4dMR5m1iKWHqc3a2qpdECJY+AGlfnAS+UduBlitHFscXgzQ5 E4Kn1QDs/b0trU5rWeefnD+Qrlv8QWI5EmvP7S0ObiqVzik7ez4U2FdUX2uQrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788324; 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=0B78whOHm6rFpkm1Vbttjx1HbkGkCsEKdDKaYsHR8yk=; b=mjO801eziW3iNBqNqMxIbw9xpRMmrGxSmf0UDHUg2EoQwxjX23qnhDUWO5qSudX54kivS4 oku+1e6HXaonGvfIpR69FxXkhsu8CdWb7RKZjnKO4n97XODGq11oiA4GQyHQVtsoGCieXq l0++9bkEqilwery6JGjFJI2xy2lM3bWN4bdaIh0zEmoZMb467Ve3mSb9sae0Of7XObiPKD emC6gQ4ifDbEdIkja/UstbsaGQjLqIsKq9M5IvbVDUOwTOwVVB1wCBUNAdiFtTUnDdA8MD vaG5IEVwMz/3Vf3NZq2//XBkjj7D6gJoLqj15rr7xH7e90ta88avAPIEGEYElw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788324; a=rsa-sha256; cv=none; b=hjx+G17vxRlKwDq7VEkeG+SQyAtWtgkwvaWTDzYB6Bl3aAgTYifcwmidnqQjhekM+a8xe2 WI2UdwYy2DP6sJhplEh9rwbKaz99lbH40dpQ1QyOLTwDJcNJfv1Dvd5eT4HxqDLF3fgUvV qKq2lpJTImu/aIyOX+9P7frL6ozXtKOTHQ46XzrBSR38imgzFXXAqrgNSZ2Ptnk/88JxPK st/rsqH5i2qdJmHgk+qLyde8Q7wKnrJShH5Iqzlwa2OFz9b+kAk6K8P50eS71dbaA8CVmO vUqNrhc5QvJPn+7728hmlpBxEPFzaF+l69gpCbNVMMU6S09N4WCJ/zx2OnUJfw== 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 4YpC1021NSz16fF; Wed, 05 Feb 2025 20:45:24 +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 515KjO0A084111; Wed, 5 Feb 2025 20:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KjOG8084108; Wed, 5 Feb 2025 20:45:24 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:45:24 GMT Message-Id: <202502052045.515KjOG8084108@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: 0d93b08b4942 - 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: 0d93b08b494225969358c1af8ed65e99b137aed8 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0d93b08b494225969358c1af8ed65e99b137aed8 commit 0d93b08b494225969358c1af8ed65e99b137aed8 Author: Michael Tuexen AuthorDate: 2025-01-03 13:22:25 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:30:35 +0000 TCP BBR: simplify expression rsm cannot be NULL, when calling bbr_update_bbr_info(). So no need to check partially for it. No functional change intended. Reviewed by: rrs CID: 1523803 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48293 (cherry picked from commit 4173a3a009a42c47f1ec2d1cbfb99347aaf195da) --- 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 6f47f7ddaf84..07430a0564d0 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6745,7 +6745,7 @@ bbr_update_bbr_info(struct tcp_bbr *bbr, struct bbr_sendmap *rsm, uint32_t rtt, bbr_log_rtt_shrinks(bbr, cts, 0, rtt, __LINE__, BBR_RTTS_NEWRTT, 0); bbr_set_reduced_rtt(bbr, cts, __LINE__); } - bbr_log_type_bbrrttprop(bbr, rtt, (rsm ? rsm->r_end : 0), uts, cts, + bbr_log_type_bbrrttprop(bbr, rtt, rsm->r_end, uts, cts, match, rsm->r_start, rsm->r_flags); apply_filter_min_small(&bbr->r_ctl.rc_rttprop, rtt, cts); if (old_rttprop != bbr_get_rtt(bbr, BBR_RTT_PROP)) {