net: Convert net_ratelimit uses to net_<level>_ratelimited

[pandora-kernel.git] / net / ipv4 / netfilter / ip_tables.c

diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 24e556e..170b1fd 100644 (file)
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -153,8 +153,7 @@ ip_checkentry(const struct ipt_ip *ip)
 static unsigned int
 ipt_error(struct sk_buff *skb, const struct xt_action_param *par)
 {
-       if (net_ratelimit())
-               pr_info("error: `%s'\n", (const char *)par->targinfo);
+       net_info_ratelimited("error: `%s'\n", (const char *)par->targinfo);
 
        return NF_DROP;
 }
@@ -377,7 +376,7 @@ ipt_do_table(struct sk_buff *skb,
                        if (v < 0) {
                                /* Pop from stack? */
                                if (v != XT_RETURN) {
-                                       verdict = (unsigned)(-v) - 1;
+                                       verdict = (unsigned int)(-v) - 1;
                                        break;
                                }
                                if (*stackptr <= origptr) {