diff options
author | Eric Dumazet <edumazet@google.com> | 2014-08-22 21:32:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-22 22:57:23 -0400 |
commit | d2de875c6d4cbec8a99c880160181a3ed5b9992e (patch) | |
tree | 5dc09deacccbd946bc7f6b602c1b788fcdf842a6 /net/sched/act_police.c | |
parent | 3f8a2b746e3aece61f9c4714b86d1484d66461f0 (diff) |
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/sched/act_police.c')
-rw-r--r-- | net/sched/act_police.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 0566e4606a4a..f32bcb094915 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
@@ -231,7 +231,7 @@ override: | |||
231 | if (ret != ACT_P_CREATED) | 231 | if (ret != ACT_P_CREATED) |
232 | return ret; | 232 | return ret; |
233 | 233 | ||
234 | police->tcfp_t_c = ktime_to_ns(ktime_get()); | 234 | police->tcfp_t_c = ktime_get_ns(); |
235 | police->tcf_index = parm->index ? parm->index : | 235 | police->tcf_index = parm->index ? parm->index : |
236 | tcf_hash_new_index(hinfo); | 236 | tcf_hash_new_index(hinfo); |
237 | h = tcf_hash(police->tcf_index, POL_TAB_MASK); | 237 | h = tcf_hash(police->tcf_index, POL_TAB_MASK); |
@@ -279,7 +279,7 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, | |||
279 | return police->tcfp_result; | 279 | return police->tcfp_result; |
280 | } | 280 | } |
281 | 281 | ||
282 | now = ktime_to_ns(ktime_get()); | 282 | now = ktime_get_ns(); |
283 | toks = min_t(s64, now - police->tcfp_t_c, | 283 | toks = min_t(s64, now - police->tcfp_t_c, |
284 | police->tcfp_burst); | 284 | police->tcfp_burst); |
285 | if (police->peak_present) { | 285 | if (police->peak_present) { |