aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-07-21 16:31:48 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-21 16:31:48 -0400
commit6579e57b31d79d31d9b806e41ba48774e73257dc (patch)
tree03ba72024a1982ee76b8a891a443b0fdfb6d7c93 /net
parent7943986ca1138ac99597b1aa4dc893012dcfdc08 (diff)
net: Print the module name as part of the watchdog message
As suggested by Dave: This patch adds a function to get the driver name from a struct net_device, and consequently uses this in the watchdog timeout handler to print as part of the message. 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/core/dev.c20
-rw-r--r--net/sched/sch_generic.c6
2 files changed, 23 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 1698b399898..ad5598d2bb3 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4686,6 +4686,26 @@ err_name:
4686 return -ENOMEM; 4686 return -ENOMEM;
4687} 4687}
4688 4688
4689char *netdev_drivername(struct net_device *dev, char *buffer, int len)
4690{
4691 struct device_driver *driver;
4692 struct device *parent;
4693
4694 if (len <= 0 || !buffer)
4695 return buffer;
4696 buffer[0] = 0;
4697
4698 parent = dev->dev.parent;
4699
4700 if (!parent)
4701 return buffer;
4702
4703 driver = parent->driver;
4704 if (driver && driver->name)
4705 strlcpy(buffer, driver->name, len);
4706 return buffer;
4707}
4708
4689static void __net_exit netdev_exit(struct net *net) 4709static void __net_exit netdev_exit(struct net *net)
4690{ 4710{
4691 kfree(net->dev_name_head); 4711 kfree(net->dev_name_head);
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index cb625b4d6da..4ac7e3a8c25 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -212,9 +212,9 @@ static void dev_watchdog(unsigned long arg)
212 if (some_queue_stopped && 212 if (some_queue_stopped &&
213 time_after(jiffies, (dev->trans_start + 213 time_after(jiffies, (dev->trans_start +
214 dev->watchdog_timeo))) { 214 dev->watchdog_timeo))) {
215 printk(KERN_INFO "NETDEV WATCHDOG: %s: " 215 char drivername[64];
216 "transmit timed out\n", 216 printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
217 dev->name); 217 dev->name, netdev_drivername(dev, drivername, 64));
218 dev->tx_timeout(dev); 218 dev->tx_timeout(dev);
219 WARN_ON_ONCE(1); 219 WARN_ON_ONCE(1);
220 } 220 }