---

yaml
---
r: 81839
b: refs/heads/master
c: 6e3bbcc
h: refs/heads/master
i:
  81837: ff10030
  81835: 343cb9e
  81831: dfe8fbd
  81823: bcfc5a6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a842edaca3985698b177e61115aee91bdf893f1d
+refs/heads/master: 6e3bbcc5d75d187bb853a086e22cd813242f6b75

trunk/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))

trunk/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 *);