From nobody Sat Apr 9 06:33:52 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 CD8371AAAE1A; Sat, 9 Apr 2022 06:33:53 +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 4Kb51F1jdPz4v2R; Sat, 9 Apr 2022 06:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649486033; 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=sYFczC8tM/0921elllJQei4+YOlrHUs0wN0phxxHsPY=; b=aAg9Ru5q1LM1OQpJzFGQI238n6NaHpgVE3mr52n+Z/oqCQasrshYF/emgX5KqETtJ1r9h0 E2mA8UIE7wLkvJ7QfE5S5YQ830Qo7kux2QYsaJ7WvPBj35ah2LoOxZQ/BAUdvkEIwArmV5 aAm8iyyNVsQydyCFHsUt21IkmPx9UY7qdUCkbAakrr072aNJ+ZJRcxUprRV4r5SScjTg/m 5oIr2CefvLsOl5sHgtZukQ9he4yxOp+74bTb07nzVUK/LViDSMVEILIaEnRgwNIUUg2R2Y 7PUAanF8Z8OQ27pnnrzczyKYv6CmCb928+h0V3Rhsnvmau4ORhW9iXQVm3d9QA== 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 5E45614AC5; Sat, 9 Apr 2022 06:33:52 +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 2396Xqk7062520; Sat, 9 Apr 2022 06:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2396XqBd062519; Sat, 9 Apr 2022 06:33:52 GMT (envelope-from git) Date: Sat, 9 Apr 2022 06:33:52 GMT Message-Id: <202204090633.2396XqBd062519@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: fe0ca2ad6f5b - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: fe0ca2ad6f5b3315399918e16c6e95ca519b7d6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649486033; 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=sYFczC8tM/0921elllJQei4+YOlrHUs0wN0phxxHsPY=; b=oYAI3sVSMC0+sG7lgnB/2rrQCxJhpp4tM+zLdDRJ4yWxOPTHP01J/YokIVcWpXrWeEH/1H Tyq2TB5E6Z9ZmMqR4FSQ5gRFqy0XA29lEHHvg9hnqJV62LGKpx8MRkIsSShHiSKYrNwMw2 H5fgCHPeWN8pbR3rJqeR+d4QiWgzvAe0uQb9/jM7d3DZ3FEu79Rw3CpY96ydCasc9DYC4O OhoKtN5J37nDsM+/aS7o2YY4YRQG98sdHQ2CniDL6aUwYr9I0j1SpKD08vNBke8no31Bbb YsoGE1ICM8XFx6qkMEon8/CGdUci/T/sPvxOQKVp7ramdlizoAeBWm7W55TP+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649486033; a=rsa-sha256; cv=none; b=Wl5oZRPWEtN1tX5bIZ0fSdyokEbNbzRA1EpnLRt1JhyrKHDwPYSMHn4Wc8tvGpWX6BXO1p W9+dVnYGatk+xQT+BIqMXNJeYEfFRcJCl1zLon8ZVNVPXmhyg1yLduzzMj+UcwRGROJIQs PdbbtwAz8iJRbcV91iIzgzt2j29DRH9J9TFGmDslZx5KEy+adx9/lAMgapNMgrH3dP5TTt ghVBQbGeQZS7v0Jg9Li+V0raL7JaIVWRHiMxRUGrjBqYa41CB5N3JxPYskYm9HJlKjOlmt Nkl73EO4Ml6sj6hiBCXtV6FdrAd96AHXym2zUjk5uXffZdoTlWB1blP5Pdw60w== 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=fe0ca2ad6f5b3315399918e16c6e95ca519b7d6c commit fe0ca2ad6f5b3315399918e16c6e95ca519b7d6c Author: Gordon Bergling AuthorDate: 2022-04-02 12:18:11 +0000 Commit: Gordon Bergling CommitDate: 2022-04-09 06:29:22 +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 3b2fd8b96f0d..d3ab2891354e 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 07da51793a52..cf6b3a64e28a 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_pie.c +++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c @@ -649,10 +649,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 @@ -662,11 +662,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; @@ -677,7 +677,7 @@ pie_dequeue(struct fq_pie_flow *q, struct fq_pie_si *si) else pst->current_qdelay = now - pkt_ts; - return m; + return m; }