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 <g...@freebsd.org>
AuthorDate: 2022-04-02 12:18:11 +0000
Commit: Gordon Bergling <g...@freebsd.org>
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;
}
/*
