1 files changed, 8 insertions, 7 deletions

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index e37fe3129c17..7eafb8d54470 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -41,16 +41,17 @@ static inline void *qdisc_priv(struct Qdisc *q)
 typedef u64     psched_time_t;
 typedef long    psched_tdiff_t;
 
-/* Avoid doing 64 bit divide by 1000 */
-#define PSCHED_US2NS(x)                 ((s64)(x) << 10)
-#define PSCHED_NS2US(x)                 ((x) >> 10)
+/* Avoid doing 64 bit divide */
+#define PSCHED_SHIFT                    6
+#define PSCHED_TICKS2NS(x)              ((s64)(x) << PSCHED_SHIFT)
+#define PSCHED_NS2TICKS(x)              ((x) >> PSCHED_SHIFT)
 
-#define PSCHED_TICKS_PER_SEC            PSCHED_NS2US(NSEC_PER_SEC)
+#define PSCHED_TICKS_PER_SEC            PSCHED_NS2TICKS(NSEC_PER_SEC)
 #define PSCHED_PASTPERFECT              0
 
 static inline psched_time_t psched_get_time(void)
 {
-        return PSCHED_NS2US(ktime_to_ns(ktime_get()));
+        return PSCHED_NS2TICKS(ktime_to_ns(ktime_get()));
 }
 
 static inline psched_tdiff_t
@@ -60,8 +61,8 @@ psched_tdiff_bounded(psched_time_t tv1, psched_time_t tv2, psched_time_t bound)
 }
 
 struct qdisc_watchdog {
-        struct hrtimer  timer;
-        struct Qdisc    *qdisc;
+        struct tasklet_hrtimer  timer;
+        struct Qdisc            *qdisc;
 };
 
 extern void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc);