From nobody Tue Sep 6 05:42:36 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 4MMDms2Q0Zz4cBLX; Tue, 6 Sep 2022 05:42:37 +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 4MMDms1Zk5z3DyS; Tue, 6 Sep 2022 05:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662442957; 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=/XC6/Oy6mKky5MRwzWqP+a59umrbezBmV72as2q4N1k=; b=v1yvkPFpPHQ9nzDQl2HbUL19vnELpEenvtXiVzdcRH6lBbyh08KpXOV19MujFYpGVmmhAk /vhHmxjcnaN6xQcOaMTBvDJgumruXZCtG3QgcwCQ5EsBgg33E74Er4oiIUu4tNl78QUg9X LmXVLHKWeMFv2LC9s5E1ECVvBE0+ya23R/rO2QsqMFyHTuCv1K9eTTEZChXPMenJL2zWjQ 4zbSgbHESjcjOQ5oIxEgaQgs15gl2oc8pkB5+T18+IJfXQPNrXWpjR0yktDXireLB38EMo RJppbzGZTwDXPfy5t+WA784aQw+USPLenUzEA6Phj2TcPmyhsLSJK69LfgkOJg== 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 4MMDms0f6mz14ND; Tue, 6 Sep 2022 05:42:37 +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 2865ga0J013644; Tue, 6 Sep 2022 05:42:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2865gaUt013643; Tue, 6 Sep 2022 05:42:36 GMT (envelope-from git) Date: Tue, 6 Sep 2022 05:42:36 GMT Message-Id: <202209060542.2865gaUt013643@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: c84d562c3867 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c84d562c3867b186009f1302865d6623d44c48cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662442957; 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=/XC6/Oy6mKky5MRwzWqP+a59umrbezBmV72as2q4N1k=; b=NuZTNS+vntYRY5l6WDjWDhsXTvwU5iNo4SYayElyg+4Gf3fahDFP3C7hOvRL2cfcWgWlN7 Xj5eRusziLZ2Ju4de17LBwYUkt6tJ4qPoeyL45zIK4lV6bEa8V0u202gE3Nt9MoQW0O5Xq 8ausF9d70jKZ4zYtO8nsXHD7pdaWbEvrt6Pl2Z6YeqwvS29rPATHftO9moiXJ+lqmdPEVC lj4OpZ5hvDQu5nDCV93X4ZfJyzdGFzBzeaikdxpuFynNP7pKhu7RCCYBjf6jIbLbn9EoaV 1fACxAUvB2c9I20lzZt9kj7RZBHMHfgoRBQw1X8iQ2QyKkyEQ1R657DGS5+A6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662442957; a=rsa-sha256; cv=none; b=dWieaxn1+yWuESeAIm8QHudyxVpCQfqLXcbVy0icK1/viNYmLMJFWszBoEVufh576ncFkI 6jAmP7JzmJ0S0E3G2vR01d5/SWLsF/J9xq4BcvM1Niu2q6xS5qJIUPxSc6PVHMPpMcWxva /SWRmBtqHDqa2gNqD3kNZQdsNnhmthUZ2CplqfKfFlXsptZaeXcKJT2wCKCMprtDRkO1jR QkZfdUzspsEUlIFF5bCpKBFIsHOoYA/Yg8TzpDNGfSkxGdq2fuEAwWN1lIMXW+EVVkwbJN DxGzwarwSwu67l+cybcvp3o4OYJfIlaFoU8ZieFVmcko/ir9vKquiWZVMTT+HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=c84d562c3867b186009f1302865d6623d44c48cc commit c84d562c3867b186009f1302865d6623d44c48cc Author: Gordon Bergling AuthorDate: 2022-09-03 17:18:54 +0000 Commit: Gordon Bergling CommitDate: 2022-09-06 05:39:25 +0000 netpfil: Fix a typo in a source code comment - s/intergers/integers/ While here, fix some whitespace issues. --- 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 79c6afd8b635..13d46137a620 100644 --- a/sys/netpfil/ipfw/dn_aqm_codel.c +++ b/sys/netpfil/ipfw/dn_aqm_codel.c @@ -139,7 +139,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) { @@ -156,10 +156,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 */ @@ -167,14 +167,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;