From ad2739e65cdfc0f7f2bf4dbb5e8c967cf9db274a Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 21 Jul 2008 13:31:48 -0700
Subject: [PATCH] --- yaml --- r: 104875 b: refs/heads/master c:
 6579e57b31d79d31d9b806e41ba48774e73257dc h: refs/heads/master i:   104873:
 edb0a21f605ef31cd89fa3d1c135ef3456b69318   104871:
 d1178ea6f8d6fefda68b85e49513b6e05a4b68dd v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/netdevice.h |  2 ++
 trunk/net/core/dev.c            | 20 ++++++++++++++++++++
 trunk/net/sched/sch_generic.c   |  6 +++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 150232c9d96a..02428ed5f4f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7943986ca1138ac99597b1aa4dc893012dcfdc08
+refs/heads/master: 6579e57b31d79d31d9b806e41ba48774e73257dc
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 812bcd8b4363..f5ea445f89f0 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1645,6 +1645,8 @@ extern void dev_seq_stop(struct seq_file *seq, void *v);
 extern int netdev_class_create_file(struct class_attribute *class_attr);
 extern void netdev_class_remove_file(struct class_attribute *class_attr);
 
+extern char *netdev_drivername(struct net_device *dev, char *buffer, int len);
+
 extern void linkwatch_run_queue(void);
 
 extern int netdev_compute_features(unsigned long all, unsigned long one);
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 1698b3998981..ad5598d2bb37 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -4686,6 +4686,26 @@ static int __net_init netdev_init(struct net *net)
 	return -ENOMEM;
 }
 
+char *netdev_drivername(struct net_device *dev, char *buffer, int len)
+{
+	struct device_driver *driver;
+	struct device *parent;
+
+	if (len <= 0 || !buffer)
+		return buffer;
+	buffer[0] = 0;
+
+	parent = dev->dev.parent;
+
+	if (!parent)
+		return buffer;
+
+	driver = parent->driver;
+	if (driver && driver->name)
+		strlcpy(buffer, driver->name, len);
+	return buffer;
+}
+
 static void __net_exit netdev_exit(struct net *net)
 {
 	kfree(net->dev_name_head);
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index cb625b4d6da5..4ac7e3a8c253 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -212,9 +212,9 @@ static void dev_watchdog(unsigned long arg)
 			if (some_queue_stopped &&
 			    time_after(jiffies, (dev->trans_start +
 						 dev->watchdog_timeo))) {
-				printk(KERN_INFO "NETDEV WATCHDOG: %s: "
-				       "transmit timed out\n",
-				       dev->name);
+				char drivername[64];
+				printk(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);
 			}