diff options
author | Jiri Pirko <jiri@resnulli.us> | 2013-02-11 19:12:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-12 18:59:45 -0500 |
commit | 34c5d292ce05d2bf52e692c44292b0ababba2853 (patch) | |
tree | b9a0e7989792d08c1b33a75c6889697fe97fbe39 /net/sched/sch_api.c | |
parent | 292f1c7ff6cc10516076ceeea45ed11833bb71c7 (diff) |
sch_api: introduce qdisc_watchdog_schedule_ns()
tbf will need to schedule watchdog in ns. No need to convert it twice.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_api.c')
-rw-r--r-- | net/sched/sch_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index d84f7e734cd7..fe1ba54b93f7 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -493,7 +493,7 @@ void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc) | |||
493 | } | 493 | } |
494 | EXPORT_SYMBOL(qdisc_watchdog_init); | 494 | EXPORT_SYMBOL(qdisc_watchdog_init); |
495 | 495 | ||
496 | void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires) | 496 | void qdisc_watchdog_schedule_ns(struct qdisc_watchdog *wd, u64 expires) |
497 | { | 497 | { |
498 | if (test_bit(__QDISC_STATE_DEACTIVATED, | 498 | if (test_bit(__QDISC_STATE_DEACTIVATED, |
499 | &qdisc_root_sleeping(wd->qdisc)->state)) | 499 | &qdisc_root_sleeping(wd->qdisc)->state)) |
@@ -502,10 +502,10 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires) | |||
502 | qdisc_throttled(wd->qdisc); | 502 | qdisc_throttled(wd->qdisc); |
503 | 503 | ||
504 | hrtimer_start(&wd->timer, | 504 | hrtimer_start(&wd->timer, |
505 | ns_to_ktime(PSCHED_TICKS2NS(expires)), | 505 | ns_to_ktime(expires), |
506 | HRTIMER_MODE_ABS); | 506 | HRTIMER_MODE_ABS); |
507 | } | 507 | } |
508 | EXPORT_SYMBOL(qdisc_watchdog_schedule); | 508 | EXPORT_SYMBOL(qdisc_watchdog_schedule_ns); |
509 | 509 | ||
510 | void qdisc_watchdog_cancel(struct qdisc_watchdog *wd) | 510 | void qdisc_watchdog_cancel(struct qdisc_watchdog *wd) |
511 | { | 511 | { |