Date: Sat, 2 Apr 2022 12:19:10 GMT From: Gordon Bergling <gbe@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f70fc4377f26 - main - netpfil: Fix two typo in source code comments Message-ID: <202204021219.232CJAbJ090281@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=f70fc4377f26f66ff3c125dbf7b6fa8b4698ed8d commit f70fc4377f26f66ff3c125dbf7b6fa8b4698ed8d Author: Gordon Bergling <gbe@FreeBSD.org> AuthorDate: 2022-04-02 12:18:11 +0000 Commit: Gordon Bergling <gbe@FreeBSD.org> CommitDate: 2022-04-02 12:18:11 +0000 netpfil: Fix two typo in source code comments - s/measurment/measurement/ While here, also fix some whitespace issues. MFC after: 3 days --- 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 5079118a7f35..5c97568b751e 100644 --- a/sys/netpfil/ipfw/dn_aqm_pie.c +++ b/sys/netpfil/ipfw/dn_aqm_pie.c @@ -441,10 +441,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 @@ -454,11 +454,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; @@ -469,7 +469,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 7765cbd15788..f6bb4b6fe6de 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; } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204021219.232CJAbJ090281>