staging: at76_usb convert to netdev_ops
diff mbox

Message ID 20090331201850.GC25513@bombadil.infradead.org
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Kyle McMartin March 31, 2009, 8:18 p.m. UTC
From: Kyle McMartin <kyle@redhat.com>

Didn't see this in your patch queue, fixes build on Fedora, though we'll
probably end up turning on CONFIG_COMPAT_NET_DEV_OPS for now anyway.

Signed-off-by: Kyle McMartin <kyle@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

Comments

David Miller March 31, 2009, 9:11 p.m. UTC | #1
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Tue, 31 Mar 2009 16:18:50 -0400

> Didn't see this in your patch queue, fixes build on Fedora, though we'll
> probably end up turning on CONFIG_COMPAT_NET_DEV_OPS for now anyway.
> 
> Signed-off-by: Kyle McMartin <kyle@redhat.com>

Acked-by: David S. Miller <davem@davemloft.net>
--
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
Kyle McMartin April 1, 2009, 5:24 p.m. UTC | #2
On Tue, Mar 31, 2009 at 02:11:39PM -0700, David Miller wrote:
> From: Kyle McMartin <kyle@mcmartin.ca>
> Date: Tue, 31 Mar 2009 16:18:50 -0400
> 
> > Didn't see this in your patch queue, fixes build on Fedora, though we'll
> > probably end up turning on CONFIG_COMPAT_NET_DEV_OPS for now anyway.
> > 
> > Signed-off-by: Kyle McMartin <kyle@redhat.com>
> 
> Acked-by: David S. Miller <davem@davemloft.net>
>

Oops,

Alexander Beregalov already submitted this. My mistake, must have missed
it when I scanned for a fix...

cheers, Kyle
--
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 mbox

diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index c8e4d31..59071e6 100644
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -5259,6 +5259,18 @@  static int at76_alloc_urbs(struct at76_priv *priv,
 	return 0;
 }
 
+static const struct net_device_ops at76_netdev_ops = {
+	.ndo_open 		= at76_open,
+	.ndo_stop		= at76_stop,
+	.ndo_get_stats		= at76_get_stats,
+	.ndo_start_xmit		= at76_tx,
+	.ndo_tx_timeout		= at76_tx_timeout,
+	.ndo_set_multicast_list	= at76_set_multicast,
+	.ndo_set_mac_address	= at76_set_mac_address,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 /* Register network device and initialize the hardware */
 static int at76_init_new_device(struct at76_priv *priv,
 				struct usb_interface *interface)
@@ -5303,22 +5315,18 @@  static int at76_init_new_device(struct at76_priv *priv,
 	priv->scan_mode = SCAN_TYPE_ACTIVE;
 
 	netdev->flags &= ~IFF_MULTICAST;	/* not yet or never */
-	netdev->open = at76_open;
-	netdev->stop = at76_stop;
-	netdev->get_stats = at76_get_stats;
+
+	netdev->netdev_ops = &at76_netdev_ops;
 	netdev->ethtool_ops = &at76_ethtool_ops;
 
+	dev_alloc_name(netdev, "wlan%d");
+
 	/* Add pointers to enable iwspy support. */
 	priv->wireless_data.spy_data = &priv->spy_data;
 	netdev->wireless_data = &priv->wireless_data;
 
-	netdev->hard_start_xmit = at76_tx;
-	netdev->tx_timeout = at76_tx_timeout;
 	netdev->watchdog_timeo = 2 * HZ;
 	netdev->wireless_handlers = &at76_handler_def;
-	netdev->set_multicast_list = at76_set_multicast;
-	netdev->set_mac_address = at76_set_mac_address;
-	dev_alloc_name(netdev, "wlan%d");
 
 	ret = register_netdev(priv->netdev);
 	if (ret) {