]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
libertas: name the network device wlan%d
authorDaniel Mack <daniel@caiaq.de>
Tue, 11 Aug 2009 14:09:34 +0000 (16:09 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Aug 2009 13:14:03 +0000 (09:14 -0400)
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>
drivers/net/wireless/libertas/main.c

index 89575e448015d38884e76083d3d508cd9228b4b2..8df1cfd5f93a69c8cb397d1b73de62b271b315eb 100644 (file)
@@ -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);