Patchwork [06/42] ipg: update to net_device_ops

login
register
mail settings
Submitter stephen hemminger
Date Jan. 7, 2009, 12:33 a.m.
Message ID <20090107003346.112191664@vyatta.com>
Download mbox | patch
Permalink /patch/16991/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - Jan. 7, 2009, 12:33 a.m.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Pekka Enberg - Jan. 7, 2009, 7:59 a.m.
On Tue, 2009-01-06 at 16:33 -0800, Stephen Hemminger wrote:
> plain text document attachment (ipg.patch)
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Looks good to me.

Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>

> --- a/drivers/net/ipg.c	2009-01-05 16:45:32.729571177 -0800
> +++ b/drivers/net/ipg.c	2009-01-05 16:48:07.518569219 -0800
> @@ -2210,6 +2210,19 @@ static void __devexit ipg_remove(struct 
>  	pci_set_drvdata(pdev, NULL);
>  }
>  
> +static const struct net_device_ops ipg_netdev_ops = {
> +	.ndo_open		= ipg_nic_open,
> +	.ndo_stop		= ipg_nic_stop,
> +	.ndo_start_xmit		= ipg_nic_hard_start_xmit,
> +	.ndo_get_stats		= ipg_nic_get_stats,
> +	.ndo_set_multicast_list = ipg_nic_set_multicast_list,
> +	.ndo_do_ioctl		= ipg_ioctl,
> +	.ndo_tx_timeout 	= ipg_tx_timeout,
> +	.ndo_change_mtu 	= ipg_nic_change_mtu,
> +	.ndo_set_mac_address	= eth_mac_addr,
> +	.ndo_validate_addr	= eth_validate_addr,
> +};
> +
>  static int __devinit ipg_probe(struct pci_dev *pdev,
>  			       const struct pci_device_id *id)
>  {
> @@ -2258,15 +2271,7 @@ static int __devinit ipg_probe(struct pc
>  
>  	/* Declare IPG NIC functions for Ethernet device methods.
>  	 */
> -	dev->open = &ipg_nic_open;
> -	dev->stop = &ipg_nic_stop;
> -	dev->hard_start_xmit = &ipg_nic_hard_start_xmit;
> -	dev->get_stats = &ipg_nic_get_stats;
> -	dev->set_multicast_list = &ipg_nic_set_multicast_list;
> -	dev->do_ioctl = ipg_ioctl;
> -	dev->tx_timeout = ipg_tx_timeout;
> -	dev->change_mtu = &ipg_nic_change_mtu;
> -
> +	dev->netdev_ops = &ipg_netdev_ops;
>  	SET_NETDEV_DEV(dev, &pdev->dev);
>  	SET_ETHTOOL_OPS(dev, &ipg_ethtool_ops);
>  
> 

--
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:26 a.m.
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 07 Jan 2009 09:59:58 +0200

> On Tue, 2009-01-06 at 16:33 -0800, Stephen Hemminger wrote:
> > plain text document attachment (ipg.patch)
> > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> 
> Looks good to me.
> 
> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>

Applied, thanks everyone.
--
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

--- a/drivers/net/ipg.c	2009-01-05 16:45:32.729571177 -0800
+++ b/drivers/net/ipg.c	2009-01-05 16:48:07.518569219 -0800
@@ -2210,6 +2210,19 @@  static void __devexit ipg_remove(struct 
 	pci_set_drvdata(pdev, NULL);
 }
 
+static const struct net_device_ops ipg_netdev_ops = {
+	.ndo_open		= ipg_nic_open,
+	.ndo_stop		= ipg_nic_stop,
+	.ndo_start_xmit		= ipg_nic_hard_start_xmit,
+	.ndo_get_stats		= ipg_nic_get_stats,
+	.ndo_set_multicast_list = ipg_nic_set_multicast_list,
+	.ndo_do_ioctl		= ipg_ioctl,
+	.ndo_tx_timeout 	= ipg_tx_timeout,
+	.ndo_change_mtu 	= ipg_nic_change_mtu,
+	.ndo_set_mac_address	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 static int __devinit ipg_probe(struct pci_dev *pdev,
 			       const struct pci_device_id *id)
 {
@@ -2258,15 +2271,7 @@  static int __devinit ipg_probe(struct pc
 
 	/* Declare IPG NIC functions for Ethernet device methods.
 	 */
-	dev->open = &ipg_nic_open;
-	dev->stop = &ipg_nic_stop;
-	dev->hard_start_xmit = &ipg_nic_hard_start_xmit;
-	dev->get_stats = &ipg_nic_get_stats;
-	dev->set_multicast_list = &ipg_nic_set_multicast_list;
-	dev->do_ioctl = ipg_ioctl;
-	dev->tx_timeout = ipg_tx_timeout;
-	dev->change_mtu = &ipg_nic_change_mtu;
-
+	dev->netdev_ops = &ipg_netdev_ops;
 	SET_NETDEV_DEV(dev, &pdev->dev);
 	SET_ETHTOOL_OPS(dev, &ipg_ethtool_ops);