Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e3bbcc5 authored Jan 26, 2008 by Jussi Kivilinna Committed by David S. Miller Jan 31, 2008

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>

parent a842edac

drivers/net/usb/usbnet.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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))

drivers/net/usb/usbnet.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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 *);