From nobody Sat Apr 09 06:14:45 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 B4D671A947D2; Sat, 9 Apr 2022 06:14:46 +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 4Kb4b96ZPMz4dVt; Sat, 9 Apr 2022 06:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649484886; 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=Fa3me6+a4Ltp2X+obTQAE5QbcTJ8V4ev2D89SWpadMQ=; b=CD70IfFvRdWrDiN6ZN9clDBBRiki6KhLOlUW7vXUyrkTa2Nz3ogenPrT7/TCWnwL1fDsq/ ny15sTBzHUPScYffULtLr5yhrHIyMmgF12U+Aq679SUWqTXHujXSXImONn8Om83yYA+qsa 3u3z3znym1H8BiW8LDH3zuiw3VXAMpP7akiEunw9F/8hY3WY5KSLrWwqrMJ3g9ad/uRWpf 4VbpelmMePZm4MYHoQGpmF9FLO+pynkmeunnt4Y2wqUgigU/Jb1md9XH4EZRwgCyMxnfIZ DhB0jsCejuRK8wQEghhmqYvSoUfOorV7o4fDxWuRbd2uV0EGzzy6hY3lcs4slw== 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 7FF1C14BEC; Sat, 9 Apr 2022 06:14:45 +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 2396EjtF034044; Sat, 9 Apr 2022 06:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2396EjU3034043; Sat, 9 Apr 2022 06:14:45 GMT (envelope-from git) Date: Sat, 9 Apr 2022 06:14:45 GMT Message-Id: <202204090614.2396EjU3034043@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: 28c10720ed79 - stable/13 - netpfil: Fix two typo in source code comments 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: 28c10720ed79ae78c485900587275eb7fa9c3230 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649484886; 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=Fa3me6+a4Ltp2X+obTQAE5QbcTJ8V4ev2D89SWpadMQ=; b=sUy4DuWPld3p4dbe9TW0r7PLmhQmuNpp9tvRrrqTO5PmvWzqkLvWYH/2fDYLDSJejgCB04 Zl4HXHhAoY4Ss7LbCGPhgq5rEYTQ5cML0uGnkPUjEexL1n2td2o80pczV+ZZrCHsrNQq6O m2nrX1WuxdsD6MxkUUUiRnt8k3Cv0AaD8nfOC0BLV+S2Pply0CVOZa+DgkKGDi9cpCngsY 1fjS2GhSOC3Qblw9WKekR1kPw9G4mPp0fFx3QsfJdZZSdR0TUxniE4BWn5IKYTgc1N+4l/ LsQz33t/xopJeOlJl+2qziWctdOsr7WufrJTbL6SLJDp600sZ00oBU4MOiBT4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649484886; a=rsa-sha256; cv=none; b=OY47Z+nP5mCV6jiCeHEYAR5VJeuvGOU0CqqWLUpDEyB5yYmLBIZEs/qdWvnv39KLg5lSZn /gCFMdBVZeD1Z9XCvQpX1xtloQvIDQMFZ0sevHkzG/Gmg090tPLbAeZSayQ8Z7hPqiZfq8 2f6MIURmv+B7jU+VOaQSYynRanv9cLuDqU7CzC2lUn5eegp/C7ThCHk6RzOrKsvCs1y2sl +wVNH96jn5iXfl+rHDRqob+2VMXKMbXf0u8xDCDIjdKX7HZIZgtqiWh6AuRzZMXSJVu7cx K75f8xAS8MmbYO04C7BURyBFhXyBubkn9KpoOBqGE+UORbQo2vM5idGH1Kl+Ew== 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=28c10720ed79ae78c485900587275eb7fa9c3230 commit 28c10720ed79ae78c485900587275eb7fa9c3230 Author: Gordon Bergling AuthorDate: 2022-04-02 12:18:11 +0000 Commit: Gordon Bergling CommitDate: 2022-04-09 06:08:34 +0000 netpfil: Fix two typo in source code comments - s/measurment/measurement/ While here, also fix some whitespace issues. (cherry picked from commit f70fc4377f26f66ff3c125dbf7b6fa8b4698ed8d) --- sys/netpfil/ipfw/dn_aqm_pie.c | 18 +++++++++--------- sys/netpfil/ipfw/dn_sched_fq_pie.c | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/netpfil/ipfw/dn_aqm_pie.c b/sys/netpfil/ipfw/dn_aqm_pie.c index 4a55aed662f7..d3982db5fd41 100644 --- a/sys/netpfil/ipfw/dn_aqm_pie.c +++ b/sys/netpfil/ipfw/dn_aqm_pie.c @@ -437,10 +437,10 @@ aqm_pie_dequeue(struct dn_queue *q) if(pst->avg_dq_time == 0) pst->avg_dq_time = dq_time; else { - /* - * weight = PIE_DQ_THRESHOLD/2^6, but we scaled - * weight by 2^8. Thus, scaled - * weight = PIE_DQ_THRESHOLD /2^8 + /* + * weight = PIE_DQ_THRESHOLD/2^6, but we scaled + * weight by 2^8. Thus, scaled + * weight = PIE_DQ_THRESHOLD /2^8 * */ w = PIE_DQ_THRESHOLD >> 8; pst->avg_dq_time = (dq_time* w @@ -450,11 +450,11 @@ aqm_pie_dequeue(struct dn_queue *q) } } - /* - * Start new measurment cycle when the queue has - * PIE_DQ_THRESHOLD worth of bytes. + /* + * Start new measurement cycle when the queue has + * PIE_DQ_THRESHOLD worth of bytes. */ - if(!(pst->sflags & PIE_INMEASUREMENT) && + if(!(pst->sflags & PIE_INMEASUREMENT) && q->ni.len_bytes >= PIE_DQ_THRESHOLD) { pst->sflags |= PIE_INMEASUREMENT; pst->measurement_start = now; @@ -465,7 +465,7 @@ aqm_pie_dequeue(struct dn_queue *q) else pst->current_qdelay = now - pkt_ts; - return m; + return m; } /* diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c index 76215aed610a..a7c7c287e96e 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_pie.c +++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c @@ -648,10 +648,10 @@ pie_dequeue(struct fq_pie_flow *q, struct fq_pie_si *si) if(pst->avg_dq_time == 0) pst->avg_dq_time = dq_time; else { - /* - * weight = PIE_DQ_THRESHOLD/2^6, but we scaled - * weight by 2^8. Thus, scaled - * weight = PIE_DQ_THRESHOLD /2^8 + /* + * weight = PIE_DQ_THRESHOLD/2^6, but we scaled + * weight by 2^8. Thus, scaled + * weight = PIE_DQ_THRESHOLD /2^8 * */ w = PIE_DQ_THRESHOLD >> 8; pst->avg_dq_time = (dq_time* w @@ -661,11 +661,11 @@ pie_dequeue(struct fq_pie_flow *q, struct fq_pie_si *si) } } - /* - * Start new measurment cycle when the queue has - * PIE_DQ_THRESHOLD worth of bytes. + /* + * Start new measurement cycle when the queue has + * PIE_DQ_THRESHOLD worth of bytes. */ - if(!(pst->sflags & PIE_INMEASUREMENT) && + if(!(pst->sflags & PIE_INMEASUREMENT) && q->stats.len_bytes >= PIE_DQ_THRESHOLD) { pst->sflags |= PIE_INMEASUREMENT; pst->measurement_start = now; @@ -676,7 +676,7 @@ pie_dequeue(struct fq_pie_flow *q, struct fq_pie_si *si) else pst->current_qdelay = now - pkt_ts; - return m; + return m; } /*