From nobody Wed Feb 5 20:38:56 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 4YpBsX4HfNz5mMb3; Wed, 05 Feb 2025 20:38:56 +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 4YpBsX2pgLz3K6k; Wed, 05 Feb 2025 20:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787936; 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=nEYEtqw1CNndps5pG6S4OQvn6dWhbe9C5yG9NpEyhvM=; b=TtstYW3IqXqS03/4zrHrbWDaQxv5C7f2WpRkfryMU/n08viZGIt8u+l7/WxtKtRO89Jf7N VBqRbQ0F5f3m95vDVTtek3SLTGhr6Z++Jis8XKsi9vD8O/mDEX4eLXSxB8HgZnHGfVN9xK N7zalOp8JGKwIOwkex5EyupQaRAXNOYc5XgMptKaGRHmMYGzAGPp9DPMWsyoseIFTSgk9Z 62ZwXQnrpNgjQ6AqDFjaIIMV/6Ap0W/jsRyWg7EWW/tzG7Li4WZuNl/kCEuNz6UHB7UadD RqSlVgjJPhLv5+hiyVKr2byhGMLeUNTZbexR5ZdJyL5RkwyoPq7u066KisIWdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787936; 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=nEYEtqw1CNndps5pG6S4OQvn6dWhbe9C5yG9NpEyhvM=; b=OyTM8AEf89O1M9RxwxdNG8qz2CShCLw8O6VXXGzQEJAktJ4WMAz8xfcoBX7JmNa1OO2NXo Ki0jYs/c+OQU64fpm2uifaCRNNB6lnhk5/jnBTjKVs+XEsg8nUdpWBi/nMI6NuAdWZC4U6 Cbq9rSW3PlvWsXhY7qlyYQ0Kxf1IQWgUWspITI96Cay3oOVnlHGvboqaBJtoRWuYtoltHK 703FVLcOhTTbHzeN0RzoZRSN3Y3HNn30Wu0tuGyCia9LgYX8xV0q2oEDRZa9TRyWjWzoVT y4ryepAf6S1mrkr/m+juwyf/+dltriznmNvH2bKuj/JfWZFJ72h33tWYP07H4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787936; a=rsa-sha256; cv=none; b=Vm+S79hkhBsKyvd4Pxo+K9T35IgBESpwLQajY2GxdZ2RZOUbzudQD7BIYAq0CTKv1XXsSn wUh9EFyaH1abQY4fVCxbKpHj0e/HAXKnZCIkJDP6mu1cjpLeth0f6v4K/5yvWNC2hjSeLP v4mny+EQMmoxMD3iEIVON68WCLPEj0WfzSsvCe3PyVO2GVKN0Zq4H9qSxDLpAxzBQ6BDI1 NfK3rXNVcy8VsY6ZxVa8lHWZrkj4saRVrL1bv4Dnvhv3n1sawAFAQOXro7NOdLnH9xKbSs qcQGZKBlVdos0QpzgSzTjg/kNhievhdKxzw+gJJB1V0qVHkHSZoOPMdgHd1fZg== 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 4YpBsX2PzYz16dG; Wed, 05 Feb 2025 20:38:56 +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 515KcusY065530; Wed, 5 Feb 2025 20:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kcu4p065527; Wed, 5 Feb 2025 20:38:56 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:38:56 GMT Message-Id: <202502052038.515Kcu4p065527@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: 6aa2c8ed5eef - stable/14 - TCP RACK: simplify condition 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/14 X-Git-Reftype: branch X-Git-Commit: 6aa2c8ed5eef2572fbb64d9512067a9693c97116 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6aa2c8ed5eef2572fbb64d9512067a9693c97116 commit 6aa2c8ed5eef2572fbb64d9512067a9693c97116 Author: Michael Tuexen AuthorDate: 2025-01-02 15:19:30 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:39:15 +0000 TCP RACK: simplify condition It is already known that rsm != NULL, so no need to check for it. Reviewed by: rrs CID: 1523815 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48282 (cherry picked from commit 8471791eb6eeedaedd4d70e1076cfd143bf12fca) --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 9ac923ce760c..040e882e157a 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19092,7 +19092,7 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma log.u_bbr.pkts_out = tp->t_maxseg; log.u_bbr.timeStamp = cts; log.u_bbr.inflight = ctf_flight_size(rack->rc_tp, rack->r_ctl.rc_sacked); - if (rsm && (rsm->r_rtr_cnt > 0)) { + if (rsm->r_rtr_cnt > 0) { /* * When we have a retransmit we want to log the * burst at send and flight at send from before.