diff options
Diffstat (limited to 'net/sched/sch_cbq.c')
-rw-r--r-- | net/sched/sch_cbq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index d728d8111732..23a167670fd5 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
@@ -509,7 +509,7 @@ static void cbq_ovl_delay(struct cbq_class *cl) | |||
509 | q->pmask |= (1<<TC_CBQ_MAXPRIO); | 509 | q->pmask |= (1<<TC_CBQ_MAXPRIO); |
510 | 510 | ||
511 | expires = ktime_set(0, 0); | 511 | expires = ktime_set(0, 0); |
512 | expires = ktime_add_ns(expires, PSCHED_US2NS(sched)); | 512 | expires = ktime_add_ns(expires, PSCHED_TICKS2NS(sched)); |
513 | if (hrtimer_try_to_cancel(&q->delay_timer) && | 513 | if (hrtimer_try_to_cancel(&q->delay_timer) && |
514 | ktime_to_ns(ktime_sub( | 514 | ktime_to_ns(ktime_sub( |
515 | hrtimer_get_expires(&q->delay_timer), | 515 | hrtimer_get_expires(&q->delay_timer), |
@@ -620,7 +620,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer) | |||
620 | ktime_t time; | 620 | ktime_t time; |
621 | 621 | ||
622 | time = ktime_set(0, 0); | 622 | time = ktime_set(0, 0); |
623 | time = ktime_add_ns(time, PSCHED_US2NS(now + delay)); | 623 | time = ktime_add_ns(time, PSCHED_TICKS2NS(now + delay)); |
624 | hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS); | 624 | hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS); |
625 | } | 625 | } |
626 | 626 | ||