From nobody Sat Sep 03 17:19:11 2022 X-Original-To: dev-commits-src-all@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 4MKhMz4CWVz4bxYN; Sat, 3 Sep 2022 17:19:11 +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 4MKhMz3jLtz3pD2; Sat, 3 Sep 2022 17:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662225551; 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=G8qm/4kE/fZPtI9YinD2TFQT5yCK8Id5f0+GnUrRTCI=; b=o2yNvzyHi+CO17Gmm/UxbEqlxB1n94gZPM2jali36a7E3qNb6C5uhOaXqlL/GAs+ni2aPD +UufQm5H+ss0yocs1hWV0hYEV/3yNxVOmKXPkD/mh6XpF8Zq/xyFJShiuPs2CAeNgPvjN0 VybdAZRc9fEIpNn6dPuYiL/ZOn78sZ1YcA4cUEgA8FwSD/Gz4QsCIFezt+Iv/9bOVyKW2d K12LURGKu7aF3r2lLbHKD6wQ+dr/nTXYoFjKiC6FFyZcV3DxejP9Gy7uZnnhWguWWJ59wr 0TpeZOCx/+5cuTLqRWlBDvkFDT0Egl7x7Wo5i3Km284xIAWnXg4wKXuhFjvThw== 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 4MKhMz2ZFPz1CDh; Sat, 3 Sep 2022 17:19:11 +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 283HJBli085859; Sat, 3 Sep 2022 17:19:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 283HJBUB085858; Sat, 3 Sep 2022 17:19:11 GMT (envelope-from git) Date: Sat, 3 Sep 2022 17:19:11 GMT Message-Id: <202209031719.283HJBUB085858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fd2235ffdca5 - main - netpfil: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fd2235ffdca586a007667c3be8c1ed2944e4fe3a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662225551; 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=G8qm/4kE/fZPtI9YinD2TFQT5yCK8Id5f0+GnUrRTCI=; b=eUWqCeaJKR5k6/XfOOZ5kSxVHqJucJy/i3oFPStjscRaRTHoBrapykg5rW7mwBlvYt6i8B 7KmAydv9wUl5h8k5Op00yBj2QKsSLaXp3vC4/nyqvtJLFm7snL/kWlGtDKT8gNQeme9lG1 t4fV51+3tQKXVG6NESh2HCRntjs9i/x31/kd/FgJqvakRzw6xjAGfpAMNgC9qIU+apS9Ir yEfwUCNk5yfBlWajOAPAkFGPNmkJYGcpqCwdBefOlM6mwMNVpbvp02X10wDSJegOY8NeT2 KMPtWUaFI/Vcbi3z7TwiDxNx6oj2wypGXBxzIo0oBiBIBxsQVR2bz3/YaYIj9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662225551; a=rsa-sha256; cv=none; b=ANC1nlg9Jwdr6GKk3zmWbAVD7KexQZunLSb1BWK06TQUFJQePrvAjnnJ3KYrBPzgPChpcR LXGqTIpmjAzvb9nvbsaP8Umh2Fi/mVYAVyocyu5EUoacRv5uKf6cyvqSlh4EGo19izhH/P +BW9n6LFT1EtCwv5DOuBGq9ZMp7hYWIQEHLadET7LOGyiSywjkRT0zqXe001AE5KS2RNw5 FZ40NW5UEcT2YncQzEkR46ssPQVW4l/HG6mSY3Tyyc2FjT9aeHpyU1ndaHaleEHAPPJlsl eABPRpCMJzWKWIv1vdaDZy3a+skewt5agvEIYPUIS11J5cjx0yZGN0CuXrnwTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=fd2235ffdca586a007667c3be8c1ed2944e4fe3a commit fd2235ffdca586a007667c3be8c1ed2944e4fe3a Author: Gordon Bergling AuthorDate: 2022-09-03 17:18:54 +0000 Commit: Gordon Bergling CommitDate: 2022-09-03 17:18:54 +0000 netpfil: Fix a typo in a source code comment - s/intergers/integers/ While here, fix some whitespace issues. MFC after: 3 days --- 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 2f6d145485c6..667d32a70aae 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;