diff options
author | Patrick McHardy <kaber@trash.net> | 2007-03-23 14:29:11 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:27:54 -0400 |
commit | 03cc45c0a5b9b7f74768feb43b9a2525d203bbdb (patch) | |
tree | acb5b1d692c9fdf526863f641547744b0a2d38a0 /net/sched/sch_htb.c | |
parent | 8edc0c31d6b7849b0fb50db86824830769241939 (diff) |
[NET_SCHED]: turn PSCHED_TDIFF_SAFE into inline function
Also rename to psched_tdiff_bounded.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
-rw-r--r-- | net/sched/sch_htb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index b7abd0ae676a..71e4c92b7e87 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -729,7 +729,7 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl, | |||
729 | cl->T = toks | 729 | cl->T = toks |
730 | 730 | ||
731 | while (cl) { | 731 | while (cl) { |
732 | diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32) cl->mbuffer); | 732 | diff = psched_tdiff_bounded(q->now, cl->t_c, cl->mbuffer); |
733 | if (cl->level >= level) { | 733 | if (cl->level >= level) { |
734 | if (cl->level == level) | 734 | if (cl->level == level) |
735 | cl->xstats.lends++; | 735 | cl->xstats.lends++; |
@@ -789,7 +789,7 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level) | |||
789 | return cl->pq_key; | 789 | return cl->pq_key; |
790 | 790 | ||
791 | htb_safe_rb_erase(p, q->wait_pq + level); | 791 | htb_safe_rb_erase(p, q->wait_pq + level); |
792 | diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32) cl->mbuffer); | 792 | diff = psched_tdiff_bounded(q->now, cl->t_c, cl->mbuffer); |
793 | htb_change_class_mode(q, cl, &diff); | 793 | htb_change_class_mode(q, cl, &diff); |
794 | if (cl->cmode != HTB_CAN_SEND) | 794 | if (cl->cmode != HTB_CAN_SEND) |
795 | htb_add_to_wait_tree(q, cl, diff); | 795 | htb_add_to_wait_tree(q, cl, diff); |