From nobody Tue Sep 06 05:48:14 2022 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 4MMDvL6vyHz4cBtM; Tue, 6 Sep 2022 05:48:14 +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 4MMDvL6GyQz3MqW; Tue, 6 Sep 2022 05:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662443294; 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=t2YxtJzknUeexvKNQmL3QD/WHiQKWOJ/KsNKlz92C8M=; b=wKFkxAtpH3nCb8hXDOJhpOG8AsrVx9ssT97/IurJBGa5nfDr+Xc5zi27pLXrXSfwV9q7/C 1PSIbA9z67sGKACi+AmYPZVJLKAh59UD1BhJq4J+2/kNC0JQNDTafhIGNF3BaMtlBJ/uwg JKwzvEZTcO1pw2MpVVhfMF0x2bS5r+Lrz9P4nav9O0thra/OPS/CoC8bwUjwiPbZSeNCHV /jPc6ZzfiF+kRwc/FOnpgjli1q1F959Pq6gXeY1w5+1A1wgjrWaQxixa8Vv4RY6Vqdt+RM +LwVVFTAXwNJDR/z15RVKzs77PVp4T/fPRo6csOBgWTe4XNcPOA/KgIwsVJGmA== 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 4MMDvL5BLBz14Kw; Tue, 6 Sep 2022 05:48:14 +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 2865mEJl015173; Tue, 6 Sep 2022 05:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2865mEQu015172; Tue, 6 Sep 2022 05:48:14 GMT (envelope-from git) Date: Tue, 6 Sep 2022 05:48:14 GMT Message-Id: <202209060548.2865mEQu015172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 43ed131b802c - stable/12 - netpfil: Fix a typo in a source code comment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 43ed131b802c77744cbe91b70018b9637d53e560 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662443294; 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=t2YxtJzknUeexvKNQmL3QD/WHiQKWOJ/KsNKlz92C8M=; b=Gqt7vVB/2SoqmMfV+dSmw3VLj19wT5yDNFVAQe2v9bKtql8QC7B6/jK5+Eo7t7m32XmwUo X9qdtQ+u1c9M78nXOGF23Cdn/uwjVlrD1wOIG7V41BnYgCExhTZSttvq9SBpRVywWwbRz1 gUzB0axVoNurGzXh2eDXnOt29BV1NIus0/DEh8jfGgkdZjwUspWjZ8PEXOSPrX/xYqx4Ls D8KqIv/8X6knLaMIhjpxTdeDhQtzX7gvMO9IKraIt3T1OdZ6BVg9bBY7UHQAHWvBYKSwph 8PkSM2057MvSX/xWqO7avLQQ3tn8jbNuid63Y+16iqseGOaOQEF9ameZ4Sos6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662443294; a=rsa-sha256; cv=none; b=LXtO65JVYtmwy6X1KuiVnHQh8lIflxtuxXV8PTss2uwEaraa628jmqyZrFM3Jn7CrGBDdg 6eITZgB5XIQO+QX8+R2LSd6Sip+T4oC8uCLODmj/R7aYZJ6Vmdwador9zy7BD7QHOwgqFy +Sn/f7Y6EKm9DEWmqNWv1Ver5VvbGN3B5hQOo4wK4QaZ3pzpkT8KIJm9AbHpLnQIIrIUum y12xKkQ52l4L2cfnwNxZObDaxi2/jv00UmvPMQrTLRvXMDeHDxVf5XIQqqzw4BBhUGYE9T 5c08Jqx1N7B3Q2Ug+hx+UwiHbWPRzb1KsN2zvlh1za/bqQue7cWhJTA9A1ayaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=43ed131b802c77744cbe91b70018b9637d53e560 commit 43ed131b802c77744cbe91b70018b9637d53e560 Author: Gordon Bergling AuthorDate: 2022-09-03 17:18:54 +0000 Commit: Gordon Bergling CommitDate: 2022-09-06 05:45:49 +0000 netpfil: Fix a typo in a source code comment - s/intergers/integers/ While here, fix some whitespace issues. (cherry picked from commit fd2235ffdca586a007667c3be8c1ed2944e4fe3a) --- sys/netpfil/ipfw/dn_aqm_codel.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/ipfw/dn_aqm_codel.c b/sys/netpfil/ipfw/dn_aqm_codel.c index 47ed971c6ba5..d8a322ff115a 100644 --- a/sys/netpfil/ipfw/dn_aqm_codel.c +++ b/sys/netpfil/ipfw/dn_aqm_codel.c @@ -136,7 +136,7 @@ SYSCTL_PROC(_net_inet_ip_dummynet_codel, OID_AUTO, interval, * http://betterexplained.com/articles/ * understanding-quakes-fast-inverse-square-root/ */ -aqm_time_t +aqm_time_t control_law(struct codel_status *cst, struct dn_aqm_codel_parms *cprms, aqm_time_t t) { @@ -153,10 +153,10 @@ control_law(struct codel_status *cst, struct dn_aqm_codel_parms *cprms, } /* newguess = g(1.5 - 0.5*c*g^2) - * Multiplying both sides by 2 to make all the constants intergers + * Multiplying both sides by 2 to make all the constants integers * newguess * 2 = g(3 - c*g^2) g=old guess, c=count * So, newguess = newguess /2 - * Fixed point operations are used here. + * Fixed point operations are used here. */ /* Calculate g^2 */ @@ -164,14 +164,14 @@ control_law(struct codel_status *cst, struct dn_aqm_codel_parms *cprms, /* Calculate (3 - c*g^2) i.e. (3 - c * temp) */ temp = (3ULL<< (FIX_POINT_BITS*2)) - (count * temp); - /* - * Divide by 2 because we multiplied the original equation by two - * Also, we shift the result by 8 bits to prevent overflow. + /* + * Divide by 2 because we multiplied the original equation by two + * Also, we shift the result by 8 bits to prevent overflow. * */ - temp >>= (1 + 8); + temp >>= (1 + 8); /* Now, temp = (1.5 - 0.5*c*g^2) - * Calculate g (1.5 - 0.5*c*g^2) i.e. g * temp + * Calculate g (1.5 - 0.5*c*g^2) i.e. g * temp */ temp = (cst->isqrt * temp) >> (FIX_POINT_BITS + FIX_POINT_BITS - 8); cst->isqrt = temp;