These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / netfilter / ipset / ip_set_timeout.h

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h
index 83c2f9e..1d6a935 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h
@@ -40,38 +40,33 @@ ip_set_timeout_uget(struct nlattr *tb)
 }
 
 static inline bool
-ip_set_timeout_test(unsigned long timeout)
+ip_set_timeout_expired(unsigned long *t)
 {
-       return timeout == IPSET_ELEM_PERMANENT ||
-              time_is_after_jiffies(timeout);
-}
-
-static inline bool
-ip_set_timeout_expired(unsigned long *timeout)
-{
-       return *timeout != IPSET_ELEM_PERMANENT &&
-              time_is_before_jiffies(*timeout);
+       return *t != IPSET_ELEM_PERMANENT && time_is_before_jiffies(*t);
 }
 
 static inline void
-ip_set_timeout_set(unsigned long *timeout, u32 t)
+ip_set_timeout_set(unsigned long *timeout, u32 value)
 {
-       if (!t) {
+       unsigned long t;
+
+       if (!value) {
                *timeout = IPSET_ELEM_PERMANENT;
                return;
        }
 
-       *timeout = msecs_to_jiffies(t * 1000) + jiffies;
-       if (*timeout == IPSET_ELEM_PERMANENT)
+       t = msecs_to_jiffies(value * MSEC_PER_SEC) + jiffies;
+       if (t == IPSET_ELEM_PERMANENT)
                /* Bingo! :-) */
-               (*timeout)--;
+               t--;
+       *timeout = t;
 }
 
 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__ */