usbnet: Use wlan device name for RNDIS wireless devices

Use wlan device name for RNDIS wireless devices.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Bjorge Dijkstra <bjd@jooz.net>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 8ed1fc5cbc7025127ec289b494f433e6545f7ed3..a2a2d5e2c72ef40125ef856c94da38ee9ae885b3 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1204,6 +1204,9 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
                if ((dev->driver_info->flags & FLAG_ETHER) != 0
                                && (net->dev_addr [0] & 0x02) == 0)
                        strcpy (net->name, "eth%d");
+               /* WLAN devices should always be named "wlan%d" */
+               if ((dev->driver_info->flags & FLAG_WLAN) != 0)
+                       strcpy(net->name, "wlan%d");
 
                /* maybe the remote can't receive an Ethernet MTU */
                if (net->mtu > (dev->hard_mtu - net->hard_header_len))

diff --git a/drivers/net/usb/usbnet.h b/drivers/net/usb/usbnet.h
index 1fae4347e8316eef06f8e9319f618e413f51e32b..29ab92e33e55d41d236649b7c8b2fd69cd8bafde 100644 (file)
--- a/drivers/net/usb/usbnet.h
+++ b/drivers/net/usb/usbnet.h
@@ -87,6 +87,8 @@ struct driver_info {
 #define FLAG_ETHER     0x0020          /* maybe use "eth%d" names */
 
 #define FLAG_FRAMING_AX 0x0040         /* AX88772/178 packets */
+#define FLAG_WLAN      0x0080          /* use "wlan%d" names */
+
 
        /* init device ... can sleep, or cause probe() failure */
        int     (*bind)(struct usbnet *, struct usb_interface *);