Skip to content

L
linux
Commit aaeb6e24 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files
Options

netfilter: ipset: Use MSEC_PER_SEC consistently 

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 482cfc31
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/linux/netfilter/ipset/ip_set_timeout.h
View file @ aaeb6e24
...@@ -61,7 +61,7 @@ ip_set_timeout_set(unsigned long *timeout, u32 t) ...@@ -61,7 +61,7 @@ ip_set_timeout_set(unsigned long *timeout, u32 t)
return; return;
} }
*timeout = msecs_to_jiffies(t * 1000) + jiffies; *timeout = msecs_to_jiffies(t * MSEC_PER_SEC) + jiffies;
if (*timeout == IPSET_ELEM_PERMANENT) if (*timeout == IPSET_ELEM_PERMANENT)
/* Bingo! :-) */ /* Bingo! :-) */
(*timeout)--; (*timeout)--;
...@@ -71,7 +71,7 @@ static inline u32 ...@@ -71,7 +71,7 @@ static inline u32
ip_set_timeout_get(unsigned long *timeout) ip_set_timeout_get(unsigned long *timeout)
{ {
return *timeout == IPSET_ELEM_PERMANENT ? 0 : return *timeout == IPSET_ELEM_PERMANENT ? 0 :
jiffies_to_msecs(*timeout - jiffies)/1000; jiffies_to_msecs(*timeout - jiffies)/MSEC_PER_SEC;
} }
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7