git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...
[pandora-kernel.git]
/
net
/
sched
/
sch_cbq.c
diff --git
a/net/sched/sch_cbq.c
b/net/sched/sch_cbq.c
index
d728d81
..
23a1676
100644
(file)
--- 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)
q->pmask |= (1<<TC_CBQ_MAXPRIO);
expires = ktime_set(0, 0);
q->pmask |= (1<<TC_CBQ_MAXPRIO);
expires = ktime_set(0, 0);
- expires = ktime_add_ns(expires, PSCHED_
U
S2NS(sched));
+ expires = ktime_add_ns(expires, PSCHED_
TICK
S2NS(sched));
if (hrtimer_try_to_cancel(&q->delay_timer) &&
ktime_to_ns(ktime_sub(
hrtimer_get_expires(&q->delay_timer),
if (hrtimer_try_to_cancel(&q->delay_timer) &&
ktime_to_ns(ktime_sub(
hrtimer_get_expires(&q->delay_timer),
@@
-620,7
+620,7
@@
static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
ktime_t time;
time = ktime_set(0, 0);
ktime_t time;
time = ktime_set(0, 0);
- time = ktime_add_ns(time, PSCHED_
U
S2NS(now + delay));
+ time = ktime_add_ns(time, PSCHED_
TICK
S2NS(now + delay));
hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS);
}
hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS);
}