aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-08-11 10:09:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:14:03 -0400
commitc00552c60840c32456ca9e45de758ac03e3d3c4f (patch)
treef98dc2844967de729fc497aba31129747313ecbf /drivers/net/wireless/libertas/main.c
parentcca89496a8afe4ad12ce1e468e60cef1e27e4eee (diff)
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/net/wireless/libertas/main.c')
-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 89575e448015..8df1cfd5f93a 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)
1176 /* Allocate an Ethernet device and register it */ 1176 /* Allocate an Ethernet device and register it */
1177 dev = alloc_etherdev(sizeof(struct lbs_private)); 1177 dev = alloc_etherdev(sizeof(struct lbs_private));
1178 if (!dev) { 1178 if (!dev) {
1179 lbs_pr_err("init ethX device failed\n"); 1179 lbs_pr_err("init wlanX device failed\n");
1180 goto done; 1180 goto done;
1181 } 1181 }
1182 priv = netdev_priv(dev); 1182 priv = netdev_priv(dev);
@@ -1204,6 +1204,7 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
1204 SET_NETDEV_DEV(dev, dmdev); 1204 SET_NETDEV_DEV(dev, dmdev);
1205 1205
1206 priv->rtap_net_dev = NULL; 1206 priv->rtap_net_dev = NULL;
1207 strcpy(dev->name, "wlan%d");
1207 1208
1208 lbs_deb_thread("Starting main thread...\n"); 1209 lbs_deb_thread("Starting main thread...\n");
1209 init_waitqueue_head(&priv->waitq); 1210 init_waitqueue_head(&priv->waitq);