Module Name: src
Committed By: martin
Date: Thu Oct 3 11:56:23 UTC 2024
Modified Files:
src/sys/altq [netbsd-10]: altq_cbq.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #917):
sys/altq/altq_cbq.c: revision 1.40
sys/altq/altq_cbq.c: revision 1.41
altq, cbq: fix NSEC_TO_PSEC
Pointed out by manu@, thanks.
altq, cbq: fix default class assignment
Fix typo in v1.34.
Tested by me and manu@.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.4.1 src/sys/altq/altq_cbq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/altq/altq_cbq.c
diff -u src/sys/altq/altq_cbq.c:1.39 src/sys/altq/altq_cbq.c:1.39.4.1
--- src/sys/altq/altq_cbq.c:1.39 Fri Dec 31 20:22:48 2021
+++ src/sys/altq/altq_cbq.c Thu Oct 3 11:56:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.39 2021/12/31 20:22:48 andvar Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.39.4.1 2024/10/03 11:56:22 martin Exp $ */
/* $KAME: altq_cbq.c,v 1.21 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.39 2021/12/31 20:22:48 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.39.4.1 2024/10/03 11:56:22 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -306,7 +306,7 @@ cbq_remove_altq(struct pf_altq *a)
return (0);
}
-#define NSEC_TO_PSEC(s) ((uint64_t)(s) * 1000 * 1000)
+#define NSEC_TO_PSEC(s) ((uint64_t)(s) * 1000)
int
cbq_add_queue(struct pf_altq *a)
{
@@ -750,7 +750,7 @@ cbq_class_create(cbq_state_t *cbqp, stru
/* save the allocated class */
cbqp->cbq_class_tbl[i] = cl;
- if ((spec->flags & CBQCLF_CLASSMASK) != 0)
+ if ((spec->flags & CBQCLF_DEFCLASS) != 0)
cbqp->ifnp.default_ = cl;
if ((spec->flags & CBQCLF_CTLCLASS) != 0)
cbqp->ifnp.ctl_ = cl;
