lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[HTB]: HTB_HYSTERESIS cleanup

Browse Source 
Change the conditional compilation around HTB_HYSTERSIS
since code was splitting mid expression.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2006-08-10 23:34:02 -07:00
committed by David S. Miller
parent 9ac961ee05
commit 18a63e868b
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
net/sched/sch_htb.c
View File

@@ -483,6 +483,20 @@ static void htb_deactivate_prios(struct htb_sched *q, struct htb_class *cl)
htb_remove_class_from_row(q,cl,mask); htb_remove_class_from_row(q,cl,mask);
} }
#if HTB_HYSTERESIS
static inline long htb_lowater(const struct htb_class *cl)
{
return cl->cmode != HTB_CANT_SEND ? -cl->cbuffer : 0;
}
static inline long htb_hiwater(const struct htb_class *cl)
{
return cl->cmode == HTB_CAN_SEND ? -cl->buffer : 0;
}
#else
#define htb_lowater(cl) (0)
#define htb_hiwater(cl) (0)
#endif
/** /**
* htb_class_mode - computes and returns current class mode * htb_class_mode - computes and returns current class mode
* *
@@ -499,19 +513,12 @@ htb_class_mode(struct htb_class *cl,long *diff)
{ {
long toks; long toks;
if ((toks = (cl->ctokens + *diff)) < ( if ((toks = (cl->ctokens + *diff)) < htb_lowater(cl)) {
#if HTB_HYSTERESIS
cl->cmode != HTB_CANT_SEND ? -cl->cbuffer :
#endif
0)) {
*diff = -toks; *diff = -toks;
return HTB_CANT_SEND; return HTB_CANT_SEND;
} }
if ((toks = (cl->tokens + *diff)) >= (
#if HTB_HYSTERESIS if ((toks = (cl->tokens + *diff)) >= htb_hiwater(cl))
cl->cmode == HTB_CAN_SEND ? -cl->buffer :
#endif
0))
return HTB_CAN_SEND; return HTB_CAN_SEND;
*diff = -toks; *diff = -toks;