[PATCH 06/14] [usbnet] Use wlan device name for RNDIS wireless devices

2008-01-25 Thread Jussi Kivilinna 
Use wlan device name for RNDIS wireless devices.

Signed-off-by: Jussi Kivilinna [EMAIL PROTECTED]
Signed-off-by: Bjorge Dijkstra [EMAIL PROTECTED]
---

 drivers/net/usb/usbnet.c |3 +++
 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 8ed1fc5..a2a2d5e 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 1fae434..29ab92e 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 *);

--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 06/14] [usbnet] Use wlan device name for RNDIS wireless devices

2008-01-24 Thread David Brownell 
On Saturday 19 January 2008, Jussi Kivilinna wrote:
 Use wlan device name for RNDIS wireless devices.
 
 Signed-off-by: Jussi Kivilinna [EMAIL PROTECTED]
 Signed-off-by: Bjorge Dijkstra [EMAIL PROTECTED]

Acked-by: David Brownell [EMAIL PROTECTED]

 ---
 
  drivers/net/usb/usbnet.c |3 +++
  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 8ed1fc5..a2a2d5e 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 1fae434..29ab92e 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_WLAN0x0080  /* use wlan%d names */
 +
  
   /* init device ... can sleep, or cause probe() failure */
   int (*bind)(struct usbnet *, struct usb_interface *);
 


--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 06/14] [usbnet] Use wlan device name for RNDIS wireless devices

2008-01-19 Thread Jussi Kivilinna 
Use wlan device name for RNDIS wireless devices.

Signed-off-by: Jussi Kivilinna [EMAIL PROTECTED]
Signed-off-by: Bjorge Dijkstra [EMAIL PROTECTED]
---

 drivers/net/usb/usbnet.c |3 +++
 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 8ed1fc5..a2a2d5e 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 1fae434..29ab92e 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 *);

--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html