From nobody Fri Jan 03 13:24:19 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 4YPknJ037pz5jyqp; Fri, 03 Jan 2025 13:24:20 +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 4YPknH5v1Fz4HHs; Fri, 3 Jan 2025 13:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735910659; 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=FG22AezsIlIpzyrfbcJubM84zJ0j3oayCNCm52g6Ot0=; b=gh6IYVLoGm2KhOoWbUlhtIb0ByJ1ZwRMZJFggki27TdDeDMZRpM94grWH/KDboqcCUkPeH Uz5giJL0psco/MH6PUrHhKN9i5vjwKkCexHw5tG6JEIMnPtV8khtFLfm/zEYQy2jEmeaxM PYj0fO7KJNHwZpeZX80PES0bH1dps8n/Jgc/pk98pTdosKLuzMtHeC1rdOu+KvL9iCoNTD HkE+F4W2r68EU8oCGAARtPGzr1/yyxSUtBJqTL1PI8xqOwMq/wRWUY5gMinSFFKmPARVsR d5wJtRUc1tKwZ+jRrcQx3ztND9OqaO4Ku0W6fH3pc1UyZC6pYYho9sEpUugOyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735910659; 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=FG22AezsIlIpzyrfbcJubM84zJ0j3oayCNCm52g6Ot0=; b=PNk2YNA6XBdLL1jIXpNGbjIguMAoOg/zV5XcFKAD05DEkQ1gCz4luAaOCKz87bdz3d5p9y QFXpY+Vho0CxSe8femFt//jp4bBsx7Ly0QiKCKhGGYEn+c7usYVKy9uXoSGcdO1sZ8q7gf y00HXbLO/nNErHE9T3ggO0H0lZ9NG8RJ8WcSz69V+rW2j3MpTEIrScFU2X75FQ+NndUrJt Pm14m9PPeYJKYbyg8j08tjS1O1NgMhGznlnuEPMurwuk5UhYqp8GoxPDYPdMI35qpvh1Q3 uVbt/IxSDhs53mL0FjFMW2enJejt/Q1/FP+kt71yekv3HbflQDMxZN0Xf10szw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735910659; a=rsa-sha256; cv=none; b=iNihsri2X+XzA/ShD9KvZJ+hwQoT1WL8CU12oV9PjDH+4gyceHMpEx6eazn1A42xVdWgo3 UmmsFX5Ip3uVscPqwH2F9CRg/RJI5aabPFCeb/jSn6qPdtbdYfUaZNH8Xk9cigkutpicfp GBYTejSWV0ITi54sLxPibgSpeLz75nFN3q7Q0klw9Rv8bhAES8/evDbOgLBhhPgyIX7jCN dmGU6sOTpVkU8+cF8N0+AzeMmwUHCF0hY+uN6h8MpoRSNdqYI2mYqRNkphrqHMWh7FsPbx 53oCTYVvR+DdgiZgN0mRlUMEJMqIQ69sZYhcCNWlGD+Yvgrh95AwPKzHbEVvtA== 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 4YPknH5M4Xz1NC6; Fri, 03 Jan 2025 13:24:19 +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 503DOJRm097901; Fri, 3 Jan 2025 13:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503DOJaZ097898; Fri, 3 Jan 2025 13:24:19 GMT (envelope-from git) Date: Fri, 3 Jan 2025 13:24:19 GMT Message-Id: <202501031324.503DOJaZ097898@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: 4173a3a009a4 - 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: 4173a3a009a42c47f1ec2d1cbfb99347aaf195da Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4173a3a009a42c47f1ec2d1cbfb99347aaf195da commit 4173a3a009a42c47f1ec2d1cbfb99347aaf195da Author: Michael Tuexen AuthorDate: 2025-01-03 13:22:25 +0000 Commit: Michael Tuexen CommitDate: 2025-01-03 13:22:25 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48293 --- 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 fa9953fcd0a3..fd5bcd81f25e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6712,7 +6712,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)) {