diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-09-08 07:50:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 21:41:59 -0700 |
| commit | c9cedbba0fc591e1c0587f838932ca3f3c6fec57 (patch) | |
| tree | 0e0111f7713bfb05974a42d803aa791b958af5be | |
| parent | 201b6bab6798fcd8ec1cb30165b91fdb89a91775 (diff) | |
| download | linux-3.10-c9cedbba0fc591e1c0587f838932ca3f3c6fec57.tar.gz linux-3.10-c9cedbba0fc591e1c0587f838932ca3f3c6fec57.tar.bz2 linux-3.10-c9cedbba0fc591e1c0587f838932ca3f3c6fec57.zip | |
ipheth: remove incorrect devtype to WWAN
The 'wwan' devtype is meant for devices that require preconfiguration
and *every* time setup before the ethernet interface can be used, like
cellular modems which require a series of setup commands on serial ports
or other mechanisms before the ethernet interface will handle packets.
As ipheth only requires one-per-hotplug pairing setup with no
preconfiguration (like APN, phone #, etc) and the network interface is
usable at any time after that initial setup, remove the incorrect
devtype wwan.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/ipheth.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index 8ed30fa35d0..b2bcf99e6f0 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -429,10 +429,6 @@ static const struct net_device_ops ipheth_netdev_ops = { .ndo_get_stats = &ipheth_stats, }; -static struct device_type ipheth_type = { - .name = "wwan", -}; - static int ipheth_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -450,7 +446,7 @@ static int ipheth_probe(struct usb_interface *intf, netdev->netdev_ops = &ipheth_netdev_ops; netdev->watchdog_timeo = IPHETH_TX_TIMEOUT; - strcpy(netdev->name, "wwan%d"); + strcpy(netdev->name, "eth%d"); dev = netdev_priv(netdev); dev->udev = udev; @@ -500,7 +496,6 @@ static int ipheth_probe(struct usb_interface *intf, SET_NETDEV_DEV(netdev, &intf->dev); SET_ETHTOOL_OPS(netdev, &ops); - SET_NETDEV_DEVTYPE(netdev, &ipheth_type); retval = register_netdev(netdev); if (retval) { |