diff options
| author |   Eric Dumazet <edumazet@google.com> | 2014-08-22 18:32:09 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-08-22 19:57:23 -0700 |
| commit | d2de875c6d4cbec8a99c880160181a3ed5b9992e (patch) | |
| tree | 5dc09deacccbd946bc7f6b602c1b788fcdf842a6 /net/sched/sch_fq.c | |
| parent | Merge tag 'linux-can-next-for-3.18-20140820' of git://gitorious.org/linux-can/linux-can-next (diff) | |
| download | linux-dev-d2de875c6d4cbec8a99c880160181a3ed5b9992e.tar.xz linux-dev-d2de875c6d4cbec8a99c880160181a3ed5b9992e.zip | |
net: use ktime_get_ns() and ktime_get_real_ns() helpers
ktime_get_ns() replaces ktime_to_ns(ktime_get())
ktime_get_real_ns() replaces ktime_to_ns(ktime_get_real())
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sched/sch_fq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index ba32c2b005d0..e12f997e1b4c 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c @@ -416,7 +416,7 @@ static void fq_check_throttled(struct fq_sched_data *q, u64 now) static struct sk_buff *fq_dequeue(struct Qdisc *sch) { struct fq_sched_data *q = qdisc_priv(sch); - u64 now = ktime_to_ns(ktime_get()); + u64 now = ktime_get_ns(); struct fq_flow_head *head; struct sk_buff *skb; struct fq_flow *f; @@ -787,7 +787,7 @@ nla_put_failure: static int fq_dump_stats(struct Qdisc *sch, struct gnet_dump *d) { struct fq_sched_data *q = qdisc_priv(sch); - u64 now = ktime_to_ns(ktime_get()); + u64 now = ktime_get_ns(); struct tc_fq_qd_stats st = { .gc_flows = q->stat_gc_flows, .highprio_packets = q->stat_internal_packets, |