summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-09-08 16:17:42 -0700
committerDavid S. Miller <davem@davemloft.net>2008-09-08 16:17:42 -0700
commit5337407c673e2c7c66a84b9838d55a45a760ecff (patch)
tree808dca75793172fa5315af638bf04696a2c4d7cc /net
parent9bff9dbd00e5907f5c36e72bae8aee8a46440e11 (diff)
downloadlinux-3.10-5337407c673e2c7c66a84b9838d55a45a760ecff.tar.gz
linux-3.10-5337407c673e2c7c66a84b9838d55a45a760ecff.tar.bz2
linux-3.10-5337407c673e2c7c66a84b9838d55a45a760ecff.zip
warn: Turn the netdev timeout WARN_ON() into a WARN()
this patch turns the netdev timeout WARN_ON_ONCE() into a WARN_ONCE(), so that the device and driver names are inside the warning message. This helps automated tools like kerneloops.org to collect the data and do statistics, as well as making it more likely that humans cut-n-paste the important message as part of a bugreport. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_generic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 9634091ee2f..ec0a0839ce5 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -215,10 +215,9 @@ static void dev_watchdog(unsigned long arg)
time_after(jiffies, (dev->trans_start +
dev->watchdog_timeo))) {
char drivername[64];
- printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
+ WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
dev->name, netdev_drivername(dev, drivername, 64));
dev->tx_timeout(dev);
- WARN_ON_ONCE(1);
}
if (!mod_timer(&dev->watchdog_timer,
round_jiffies(jiffies +