diff options
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r-- | net/sched/sch_generic.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 0eb1202c22a6..511323e89cec 100644 --- 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, | |||
86 | * deadloop is detected. Return OK to try the next skb. | 86 | * deadloop is detected. Return OK to try the next skb. |
87 | */ | 87 | */ |
88 | kfree_skb(skb); | 88 | kfree_skb(skb); |
89 | if (net_ratelimit()) | 89 | net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n", |
90 | pr_warning("Dead loop on netdevice %s, fix it urgently!\n", | 90 | dev_queue->dev->name); |
91 | dev_queue->dev->name); | ||
92 | ret = qdisc_qlen(q); | 91 | ret = qdisc_qlen(q); |
93 | } else { | 92 | } else { |
94 | /* | 93 | /* |
@@ -136,9 +135,9 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q, | |||
136 | ret = handle_dev_cpu_collision(skb, txq, q); | 135 | ret = handle_dev_cpu_collision(skb, txq, q); |
137 | } else { | 136 | } else { |
138 | /* Driver returned NETDEV_TX_BUSY - requeue skb */ | 137 | /* Driver returned NETDEV_TX_BUSY - requeue skb */ |
139 | if (unlikely (ret != NETDEV_TX_BUSY && net_ratelimit())) | 138 | if (unlikely(ret != NETDEV_TX_BUSY)) |
140 | pr_warning("BUG %s code %d qlen %d\n", | 139 | net_warn_ratelimited("BUG %s code %d qlen %d\n", |
141 | dev->name, ret, q->q.qlen); | 140 | dev->name, ret, q->q.qlen); |
142 | 141 | ||
143 | ret = dev_requeue_skb(skb, q); | 142 | ret = dev_requeue_skb(skb, q); |
144 | } | 143 | } |