aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_cbq.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-03-23 14:29:25 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:27:55 -0400
commit3bebcda28077375470dd60545b71bba2f83335fd (patch)
treea0d610788ccfe8d3b50d6ebf3df014e98f6387bc /net/sched/sch_cbq.c
parent03cc45c0a5b9b7f74768feb43b9a2525d203bbdb (diff)
[NET_SCHED]: turn PSCHED_GET_TIME into inline function
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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index f9e8403c5222..414a97c962f1 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -385,7 +385,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl)
385 psched_time_t now; 385 psched_time_t now;
386 psched_tdiff_t incr; 386 psched_tdiff_t incr;
387 387
388 PSCHED_GET_TIME(now); 388 now = psched_get_time();
389 incr = now - q->now_rt; 389 incr = now - q->now_rt;
390 now = q->now + incr; 390 now = q->now + incr;
391 391
@@ -654,7 +654,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
654 psched_tdiff_t delay = 0; 654 psched_tdiff_t delay = 0;
655 unsigned pmask; 655 unsigned pmask;
656 656
657 PSCHED_GET_TIME(now); 657 now = psched_get_time();
658 658
659 pmask = q->pmask; 659 pmask = q->pmask;
660 q->pmask = 0; 660 q->pmask = 0;
@@ -1003,7 +1003,7 @@ cbq_dequeue(struct Qdisc *sch)
1003 psched_time_t now; 1003 psched_time_t now;
1004 psched_tdiff_t incr; 1004 psched_tdiff_t incr;
1005 1005
1006 PSCHED_GET_TIME(now); 1006 now = psched_get_time();
1007 incr = now - q->now_rt; 1007 incr = now - q->now_rt;
1008 1008
1009 if (q->tx_class) { 1009 if (q->tx_class) {
@@ -1277,7 +1277,7 @@ cbq_reset(struct Qdisc* sch)
1277 qdisc_watchdog_cancel(&q->watchdog); 1277 qdisc_watchdog_cancel(&q->watchdog);
1278 hrtimer_cancel(&q->delay_timer); 1278 hrtimer_cancel(&q->delay_timer);
1279 q->toplevel = TC_CBQ_MAXLEVEL; 1279 q->toplevel = TC_CBQ_MAXLEVEL;
1280 PSCHED_GET_TIME(q->now); 1280 q->now = psched_get_time();
1281 q->now_rt = q->now; 1281 q->now_rt = q->now;
1282 1282
1283 for (prio = 0; prio <= TC_CBQ_MAXPRIO; prio++) 1283 for (prio = 0; prio <= TC_CBQ_MAXPRIO; prio++)
@@ -1448,7 +1448,7 @@ static int cbq_init(struct Qdisc *sch, struct rtattr *opt)
1448 hrtimer_init(&q->delay_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); 1448 hrtimer_init(&q->delay_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
1449 q->delay_timer.function = cbq_undelay; 1449 q->delay_timer.function = cbq_undelay;
1450 q->toplevel = TC_CBQ_MAXLEVEL; 1450 q->toplevel = TC_CBQ_MAXLEVEL;
1451 PSCHED_GET_TIME(q->now); 1451 q->now = psched_get_time();
1452 q->now_rt = q->now; 1452 q->now_rt = q->now;
1453 1453
1454 cbq_link_class(&q->link); 1454 cbq_link_class(&q->link);