diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-10-02 01:15:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-05 03:43:33 -0400 |
commit | 225794f8c33fd32721ae1cd3576db99810351d7b (patch) | |
tree | eb5ddc217354292080984a3d848f5932814da943 /drivers | |
parent | e1e499eef2200c2a7120c9ebf297d48b195cf887 (diff) |
usbnet: Set device type for wlan and wwan devices
For usbnet devices with FLAG_WLAN and FLAG_WWAN set the proper device
type so that uevent contains the correct value. This then allows an easy
identification of the actual underlying technology of the Ethernet device.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/usb/usbnet.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 8124cf16259f..378da8c938fe 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -1210,6 +1210,14 @@ static const struct net_device_ops usbnet_netdev_ops = { | |||
1210 | 1210 | ||
1211 | // precondition: never called in_interrupt | 1211 | // precondition: never called in_interrupt |
1212 | 1212 | ||
1213 | static struct device_type wlan_type = { | ||
1214 | .name = "wlan", | ||
1215 | }; | ||
1216 | |||
1217 | static struct device_type wwan_type = { | ||
1218 | .name = "wwan", | ||
1219 | }; | ||
1220 | |||
1213 | int | 1221 | int |
1214 | usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | 1222 | usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) |
1215 | { | 1223 | { |
@@ -1325,6 +1333,12 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
1325 | dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1); | 1333 | dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1); |
1326 | 1334 | ||
1327 | SET_NETDEV_DEV(net, &udev->dev); | 1335 | SET_NETDEV_DEV(net, &udev->dev); |
1336 | |||
1337 | if ((dev->driver_info->flags & FLAG_WLAN) != 0) | ||
1338 | SET_NETDEV_DEVTYPE(net, &wlan_type); | ||
1339 | if ((dev->driver_info->flags & FLAG_WWAN) != 0) | ||
1340 | SET_NETDEV_DEVTYPE(net, &wwan_type); | ||
1341 | |||
1328 | status = register_netdev (net); | 1342 | status = register_netdev (net); |
1329 | if (status) | 1343 | if (status) |
1330 | goto out3; | 1344 | goto out3; |