| Message ID | 1281381401-5554-1-git-send-email-greearb@candelatech.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 9 Aug 2010 12:16:41 -0700 Ben Greear <greearb@candelatech.com> wrote: > This also makes it printed under net_ratelimit instead > of WARN_ON_ONCE. The backtrace never helped me much. > > Signed-off-by: Ben Greear <greearb@candelatech.com> > Please don't remove the WARN_ because it is used by oops.kernel.org automated tracking. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stephen Hemminger <shemminger@vyatta.com> Date: Mon, 9 Aug 2010 15:28:20 -0400 > On Mon, 9 Aug 2010 12:16:41 -0700 > Ben Greear <greearb@candelatech.com> wrote: > >> This also makes it printed under net_ratelimit instead >> of WARN_ON_ONCE. The backtrace never helped me much. >> >> Signed-off-by: Ben Greear <greearb@candelatech.com> >> > > Please don't remove the WARN_ because it is used by oops.kernel.org > automated tracking. Yes, please don't change this, there are automated tools that know about what this thing spits out and yes the backtrace needs to be there. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 2aeb3a4..b52c450 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -253,9 +253,15 @@ static void dev_watchdog(unsigned long arg) } if (some_queue_timedout) { - char drivername[64]; - WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n", - dev->name, netdev_drivername(dev, drivername, 64), i); + if (net_ratelimit()) { + char drivername[64]; + printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): " + "transmit queue %u timed out" + " trans-start: %lu jiffies: %lu\n", + dev->name, + netdev_drivername(dev, drivername, 64), + i, trans_start, jiffies); + } dev->netdev_ops->ndo_tx_timeout(dev); } if (!mod_timer(&dev->watchdog_timer,
This also makes it printed under net_ratelimit instead of WARN_ON_ONCE. The backtrace never helped me much. Signed-off-by: Ben Greear <greearb@candelatech.com> --- :100644 100644 2aeb3a4... b52c450... M net/sched/sch_generic.c net/sched/sch_generic.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)