diff mbox

[25/42] de2104x: convert to net_device_ops

Message ID 20090107003348.195639787@vyatta.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

stephen hemminger Jan. 7, 2009, 12:33 a.m. UTC
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Comments

Grant Grundler Jan. 7, 2009, 7:50 a.m. UTC | #1
On Tue, Jan 06, 2009 at 04:33:41PM -0800, Stephen Hemminger wrote:
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Acked-by: Grant Grundler <grundler@parisc-linux.org>

thanks,
grant

> 
> --- a/drivers/net/tulip/de2104x.c	2009-01-06 16:08:31.161363983 -0800
> +++ b/drivers/net/tulip/de2104x.c	2009-01-06 16:14:57.956742918 -0800
> @@ -1922,6 +1922,18 @@ bad_srom:
>  	goto fill_defaults;
>  }
>  
> +static const struct net_device_ops de_netdev_ops = {
> +	.ndo_open		= de_open,
> +	.ndo_stop		= de_close,
> +	.ndo_set_multicast_list = de_set_rx_mode,
> +	.ndo_start_xmit		= de_start_xmit,
> +	.ndo_get_stats		= de_get_stats,
> +	.ndo_tx_timeout 	= de_tx_timeout,
> +	.ndo_change_mtu		= eth_change_mtu,
> +	.ndo_set_mac_address 	= eth_mac_addr,
> +	.ndo_validate_addr	= eth_validate_addr,
> +};
> +
>  static int __devinit de_init_one (struct pci_dev *pdev,
>  				  const struct pci_device_id *ent)
>  {
> @@ -1944,14 +1956,9 @@ static int __devinit de_init_one (struct
>  	if (!dev)
>  		return -ENOMEM;
>  
> +	dev->netdev_ops = &de_netdev_ops;
>  	SET_NETDEV_DEV(dev, &pdev->dev);
> -	dev->open = de_open;
> -	dev->stop = de_close;
> -	dev->set_multicast_list = de_set_rx_mode;
> -	dev->hard_start_xmit = de_start_xmit;
> -	dev->get_stats = de_get_stats;
>  	dev->ethtool_ops = &de_ethtool_ops;
> -	dev->tx_timeout = de_tx_timeout;
>  	dev->watchdog_timeo = TX_TIMEOUT;
>  
>  	de = netdev_priv(dev);
> 
> -- 
--
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 Jan. 8, 2009, 1:59 a.m. UTC | #2
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 06 Jan 2009 16:33:41 -0800

> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
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
diff mbox

Patch

--- a/drivers/net/tulip/de2104x.c	2009-01-06 16:08:31.161363983 -0800
+++ b/drivers/net/tulip/de2104x.c	2009-01-06 16:14:57.956742918 -0800
@@ -1922,6 +1922,18 @@  bad_srom:
 	goto fill_defaults;
 }
 
+static const struct net_device_ops de_netdev_ops = {
+	.ndo_open		= de_open,
+	.ndo_stop		= de_close,
+	.ndo_set_multicast_list = de_set_rx_mode,
+	.ndo_start_xmit		= de_start_xmit,
+	.ndo_get_stats		= de_get_stats,
+	.ndo_tx_timeout 	= de_tx_timeout,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 static int __devinit de_init_one (struct pci_dev *pdev,
 				  const struct pci_device_id *ent)
 {
@@ -1944,14 +1956,9 @@  static int __devinit de_init_one (struct
 	if (!dev)
 		return -ENOMEM;
 
+	dev->netdev_ops = &de_netdev_ops;
 	SET_NETDEV_DEV(dev, &pdev->dev);
-	dev->open = de_open;
-	dev->stop = de_close;
-	dev->set_multicast_list = de_set_rx_mode;
-	dev->hard_start_xmit = de_start_xmit;
-	dev->get_stats = de_get_stats;
 	dev->ethtool_ops = &de_ethtool_ops;
-	dev->tx_timeout = de_tx_timeout;
 	dev->watchdog_timeo = TX_TIMEOUT;
 
 	de = netdev_priv(dev);