Patchwork ipheth: remove incorrect devtype to WWAN

login
register
mail settings
Submitter Dan Williams
Date Sept. 8, 2010, 5:50 p.m.
Message ID <1283968247.2839.14.camel@dcbw.foobar.com>
Download mbox | patch
Permalink /patch/64186/
State Accepted
Delegated to: David Miller
Headers show

Comments

Dan Williams - Sept. 8, 2010, 5:50 p.m.
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>
---


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Sept. 10, 2010, 4:42 a.m.
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 08 Sep 2010 12:50:47 -0500

> 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>

Applied, thanks Dan.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 08e7b6a..3388569 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -424,10 +424,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)
 {
@@ -445,7 +441,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;
@@ -495,7 +491,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) {