Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 34c5d292ce05d2bf52e692c44292b0ababba2853

Authored by Jiri Pirko
Committed by David S. Miller
1 parent 292f1c7ff6
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 11 additions and 5 deletions Side-by-side Diff

include/net/pkt_sched.h
Diff comments   View file @ 34c5d29
... ... @@ -65,8 +65,14 @@
65 65 };
66 66  
67 67 extern void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc);
68   -extern void qdisc_watchdog_schedule(struct qdisc_watchdog *wd,
69   - psched_time_t expires);
  68 +extern void qdisc_watchdog_schedule_ns(struct qdisc_watchdog *wd, u64 expires);
  69 +
  70 +static inline void qdisc_watchdog_schedule(struct qdisc_watchdog *wd,
  71 + psched_time_t expires)
  72 +{
  73 + qdisc_watchdog_schedule_ns(wd, PSCHED_TICKS2NS(expires));
  74 +}
  75 +
70 76 extern void qdisc_watchdog_cancel(struct qdisc_watchdog *wd);
71 77  
72 78 extern struct Qdisc_ops pfifo_qdisc_ops;
... ... @@ -493,7 +493,7 @@
493 493 }
494 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 498 if (test_bit(__QDISC_STATE_DEACTIVATED,
499 499 &qdisc_root_sleeping(wd->qdisc)->state))
500 500  
... ... @@ -502,10 +502,10 @@
502 502 qdisc_throttled(wd->qdisc);
503 503  
504 504 hrtimer_start(&wd->timer,
505   - ns_to_ktime(PSCHED_TICKS2NS(expires)),
  505 + ns_to_ktime(expires),
506 506 HRTIMER_MODE_ABS);
507 507 }
508   -EXPORT_SYMBOL(qdisc_watchdog_schedule);
  508 +EXPORT_SYMBOL(qdisc_watchdog_schedule_ns);
509 509  
510 510 void qdisc_watchdog_cancel(struct qdisc_watchdog *wd)
511 511 {