Module Name: src
Committed By: ozaki-r
Date: Tue Jul 13 07:59:48 UTC 2021
Modified Files:
src/sys/altq: altq_rmclass.c
Log Message:
altq, cbq: don't increment the xmit counter of the root class twice wrongly
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/altq/altq_rmclass.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_rmclass.c
diff -u src/sys/altq/altq_rmclass.c:1.22 src/sys/altq/altq_rmclass.c:1.23
--- src/sys/altq/altq_rmclass.c:1.22 Sat Nov 19 22:51:18 2011
+++ src/sys/altq/altq_rmclass.c Tue Jul 13 07:59:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rmclass.c,v 1.22 2011/11/19 22:51:18 tls Exp $ */
+/* $NetBSD: altq_rmclass.c,v 1.23 2021/07/13 07:59:48 ozaki-r Exp $ */
/* $KAME: altq_rmclass.c,v 1.19 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.22 2011/11/19 22:51:18 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.23 2021/07/13 07:59:48 ozaki-r Exp $");
/* #ident "@(#)rm_class.c 1.48 97/12/05 SMI" */
@@ -1251,7 +1251,7 @@ rmc_update_class_util(struct rm_ifdat *i
{
int idle, avgidle, pktlen;
int pkt_time, tidle;
- rm_class_t *cl, *borrowed;
+ rm_class_t *cl, *cl0, *borrowed;
rm_class_t *borrows;
struct timeval *nowp;
@@ -1261,6 +1261,7 @@ rmc_update_class_util(struct rm_ifdat *i
if ((cl = ifd->class_[ifd->qo_]) == NULL)
return;
+ cl0 = cl;
pktlen = ifd->curlen_[ifd->qo_];
borrowed = ifd->borrowed_[ifd->qo_];
borrows = borrowed;
@@ -1370,7 +1371,7 @@ rmc_update_class_util(struct rm_ifdat *i
cl->last_pkttime_ = pkt_time;
#if 1
- if (cl->parent_ == NULL) {
+ if (cl->parent_ == NULL && cl != cl0) {
/* take stats of root class */
PKTCNTR_ADD(&cl->stats_.xmit_cnt, pktlen);
}
