From nobody Wed Feb 05 19:36:29 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 4Yp9TT4pxnz5mGlG; Wed, 05 Feb 2025 19:36:29 +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 4Yp9TT47jMz3q0Y; Wed, 05 Feb 2025 19:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784189; 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=7xTR9RsHak3P5ye3tUb8/PqfcUPO+z2YLDFWsCpU3ek=; b=IvRrumWOjIrAgnuCLaBdgucYp8yk5aX3yrc7FiNfbkXUcNZJ1b7E9n1WEYddleHDGHiRPq 7jQwuXDtYP9FF5JCTUEVdaIcthBQ2AVb+wC6dG1JlLeMaddNYwULv5lC9UjDZr48logYeH pTo1FOS9artjBl3kE4rScKamM51880sUqSC0T/7yebRJ6jxHzckYLlvbHZBOZq4iv51ndB ieT6NhJ9EatqJOtGTAlEoXFYFZtbqDLzQO1725XpQRhHKShGjRjCp1sb+dVqAXe63av+23 GojMKZNFsb39bkM5a8AaDZmpM80g3wmRSk8u4VtOCmAFIbPaarFFl+m9KfviMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784189; 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=7xTR9RsHak3P5ye3tUb8/PqfcUPO+z2YLDFWsCpU3ek=; b=rZb20GSKGXRnLLuAGYW2do9jz2QnhgSxGBPwWKaeyhADNWYRjnsZpqjlio352JQ8pUzGqC S+ojesZZVqqx18JD/pOfOKSKS0nTVSlasGy+HTiSI/NuHMTErFHsHIWzzEtDE+ToIRFzl+ 98X7vyOsm+TA0kLQRdH6X0uCJ/8L0vvA+PXVcuQJ5gXa5k7W2KSl0ixE4rSKsFg3NE5NK/ SkqUl0u5WAVq3EFWo9RIqvND//4nrgkM1ZzYGYJvFwEmkTdmId8jQDPkZzi7m19AjFniMz FvX9T+2xz2ZONmosi/oJ/MwueOzci0BOLpiVY30KEYroNV+1FLNoIt9pyrNmxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784189; a=rsa-sha256; cv=none; b=rBZmel/eSvcQCYQFCXSzGp3GVRR0MULV6nuMzIzgk3z5DfzGX4/T54OZMxr0ZF7gz7oLGg 3IP4G8/ySnmJDhsG5/vRtOaP2I0Be+f+sNd/nGgv9hznXUrMwt48O5shxzKyygJnAw/fGh JGmgurgiTTSPsWeufm4NmM/XY2mJu6bvzrGecGjKfFiUZTcfZyg5POvQCgy2OX2yfnFn5R ywosq0gl5w88ltWShTx0VkT9L/xvMozPO8ZMLeehCdVvYHE6+hEXNPGZDKYGQkNL/0qCQW IDkHQWlJPjU7OnGA+uYJibakRYfNw3MlS29oF3yohbZeN6OCGdY+8YDuQL4B/Q== 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 4Yp9TT3hfBz14vc; Wed, 05 Feb 2025 19:36:29 +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 515JaTQw049382; Wed, 5 Feb 2025 19:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JaTsT049379; Wed, 5 Feb 2025 19:36:29 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:36:29 GMT Message-Id: <202502051936.515JaTsT049379@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: 8ed1a0c91195 - stable/14 - TCP BBR: remove assignments without effect 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: 8ed1a0c911955bf9b589a07c3395f70df7d83fe9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ed1a0c911955bf9b589a07c3395f70df7d83fe9 commit 8ed1a0c911955bf9b589a07c3395f70df7d83fe9 Author: Michael Tuexen AuthorDate: 2024-12-30 14:57:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:36:39 +0000 TCP BBR: remove assignments without effect No functional change intended. Reviewed by: rrs CID: 1523772 CID: 1523777 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48215 (cherry picked from commit 895347fc10c5b06bddadcc2937fdcf298c7e1114) --- sys/netinet/tcp_stacks/bbr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 2c737360cbe4..eb4fd75bac3a 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -7313,11 +7313,9 @@ bbr_log_ack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th, p_maxseg = min(bbr->r_ctl.rc_pace_max_segs, maxseg); th_ack = th->th_ack; if (SEQ_GT(th_ack, tp->snd_una)) { - acked = th_ack - tp->snd_una; bbr_log_progress_event(bbr, tp, ticks, PROGRESS_UPDATE, __LINE__); bbr->rc_tp->t_acktime = ticks; - } else - acked = 0; + } if (SEQ_LEQ(th_ack, tp->snd_una)) { /* Only sent here for sack processing */ goto proc_sack;