From nobody Wed Feb 05 20:45:18 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 4YpC0v2Bbmz5mNJR; Wed, 05 Feb 2025 20:45:19 +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 4YpC0t5mW6z3MPh; Wed, 05 Feb 2025 20:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788318; 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=0ru83RTJs2m0z+Qr1HNMjOkT9hHuVylBZwxwRpt0D/I=; b=o0ccKHBnDFsPjkCcxYucAh5gU7MHeJSpy9cSuTFzJjz/HjEtPyWgYhGQJBUuIeIO59NYrF BLyWYR+bQxt0V6/Hz9YFRxq3di6siL+F7+xr9enygedw00FszPi6q73uklEzcKRJnBIR9z 6s9krtJ2mlClF2uaL6fTyqvIgkTVPrdqHM+TXMYylF0LMkdv5ZU2Ae5bA2MffigRtqnYTp dXcVWolLGbdG7mM7tFU5gDNb6ndWznA668BnqftppLT5Vs6ghcEJDvOWmJz3wYF49dBfDy rkpl+JdroVL+067KQhUOFrxTaR/3+Z6FwDxTeOrFfdXgsG1xDFWy5BLcUK02gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788318; 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=0ru83RTJs2m0z+Qr1HNMjOkT9hHuVylBZwxwRpt0D/I=; b=npPAJoxT17j+4wB6F2Zv2a8VDpast/NCK6gIV8Kz2Wo3lQgB4r1+QSEn1cVuxJfukoitl0 AkwgjkGtwad2jCHK8cNT+7BwJGiyeY1xmt0/LijY4VWvGmpDFF7pufjvI3GgJfGs/NFwcO LcRKP3ga7iEYOfZl5bk06W5i0Oc86ivBbFaXG0tle+uo4c5Nq/qmLYSjU9aKxlz8UWpRVe bpB/wt8aUciyW69MzSpy1VGHdC1FiDla3DobHdwcqAZ9RqsvDFbyjPDwzQ9IrLSSNY9fZA fOm5SCb0ACQLK5UH/hoakl9xZGoyi/cFzXQuz/h8GdnVEtxokbulH5+LrhFPgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788318; a=rsa-sha256; cv=none; b=J8u1/bH1huUuo8nWCuNe0a2B8AzPyVKVw/haR6MOW888K9LwyjpT73AdfmC1GJ1I13KwLO yX4BkeZBBhOGAPKNwWSqw3jeto+HMx5TH0zDNG3pShHxFyn5BPTN/MaDrUebu4b3fJcImQ jfo3i+hYrCLw3CE4IdajCLSnXCUtqfXxvYvADP9o913hq6nb7OksG4qYuOVxIdswRHWdHW iEOoFsZOyuY/NQXpPSZwc7GZKZKDujvGP0Xu4KiCi7W/ry9JuWjgBOiouRj+bCzoyBxlm4 JqR0opbTZ7++jfuyuCFXiCXbSc6MW2ZbAVD0oScATQEnK2ywPpypgP6gwFrOtw== 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 4YpC0t5MW7z16vm; Wed, 05 Feb 2025 20:45:18 +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 515KjIG3083968; Wed, 5 Feb 2025 20:45:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KjIOd083965; Wed, 5 Feb 2025 20:45:18 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:45:18 GMT Message-Id: <202502052045.515KjIOd083965@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: c3322bb4680b - 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: c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 commit c3322bb4680b8b909d5e2d2d0ae8c15d06e19b50 Author: Michael Tuexen AuthorDate: 2025-01-03 13:22:25 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:45:17 +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 5a6276a84982..762fb53fcdd7 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6701,7 +6701,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)) {