diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2008-01-25 23:51:06 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-01 04:26:55 +0100 |
| commit | 6e3bbcc5d75d187bb853a086e22cd813242f6b75 (patch) | |
| tree | e656c2f83a0a1d619688aaa65216268407436d9f | |
| parent | rndis_host: Fix rndis packet filter flags. (diff) | |
| download | linux-6e3bbcc5d75d187bb853a086e22cd813242f6b75.tar.xz linux-6e3bbcc5d75d187bb853a086e22cd813242f6b75.zip | |
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>
| -rw-r--r-- | drivers/net/usb/usbnet.c | 3 | ||||
| -rw-r--r-- | drivers/net/usb/usbnet.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 8ed1fc5cbc70..a2a2d5e2c72e 100644 --- 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 1fae4347e831..29ab92e33e55 100644 --- 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 *); |