diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-12-01 07:11:54 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-12-01 07:11:54 +0100 |
| commit | 01149ecc157609f5ff5d95d1b38480107848b1d2 (patch) | |
| tree | e0b789861829408d33ea50e4275dea1d421c3562 | |
| parent | c1278ed7bb4133e96a55f52afc032b5332fee89c (diff) | |
Use MSEC_PER_SEC consistently
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_timeout.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h index cfe8a3f..1d6a935 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h @@ -55,7 +55,7 @@ ip_set_timeout_set(unsigned long *timeout, u32 value) return; } - t = msecs_to_jiffies(value * 1000) + jiffies; + t = msecs_to_jiffies(value * MSEC_PER_SEC) + jiffies; if (t == IPSET_ELEM_PERMANENT) /* Bingo! :-) */ t--; @@ -66,7 +66,7 @@ static inline u32 ip_set_timeout_get(unsigned long *timeout) { return *timeout == IPSET_ELEM_PERMANENT ? 0 : - jiffies_to_msecs(*timeout - jiffies)/1000; + jiffies_to_msecs(*timeout - jiffies)/MSEC_PER_SEC; } #endif /* __KERNEL__ */ |