net: Convert net_ratelimit uses to net_<level>_ratelimited

[deliverable/linux.git] / net / ipv4 / ip_input.c

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 26eccc5bab1c28e81d170fa0c147c9fb33a499e8..8590144ca3303ad99cb2c59a6eeef00ae12e2ffa 100644 (file)
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -210,9 +210,8 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
                        int ret;
 
                        if (!net_eq(net, &init_net) && !ipprot->netns_ok) {
-                               if (net_ratelimit())
-                                       printk("%s: proto %d isn't netns-ready\n",
-                                               __func__, protocol);
+                               net_info_ratelimited("%s: proto %d isn't netns-ready\n",
+                                                    __func__, protocol);
                                kfree_skb(skb);
                                goto out;
                        }
@@ -298,10 +297,10 @@ static inline bool ip_rcv_options(struct sk_buff *skb)
 
                if (in_dev) {
                        if (!IN_DEV_SOURCE_ROUTE(in_dev)) {
-                               if (IN_DEV_LOG_MARTIANS(in_dev) &&
-                                   net_ratelimit())
-                                       pr_info("source route option %pI4 -> %pI4\n",
-                                               &iph->saddr, &iph->daddr);
+                               if (IN_DEV_LOG_MARTIANS(in_dev))
+                                       net_info_ratelimited("source route option %pI4 -> %pI4\n",
+                                                            &iph->saddr,
+                                                            &iph->daddr);
                                goto drop;
                        }
                }