From nobody Wed Feb 05 19:37:19 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 4Yp9VR3Bz7z5mGhr; Wed, 05 Feb 2025 19:37: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 4Yp9VR2VPBz3qHw; Wed, 05 Feb 2025 19:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784239; 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=+W9ARJSdMuW1/0To4oMbM5A7lSPDGqhUgvpVwzcJU4w=; b=wKzQ253cfsHedWik3lgSVyWq7OjPGAg+FKzu8IqtS6GQJgV51crBLdDduKwj1rBf1nWADm RVEmvvWUu4h/hA1B3ov46FtSBE0s757gBBGlmQOc0zqbLPB1VQtptMBBVmf2w/Vp/BZTKb qCiLd6kjvmyz0NuSpMgIR+EHZwpso6Zuqddsl2UX935dpwMTilXUtwM2/n0v3WY6GWeDVL Gi1TBcglSKa8LbGtqk7F8UkN2aM/jTTOXqfnrSZVAb7vG/YXnh2pLREPxN59OW3GBU0Pkl +sBW1qsk7fJfUJ4Zy3GwUelolf30wesXvHS9By3ZJSYq69CW3gNUNNAovu0I5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784239; 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=+W9ARJSdMuW1/0To4oMbM5A7lSPDGqhUgvpVwzcJU4w=; b=hODSqK3ZTGjc1xw+jOM6C73QEbPfQwr67owAVC6SRzzqdT2qyeSyDmDAA/sGdj6FWAAmuX Dygq0HCj+fR+yL2SIICEroNZSBjaI2JKHbZR25sUTBvV++3xsiNcO4vHuRF5+1knWf1fgQ SVs5x1ZU1FJPZ4FaQyPiQGocRnszYKJb+CgC1w4cq0nLTKMkqm+5FKY52PoN7ltsDC+YLp pkeVajLB2oW7WU0enMvcjo93fm25UXeO5LvVJuJMDUL3TdERlOAYTsNrK5VUQbivjJiObE ceSdkjVzT25giUv9wYS3xk8KPRH1MSeboCrtHN+E7AoiPm6Zc9Xc/D186eT8mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784239; a=rsa-sha256; cv=none; b=Tw2f8pY+6T3psKcHCNK0CRFv4ehEOvMipA8nVCCXxSfE/Wk/GdP/4ek2zntFkNPXzGUrVl s5h2dREePx222ur2yPStRcnuTt9Icy7qlZFC3GbINhIIldUkjAwZPiIIXLnd2yBtFjBJ58 ekTWCYDlXHvM80KJIzt1Tv2pym2sFaQ8gO4l5JwVBXGNpJGnULXkXEPBXP77T4sPWzl9M1 riGtuJFZ/XoYFr7V1eABIsac9o+71UN1bUs0nXHIi/nHY3SYCHFHpgKAxxefVREfXp/x0R M2ydjSlydYmGlE5V6RRhSZ+BM001BQxvhgYNk0NXKyww7rNHKvhEBZuzl1jVeg== 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 4Yp9VR1yCJz15NK; Wed, 05 Feb 2025 19:37: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 515JbJ4k049758; Wed, 5 Feb 2025 19:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JbJGI049755; Wed, 5 Feb 2025 19:37:19 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:37:19 GMT Message-Id: <202502051937.515JbJGI049755@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: ac863fd8298c - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: ac863fd8298cc1d58a88c0a668845b2c87c140b8 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ac863fd8298cc1d58a88c0a668845b2c87c140b8 commit ac863fd8298cc1d58a88c0a668845b2c87c140b8 Author: Michael Tuexen AuthorDate: 2024-12-30 14:57:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 19:22:20 +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 5ebf82eb97d9..7faeadabf203 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -7358,11 +7358,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;