net: Convert net_ratelimit uses to net_<level>_ratelimited

[deliverable/linux.git] / net / sched / sch_generic.c

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 0eb1202c22a64c75f36499b6e91d726ed1597e8d..511323e89cecb221f9650d9d35e13c20d5d54b29 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -86,9 +86,8 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
                 * deadloop is detected. Return OK to try the next skb.
                 */
                kfree_skb(skb);
-               if (net_ratelimit())
-                       pr_warning("Dead loop on netdevice %s, fix it urgently!\n",
-                                  dev_queue->dev->name);
+               net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n",
+                                    dev_queue->dev->name);
                ret = qdisc_qlen(q);
        } else {
                /*
@@ -136,9 +135,9 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
                ret = handle_dev_cpu_collision(skb, txq, q);
        } else {
                /* Driver returned NETDEV_TX_BUSY - requeue skb */
-               if (unlikely (ret != NETDEV_TX_BUSY && net_ratelimit()))
-                       pr_warning("BUG %s code %d qlen %d\n",
-                                  dev->name, ret, q->q.qlen);
+               if (unlikely(ret != NETDEV_TX_BUSY))
+                       net_warn_ratelimited("BUG %s code %d qlen %d\n",
+                                            dev->name, ret, q->q.qlen);
 
                ret = dev_requeue_skb(skb, q);
        }