From: Jozsef Kadlecsik Date: Tue, 15 May 2012 13:31:10 +0000 (+0200) Subject: Use MSEC_PER_SEC instead of harcoded value X-Git-Tag: v6.13~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b913c17499935074c6ef33cea79cdb6abd097d1;p=ipset Use MSEC_PER_SEC instead of harcoded value David Laight and Eric Dumazet noticed that we were using hardcoded 1000 instead of MSEC_PER_SEC to calculate the timeout. --- diff --git a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h index 9fba34f..41d9cfa 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h @@ -31,8 +31,8 @@ ip_set_timeout_uget(struct nlattr *tb) unsigned int timeout = ip_set_get_h32(tb); /* Normalize to fit into jiffies */ - if (timeout > UINT_MAX/1000) - timeout = UINT_MAX/1000; + if (timeout > UINT_MAX/MSEC_PER_SEC) + timeout = UINT_MAX/MSEC_PER_SEC; /* Userspace supplied TIMEOUT parameter: adjust crazy size */ return timeout == IPSET_NO_TIMEOUT ? IPSET_NO_TIMEOUT - 1 : timeout; diff --git a/kernel/net/netfilter/xt_set.c b/kernel/net/netfilter/xt_set.c index e97a31b..035960e 100644 --- a/kernel/net/netfilter/xt_set.c +++ b/kernel/net/netfilter/xt_set.c @@ -310,8 +310,8 @@ set_target_v2(struct sk_buff *skb, const struct xt_action_param *par) info->del_set.flags, 0, UINT_MAX); /* Normalize to fit into jiffies */ - if (add_opt.timeout > UINT_MAX/1000) - add_opt.timeout = UINT_MAX/1000; + if (add_opt.timeout > UINT_MAX/MSEC_PER_SEC) + add_opt.timeout = UINT_MAX/MSEC_PER_SEC; if (info->add_set.index != IPSET_INVALID_ID) ip_set_add(info->add_set.index, skb, par, &add_opt); if (info->del_set.index != IPSET_INVALID_ID)