From nobody Fri Apr 1 12:37:32 2022 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 363A01A3CD17; Fri, 1 Apr 2022 12:37:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KVKSY129Tz4Ztm; Fri, 1 Apr 2022 12:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648816653; 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=a72SBqrMFgbjcuoXTXNmuKtnHHvWC0DDLk1RRa9Pv6w=; b=o4ee2jcwafFu6+mNC+t6kfg1n7IZ2rcfLBUOp31nybQRbo38zeN6CJZcgNv4BiHKWXByIz Mh4zbqUzXxLZJTFe/W+xmpXWzGJyP2BySIb+dysOJHMCUUg3VzbUfS7jP3bosKxIogaury CO1OeEVEbIMuzu36Z0Y49Fb3KwH2CKGHKdSGXlSyQdXnetsa6p9oPOFsDWVq+36eLYF1BZ 0YG31HsEdETlfBZy9mTb85UOKx36afIHmnR5L5IpXYUHkA1H9QfLOhUc2IXvjCRnfBrb5f opWOcuzvFM2zbO3rA9Fuk5YG1l1V1ZCSvRTbipFjam7IzwljRa3itucqM/Rtig== 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 F21EB146E6; Fri, 1 Apr 2022 12:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 231CbWpE060826; Fri, 1 Apr 2022 12:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231CbWgv060825; Fri, 1 Apr 2022 12:37:32 GMT (envelope-from git) Date: Fri, 1 Apr 2022 12:37:32 GMT Message-Id: <202204011237.231CbWgv060825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: e88412d89b4e - main - Opps sorry, typo in the cc_cubic fix when morphing it from nreno. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e88412d89b4e94d2095fc5615b877a4fdd8f2af2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648816653; 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=a72SBqrMFgbjcuoXTXNmuKtnHHvWC0DDLk1RRa9Pv6w=; b=mllNmDA/7Zd8UnYLuvc2wOqjViiz/0W/asMTfEtNuUkDojUU8No6b5cvD/VNXbrO0XH/wm +GnONPSEzLTxQld3b9KMbXGJdXkwJLL++ekBMc9UfQm4/T2Uw9qxqyA7uAc3JbvQj2wXzk hKHo7DaJjeulX4D7u8DOsEzNf4WwhwDhyiYV+sIp4Ned7MZVKr693LSJ4jMC9vYjsOOWJ3 N2k5pEN9GyiVfKN6fGNOX0n4iNNnSP+oWcRZU/U9+O+wC+S49UpH1vXYW/VkGJ9p/qX4Qu 2hv55FSMb6QBQEfiXK8NcNEPrCNi/fSylhcoEdXoyOU7vUZu4IjqSidA6W2bSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648816653; a=rsa-sha256; cv=none; b=luDKSLBpORnLRx7K727cnKvdXqS20X+3ggvYHnaEczlA+xNAJxrc4p/j1NFMQpBcLYk36M yPdrebu5wq7i0kKR8Ir24boAd/gWlHJbeh60YX0o2pUUQ+kOrOu3MNzT+Zx8PXlgIt+1Az ADI/GBdwP3nTctEsQHAMCk1bEa9ksOExJk2+CIs02cl8gA+S9cl/ugBWJf+FZexSx7ny01 VwM/UlZ5VmIc/SdtAZ0p9+96JQzUBPF63DjtHVZdKvPp96vYppRjedU9fLdoWFWSHUfMJy OrVISpGG/B/6HkLz9dwqPJHN+4EqJmy/X7vRI+d16ghG4pt2BuE+JEmogr15qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=e88412d89b4e94d2095fc5615b877a4fdd8f2af2 commit e88412d89b4e94d2095fc5615b877a4fdd8f2af2 Author: Randall Stewart AuthorDate: 2022-04-01 12:37:04 +0000 Commit: Randall Stewart CommitDate: 2022-04-01 12:37:04 +0000 Opps sorry, typo in the cc_cubic fix when morphing it from nreno. --- sys/netinet/cc/cc_cubic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 0291776928d4..1f387df29bde 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -658,7 +658,7 @@ cubic_rttsample(struct cc_var *ccv, uint32_t usec_rtt, uint32_t rxtcnt, uint32_t } if ((cubicd->css_rttsample_count >= hystart_n_rttsamples) && (cubicd->css_current_round_minrtt != 0xffffffff) && - (cubicd->css_current_round_minrtt < nreno->css_baseline_minrtt) && + (cubicd->css_current_round_minrtt < cubicd->css_baseline_minrtt) && (cubicd->css_lastround_minrtt != 0xffffffff)) { /* * We were in CSS and the RTT is now less, we