3 files changed, 8 insertions, 8 deletions

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 120935b2abd8..82a3191375f5 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -43,15 +43,15 @@ typedef long	psched_tdiff_t;
 
 /* Avoid doing 64 bit divide */
 #define PSCHED_SHIFT                    6
-#define PSCHED_US2NS(x)                 ((s64)(x) << PSCHED_SHIFT)
-#define PSCHED_NS2US(x)                 ((x) >> PSCHED_SHIFT)
+#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
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 32009793307b..24d17ce9c294 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -484,7 +484,7 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires)
 
         wd->qdisc->flags |= TCQ_F_THROTTLED;
         time = ktime_set(0, 0);
-        time = ktime_add_ns(time, PSCHED_US2NS(expires));
+        time = ktime_add_ns(time, PSCHED_TICKS2NS(expires));
         hrtimer_start(&wd->timer, time, HRTIMER_MODE_ABS);
 }
 EXPORT_SYMBOL(qdisc_watchdog_schedule);
@@ -1680,7 +1680,7 @@ static int psched_show(struct seq_file *seq, void *v)
 
         hrtimer_get_res(CLOCK_MONOTONIC, &ts);
         seq_printf(seq, "%08x %08x %08x %08x\n",
-                   (u32)NSEC_PER_USEC, (u32)PSCHED_US2NS(1),
+                   (u32)NSEC_PER_USEC, (u32)PSCHED_TICKS2NS(1),
                    1000000,
                    (u32)NSEC_PER_SEC/(u32)ktime_to_ns(timespec_to_ktime(ts)));
 
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)
                         q->pmask |= (1<<TC_CBQ_MAXPRIO);
 
                         expires = ktime_set(0, 0);
-                        expires = ktime_add_ns(expires, PSCHED_US2NS(sched));
+                        expires = ktime_add_ns(expires, PSCHED_TICKS2NS(sched));
                         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);
-                time = ktime_add_ns(time, PSCHED_US2NS(now + delay));
+                time = ktime_add_ns(time, PSCHED_TICKS2NS(now + delay));
                 hrtimer_start(&q->delay_timer, time, HRTIMER_MODE_ABS);
         }