summaryrefslogtreecommitdiffstats
path: root/include/net/pkt_sched.h
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2009-06-15 02:31:47 -0700
committerDavid S. Miller <davem@davemloft.net>2009-06-15 02:31:47 -0700
commitca44d6e60f9de26281fda203f58b570e1748c015 (patch)
tree9620f3f91836f608a084acb78d1a178135cfd3b0 /include/net/pkt_sched.h
parente0f7cb8c8cc6cccce28d2ce39ad8c60d23c3799f (diff)
downloadlinux-ca44d6e60f9de26281fda203f58b570e1748c015.tar.bz2
pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
Let's use TICKS instead of US, so PSCHED_TICKS2NS and PSCHED_NS2TICKS (like in PSCHED_TICKS_PER_SEC already) to avoid misleading. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pkt_sched.h')
-rw-r--r--include/net/pkt_sched.h8
1 files changed, 4 insertions, 4 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