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/netfilter/nf_conntrack_standalone.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 'net/netfilter/nf_conntrack_standalone.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index f641751dba9d..cf65a1e040dd 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -101,7 +101,7 @@ static void *ct_seq_start(struct seq_file *seq, loff_t *pos) { struct ct_iter_state *st = seq->private; - st->time_now = ktime_to_ns(ktime_get_real()); + st->time_now = ktime_get_real_ns(); rcu_read_lock(); return ct_get_idx(seq, *pos); } |