net/ipv4/iptables/ipt_hashlimit.c: Remove custom
Subsystems (3)
PATCH 1/1 net/ipv4/iptables/ipt_hashlimit.c: Remove custom
Replace the MS2JIFFIES() macro with the msecs_to_jiffies() function provided in jiffies.h. The current macro is incorrect because HZ can have different values on different architectures.
Signed-off-by Tobias Klauser <[email protected]>
net/ipv4/netfilter/ipt_hashlimit.c +4 -6
@@ -45,8 +45,6 @@/* FIXME: this is just for IP_NF_ASSERRT */ #include <linux/netfilter_ipv4/ip_conntrack.h> -#define MS2JIFFIES (x) ((x*HZ)/1000) -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Harald Welte <[email protected]>" );MODULE_DESCRIPTION ("iptables match for limiting per hash-bucket" );
@@ -225,7 +223,7 @@ static int htable_create(struct ipt_hash hinfo->pde->data = hinfo;init_timer (&hinfo->timer); - hinfo->timer.expires = jiffies +MS2JIFFIES (hinfo->cfg.gc_interval); + hinfo->timer.expires = jiffies +msecs_to_jiffies (hinfo->cfg.gc_interval); hinfo->timer.data = (unsigned long )hinfo; hinfo->timer.function = htable_gc;add_timer (&hinfo->timer);
@@ -275,7 +273,7 @@ static void htable_gc(unsigned long htlohtable_selective_cleanup (ht, select_gc);/* re-add the timer accordingly */ - ht->timer.expires = jiffies +MS2JIFFIES (ht->cfg.gc_interval); + ht->timer.expires = jiffies +msecs_to_jiffies (ht->cfg.gc_interval);add_timer (&ht->timer); }
@@ -468,7 +466,7 @@ hashlimit_match(const struct sk_buff *skreturn 0 ; } - dh->expires = jiffies +MS2JIFFIES (hinfo->cfg.expire); + dh->expires = jiffies +msecs_to_jiffies (hinfo->cfg.expire); dh->rateinfo.prev = jiffies; dh->rateinfo.credit = user2credits(hinfo->cfg.avg *
@@ -482,7 +480,7 @@ hashlimit_match(const struct sk_buff *sk }/* update expiration timeout */ - dh->expires = now +MS2JIFFIES (hinfo->cfg.expire); + dh->expires = now +msecs_to_jiffies (hinfo->cfg.expire);rateinfo_recalc (dh, now);if (dh->rateinfo.credit >= dh->rateinfo.cost) {
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors