Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename shadowing variable delay to nowdelay.

This commit is contained in:
mrg 2005-07-13 11:28:58 +00:00
parent a3d57ef1bd
commit d53dd8a3f3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/altq/altq_rmclass.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: altq_rmclass.c,v 1.9 2005/02/26 23:04:16 perry Exp $ */
/* $NetBSD: altq_rmclass.c,v 1.10 2005/07/13 11:28:58 mrg Exp $ */
/* $KAME: altq_rmclass.c,v 1.9 2000/12/14 08:12:46 thorpej Exp $ */
/*
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.9 2005/02/26 23:04:16 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.10 2005/07/13 11:28:58 mrg Exp $");
#ident "@(#)rm_class.c 1.48 97/12/05 SMI"
@ -1520,12 +1520,12 @@ void
rmc_delay_action(cl, borrow)
struct rm_class *cl, *borrow;
{
int delay, t, extradelay;
int nowdelay, t, extradelay;
cl->stats_.overactions++;
TV_DELTA(&cl->undertime_, &cl->overtime_, delay);
TV_DELTA(&cl->undertime_, &cl->overtime_, nowdelay);
#ifndef BORROW_OFFTIME
delay += cl->offtime_;
nowdelay += cl->offtime_;
#endif
if (!cl->sleeping_) {
@ -1550,7 +1550,7 @@ rmc_delay_action(cl, borrow)
#endif
if (extradelay > 0) {
TV_ADD_DELTA(&cl->undertime_, extradelay, &cl->undertime_);
delay += extradelay;
nowdelay += extradelay;
}
cl->sleeping_ = 1;
@ -1563,7 +1563,7 @@ rmc_delay_action(cl, borrow)
* NOTE: If there's no other traffic, we need the timer as
* a 'backstop' to restart this class.
*/
if (delay > tick * 2) {
if (nowdelay > tick * 2) {
#ifdef __FreeBSD__
/* FreeBSD rounds up the tick */
t = hzto(&cl->undertime_);