summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-08-11 16:09:34 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:14:03 -0400
commitc00552c60840c32456ca9e45de758ac03e3d3c4f (patch)
treef98dc2844967de729fc497aba31129747313ecbf /drivers
parentcca89496a8afe4ad12ce1e468e60cef1e27e4eee (diff)
downloadlinux-3.10-c00552c60840c32456ca9e45de758ac03e3d3c4f.tar.gz
linux-3.10-c00552c60840c32456ca9e45de758ac03e3d3c4f.tar.bz2
linux-3.10-c00552c60840c32456ca9e45de758ac03e3d3c4f.zip
libertas: name the network device wlan%d
Devices created by the libertas driver are currently called eth%d. Which is wrong, because the device does not at all have anything to do with Ethernet. And it is also confusing when used on devices with more than one network device. Fix this by calling it wlan%d. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Roel Kluin <roel.kluin@gmail.com> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 89575e44801..8df1cfd5f93 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1176,7 +1176,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
/* Allocate an Ethernet device and register it */
dev = alloc_etherdev(sizeof(struct lbs_private));
if (!dev) {
- lbs_pr_err("init ethX device failed\n");
+ lbs_pr_err("init wlanX device failed\n");
goto done;
}
priv = netdev_priv(dev);
@@ -1204,6 +1204,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
SET_NETDEV_DEV(dev, dmdev);
priv->rtap_net_dev = NULL;
+ strcpy(dev->name, "wlan%d");
lbs_deb_thread("Starting main thread...\n");
init_waitqueue_head(&priv->waitq);