From 542dcd60ea300238d7bf15bcd5a415d7ea3ec711 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 6 Jun 2011 16:41:33 -0700
Subject: [PATCH] --- yaml --- r: 253401 b: refs/heads/master c:
 3019de124b9f5b1526cb3668b74af14371e21795 h: refs/heads/master i:   253399:
 1672cd1ea151f025c922212592be5ad26be84e66 v: v3

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

diff --git a/[refs] b/[refs]
index 7ba4d2f69d72..c1b7b516f278 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a079c305ad4dda9708b7a29db4a8bd38e21c3a6
+refs/heads/master: 3019de124b9f5b1526cb3668b74af14371e21795
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index ca333e79e10f..54b8b4d7b68f 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -2555,7 +2555,7 @@ extern void netdev_class_remove_file(struct class_attribute *class_attr);
 
 extern struct kobj_ns_type_operations net_ns_type_operations;
 
-extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len);
+extern const char *netdev_drivername(const struct net_device *dev);
 
 extern void linkwatch_run_queue(void);
 
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 939307891e71..1af6cb27f67a 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -6264,29 +6264,23 @@ static int __net_init netdev_init(struct net *net)
 /**
  *	netdev_drivername - network driver for the device
  *	@dev: network device
- *	@buffer: buffer for resulting name
- *	@len: size of buffer
  *
  *	Determine network driver for device.
  */
-char *netdev_drivername(const struct net_device *dev, char *buffer, int len)
+const char *netdev_drivername(const struct net_device *dev)
 {
 	const struct device_driver *driver;
 	const struct device *parent;
-
-	if (len <= 0 || !buffer)
-		return buffer;
-	buffer[0] = 0;
+	const char *empty = "";
 
 	parent = dev->dev.parent;
-
 	if (!parent)
-		return buffer;
+		return empty;
 
 	driver = parent->driver;
 	if (driver && driver->name)
-		strlcpy(buffer, driver->name, len);
-	return buffer;
+		return driver->name;
+	return empty;
 }
 
 static int __netdev_printk(const char *level, const struct net_device *dev,
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index b1721d71c27c..b4c680900d7a 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -251,9 +251,8 @@ 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);
+				       dev->name, netdev_drivername(dev), i);
 				dev->netdev_ops->ndo_tx_timeout(dev);
 			}
 			if (!mod_timer(&dev->watchdog_timer,