From 160d88109f3d5673051cecdcb0090cc3220938a2 Mon Sep 17 00:00:00 2001
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Sat, 26 Jan 2008 00:51:06 +0200
Subject: [PATCH] --- yaml --- r: 81839 b: refs/heads/master c:
 6e3bbcc5d75d187bb853a086e22cd813242f6b75 h: refs/heads/master i:   81837:
 ff100302a700d92d434e2c448230b2bf95562c4b   81835:
 343cb9ef6571942e18d05bb810117031b1b5e4b4   81831:
 dfe8fbde6beb126649bd3f0a54ffd59ee8b21f65   81823:
 bcfc5a6bca479473bd07f0d6c817f1f2a1bb72bc v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/usb/usbnet.c | 3 +++
 trunk/drivers/net/usb/usbnet.h | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 343a3bec1697..ac3d40313720 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a842edaca3985698b177e61115aee91bdf893f1d
+refs/heads/master: 6e3bbcc5d75d187bb853a086e22cd813242f6b75
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
index 8ed1fc5cbc70..a2a2d5e2c72e 100644
--- a/trunk/drivers/net/usb/usbnet.c
+++ b/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))
diff --git a/trunk/drivers/net/usb/usbnet.h b/trunk/drivers/net/usb/usbnet.h
index 1fae4347e831..29ab92e33e55 100644
--- a/trunk/drivers/net/usb/usbnet.h
+++ b/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 *);