summaryrefslogtreecommitdiffstats
path: root/kernel/include/linux
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2012-05-15 15:31:10 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2012-05-15 15:31:10 +0200
commit4b913c17499935074c6ef33cea79cdb6abd097d1 (patch)
treeb37ebbb1aee26a8ffa14861583975ee5f555cb23 /kernel/include/linux
parent3251fc4e11ed075e796066f88effb8788c3a5ccb (diff)
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.
Diffstat (limited to 'kernel/include/linux')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set_timeout.h4
1 files changed, 2 insertions, 2 deletions
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;