[PATCH 13/32] netfilter: ipset: Use MSEC_PER_SEC consistently

[Pablo Neira Ayuso]

From: Jozsef Kadlecsik <kad...@blackhole.kfki.hu>

Signed-off-by: Jozsef Kadlecsik <kad...@blackhole.kfki.hu>
---
 include/linux/netfilter/ipset/ip_set_timeout.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/netfilter/ipset/ip_set_timeout.h 
b/include/linux/netfilter/ipset/ip_set_timeout.h
index 83c2f9e..3c8842b 100644
--- a/include/linux/netfilter/ipset/ip_set_timeout.h
+++ b/include/linux/netfilter/ipset/ip_set_timeout.h
@@ -61,7 +61,7 @@ ip_set_timeout_set(unsigned long *timeout, u32 t)
                return;
        }
 
-       *timeout = msecs_to_jiffies(t * 1000) + jiffies;
+       *timeout = msecs_to_jiffies(t * MSEC_PER_SEC) + jiffies;
        if (*timeout == IPSET_ELEM_PERMANENT)
                /* Bingo! :-) */
                (*timeout)--;
@@ -71,7 +71,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__ */
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html