Module Name: src
Committed By: ozaki-r
Date: Tue Jul 13 08:23:39 UTC 2021
Modified Files:
src/sys/altq: altq_rmclass.c
Log Message:
altq, cbq: calculate a delay period based on a borrowed class
A delay period was calculated based on a suspended class even if the
class can borrow bandwidth from another class. In that case a delay
period should be calculated based on a borrowed class. Otherwise
a borrowing class can't borrow bandwidth correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 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.23 src/sys/altq/altq_rmclass.c:1.24
--- src/sys/altq/altq_rmclass.c:1.23 Tue Jul 13 07:59:48 2021
+++ src/sys/altq/altq_rmclass.c Tue Jul 13 08:23:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rmclass.c,v 1.23 2021/07/13 07:59:48 ozaki-r Exp $ */
+/* $NetBSD: altq_rmclass.c,v 1.24 2021/07/13 08:23:39 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.23 2021/07/13 07:59:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.24 2021/07/13 08:23:39 ozaki-r Exp $");
/* #ident "@(#)rm_class.c 1.48 97/12/05 SMI" */
@@ -1482,7 +1482,10 @@ rmc_delay_action(struct rm_class *cl, st
int ndelay, t, extradelay;
cl->stats_.overactions++;
- TV_DELTA(&cl->undertime_, &cl->overtime_, ndelay);
+ if (borrow != NULL)
+ TV_DELTA(&borrow->undertime_, &cl->overtime_, ndelay);
+ else
+ TV_DELTA(&cl->undertime_, &cl->overtime_, ndelay);
#ifndef BORROW_OFFTIME
ndelay += cl->offtime_;
#endif
