]> git.ipfire.org Git - thirdparty/ipset.git/commitdiff
Use MSEC_PER_SEC consistently
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Mon, 1 Dec 2014 06:11:54 +0000 (07:11 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Mon, 1 Dec 2014 06:11:54 +0000 (07:11 +0100)
kernel/include/linux/netfilter/ipset/ip_set_timeout.h

index cfe8a3f9aef3c08be6736ba562dd9c26cf564038..1d6a935c1ac5f4becf782394a4c8e03f7a913eb8 100644 (file)
@@ -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__ */