The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=dc784287967d45ab681dc51e9e20b78c8c535834
commit dc784287967d45ab681dc51e9e20b78c8c535834
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2021-05-18 16:22:13 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2021-05-20 12:06:23 +0000
pfctl: Ensure parent queue is configured for FAIRQ
We failed to account for the FAIRQ scheduler in expand_altq(), which led
it to be set up without its parent queue.
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D30347
---
sbin/pfctl/parse.y | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 6acfefbf5ad3..4448a8255ce1 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -5107,7 +5107,8 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
}
if (pa.scheduler == ALTQT_CBQ ||
- pa.scheduler == ALTQT_HFSC) {
+ pa.scheduler == ALTQT_HFSC ||
+ pa.scheduler == ALTQT_FAIRQ) {
/* now create a root queue */
memset(&pb, 0, sizeof(struct pf_altq));
if (strlcpy(qname, "root_", sizeof(qname)) >=
@@ -5138,7 +5139,8 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
if (n == NULL)
err(1, "expand_altq: calloc");
if (pa.scheduler == ALTQT_CBQ ||
- pa.scheduler == ALTQT_HFSC)
+ pa.scheduler == ALTQT_HFSC ||
+ pa.scheduler == ALTQT_FAIRQ)
if (strlcpy(n->parent, qname,
sizeof(n->parent)) >=
sizeof(n->parent))
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
