Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaeb6e24 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Use MSEC_PER_SEC consistently 



Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 482cfc31

include/linux/netfilter/ipset/ip_set_timeout.h

+2 −2
Original line number Diff line number Diff line
@@ -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__ */