summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-08-10 23:34:02 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 14:54:32 -0700
commit18a63e868b04cf949643cc9d2c8a51d8cb5da9c4 (patch)
tree5c5643cf93f8f7bec1b2bbc4443628346be51a1a /net/sched
parent9ac961ee05bfc837e5271be34ad7158e90dce7d9 (diff)
downloadlinux-stable-18a63e868b04cf949643cc9d2c8a51d8cb5da9c4.tar.gz
linux-stable-18a63e868b04cf949643cc9d2c8a51d8cb5da9c4.tar.bz2
linux-stable-18a63e868b04cf949643cc9d2c8a51d8cb5da9c4.zip
[HTB]: HTB_HYSTERESIS cleanup
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>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_htb.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index c0b80b75cdff..d8c1a6b0def1 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -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);
}
+#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
*
@@ -499,19 +513,12 @@ htb_class_mode(struct htb_class *cl,long *diff)
{
long toks;
- if ((toks = (cl->ctokens + *diff)) < (
-#if HTB_HYSTERESIS
- cl->cmode != HTB_CANT_SEND ? -cl->cbuffer :
-#endif
- 0)) {
+ if ((toks = (cl->ctokens + *diff)) < htb_lowater(cl)) {
*diff = -toks;
return HTB_CANT_SEND;
}
- if ((toks = (cl->tokens + *diff)) >= (
-#if HTB_HYSTERESIS
- cl->cmode == HTB_CAN_SEND ? -cl->buffer :
-#endif
- 0))
+
+ if ((toks = (cl->tokens + *diff)) >= htb_hiwater(cl))
return HTB_CAN_SEND;
*diff = -toks;