aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_cbq.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-03-23 11:28:07 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:27:50 -0700
commit104e0878984bb467e3f54d61105d8903babb4ec1 (patch)
tree796a0b5d189582255c3510817491428671921d5c /net/sched/sch_cbq.c
parent7c59e25f3186f26e85b13a318dbc4482d1d363e9 (diff)
downloadmrst-s0i3-test-104e0878984bb467e3f54d61105d8903babb4ec1.tar.gz
mrst-s0i3-test-104e0878984bb467e3f54d61105d8903babb4ec1.tar.xz
mrst-s0i3-test-104e0878984bb467e3f54d61105d8903babb4ec1.zip
[NET_SCHED]: kill PSCHED_TLESS
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_cbq.c')
-rw-r--r--net/sched/sch_cbq.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 290b26bdc89..9e6cdab6af3 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -390,7 +390,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl)
now = q->now + incr;
do {
- if (PSCHED_TLESS(cl->undertime, now)) {
+ if (cl->undertime < now) {
q->toplevel = cl->level;
return;
}
@@ -845,8 +845,7 @@ cbq_under_limit(struct cbq_class *cl)
if (cl->tparent == NULL)
return cl;
- if (PSCHED_IS_PASTPERFECT(cl->undertime) ||
- !PSCHED_TLESS(q->now, cl->undertime)) {
+ if (PSCHED_IS_PASTPERFECT(cl->undertime) || q->now >= cl->undertime) {
cl->delayed = 0;
return cl;
}
@@ -870,7 +869,7 @@ cbq_under_limit(struct cbq_class *cl)
if (cl->level > q->toplevel)
return NULL;
} while (!PSCHED_IS_PASTPERFECT(cl->undertime) &&
- PSCHED_TLESS(q->now, cl->undertime));
+ q->now < cl->undertime);
cl->delayed = 0;
return cl;