From nobody Wed Feb 12 22:50:04 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 4YtYRc2DWQz5nTGj; Wed, 12 Feb 2025 22:50:04 +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 4YtYRc1mB1z3wYv; Wed, 12 Feb 2025 22:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739400604; 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=W32Z5+NWSYNmtEp6OtFx3jbxdqbYV7J2K4gtJgxkgzs=; b=cwirfNFhUwB4Z7XYPvy5gdi1n2HHvV5/mbJeTVABkeeiTQIe4wBdNOGBK+fEq+z5VmlwbU WFfqsE45sGTvg/k0xipkj9qw9DLpI/+TJlv9LQObhZKpMNPs7H0o8q0f3gfGFB7M8jxNep Sf2isbbSgZx3mBbvi/fe5ndQ/0yB6YtqaOe9MHBiFhbI4z33rDGrQ8g/P28Mu1T2gk/S1m e1ppYyOsJAzB5r62QJoyKi94csQKIT0NLpH2HKJRJ6HrmdSJ1DVGHLjsPHsfGdiQcn8X1p rUDQosrGEyDv2bxslgn0/gjnZ9+T8t/3mFYQ9ncu2UtX+Z8tlq7HVb84vgtXRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739400604; 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=W32Z5+NWSYNmtEp6OtFx3jbxdqbYV7J2K4gtJgxkgzs=; b=QhYmc8syHrhE6r+RjhumYQ+y5i46HAk1th2Y5w50oN2OdUP9nj8DstFMW3O59eKW1LGOk/ WMUiyj9fxIT/jZoDds2S9ETm8+1t3YlJ5oCy8nBmwBpJYlHPG3Rx+z5/uxvlpE12xYnwa2 QG3EAMyVWkmNNIH6Qs+f/4jd0rs3wj3GhzHZiBxy6iATKN9O/FnA2QJDZ3bGBtaOZRuzy+ WIcjtm3k57NOVYwhWHvK6XIyJ/7GGWaBrl4YGHfYaDZEolPK7ZQt0hGul5kzB72BgPOBOs chvg0hHfVH09oScOz0c05Hxch+B2rUdkEeYWZKhurDseOKbCeBkwxdnlxbIcPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739400604; a=rsa-sha256; cv=none; b=w4QF5YjRCFgeLjhYs8I8AJQahS5pu3A/8yqpiN9xyNuOH6LhiNizTyCf2MlUAdW5QjkHzT Cq7/xFysOaToTcOk5l7NBY9GSbtF9JYeiESp98Jm+tpjrgL0JiUsanxhfiibJg+r4Uty1e WLUsqW9zvupWMyqsFmVfdGAmefDTB6A/uUtoK4J6tHlHf7z86rNR7Qhb30/A+4vdOakuaM 3rk8QQyCBM/27Js99ZpRSf5r4AqFA845KiuPmfRywDh8BbyRqjUuIx4IqOWvM3TGMKPSm6 Ai6hb16wWCeu4qzIhoBy94I3KptqYTiPjEkfyXmXzdwRdkXb7XBw/UiFkEQYjA== 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 4YtYRc1Fd3z3RV; Wed, 12 Feb 2025 22:50:04 +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 51CMo4oY019275; Wed, 12 Feb 2025 22:50:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CMo4ps019270; Wed, 12 Feb 2025 22:50:04 GMT (envelope-from git) Date: Wed, 12 Feb 2025 22:50:04 GMT Message-Id: <202502122250.51CMo4ps019270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 6156da866e7d - main - cc_cubic: remove redundant calls of tcp_fixed_maxseg() 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: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6156da866e7db8dab36b96ac4f4e38f75e41200d Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=6156da866e7db8dab36b96ac4f4e38f75e41200d commit 6156da866e7db8dab36b96ac4f4e38f75e41200d Author: Cheng Cui AuthorDate: 2025-02-12 16:41:08 +0000 Commit: Cheng Cui CommitDate: 2025-02-12 22:49:21 +0000 cc_cubic: remove redundant calls of tcp_fixed_maxseg() Summary: No functional change intended. Reviewed by: rscheff, tuexen Subscribers: imp, melifaro, glebius Differential Revision: https://reviews.freebsd.org/D48967 --- sys/netinet/cc/cc_cubic.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 3b134082a59b..ae1561ca54c3 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -298,7 +298,7 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) W_cubic = cubic_cwnd(usecs_since_epoch + cubic_data->mean_rtt_usecs, cubic_data->W_max, - tcp_fixed_maxseg(ccv->tp), + mss, cubic_data->K); if (W_cubic < W_est) { @@ -328,8 +328,7 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) if (((cubic_data->flags & CUBICFLAG_CONG_EVENT) == 0) && cubic_data->W_max < CCV(ccv, snd_cwnd)) { cubic_data->W_max = CCV(ccv, snd_cwnd); - cubic_data->K = cubic_k(cubic_data->W_max / - tcp_fixed_maxseg(ccv->tp)); + cubic_data->K = cubic_k(cubic_data->W_max / mss); } } } else if (type == CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) &&