Subject: [PATCH 23/33] e1000: convert to net_device_ops

From: Stephen Hemminger <[email-masked]>
Date: Mon, 17 Nov 2008 15:42:30 -0800

Convert to new network device ops interface.

Signed-off-by: Stephen Hemminger <[email-masked]>

--- a/drivers/net/e1000/e1000_main.c	2008-11-17 07:57:18.000000000 -0800
+++ b/drivers/net/e1000/e1000_main.c	2008-11-17 12:55:04.000000000 -0800
@@ -888,6 +888,25 @@ static int e1000_is_need_ioport(struct p
 	}
 }
 
+static const struct net_device_ops e1000_netdev_ops = {
+	.open		= e1000_open,
+	.stop		= e1000_close,
+	.get_stats	= e1000_get_stats,
+	.set_rx_mode	= e1000_set_rx_mode,
+	.set_mac_address = e1000_set_mac,
+	.tx_timeout 	= e1000_tx_timeout,
+	.change_mtu	= e1000_change_mtu,
+	.do_ioctl	= e1000_ioctl,
+	.validate_addr	= eth_validate_addr,
+
+	.vlan_rx_register = e1000_vlan_rx_register,
+	.vlan_rx_add_vid = e1000_vlan_rx_add_vid,
+	.vlan_rx_kill_vid = e1000_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.poll_controller = e1000_netpoll,
+#endif
+};
+
 /**
  * e1000_probe - Device Initialization Routine
  * @pdev: PCI device information struct
@@ -981,24 +1000,12 @@ static int __devinit e1000_probe(struct 
 		}
 	}
 
-	netdev->open = &e1000_open;
-	netdev->stop = &e1000_close;
+	netdev->netdev_ops = &e1000_netdev_ops;
 	netdev->hard_start_xmit = &e1000_xmit_frame;
-	netdev->get_stats = &e1000_get_stats;
-	netdev->set_rx_mode = &e1000_set_rx_mode;
-	netdev->set_mac_address = &e1000_set_mac;
-	netdev->change_mtu = &e1000_change_mtu;
-	netdev->do_ioctl = &e1000_ioctl;
 	e1000_set_ethtool_ops(netdev);
-	netdev->tx_timeout = &e1000_tx_timeout;
 	netdev->watchdog_timeo = 5 * HZ;
 	netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
-	netdev->vlan_rx_register = e1000_vlan_rx_register;
-	netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid;
-	netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	netdev->poll_controller = e1000_netpoll;
-#endif
+
 	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 
 	adapter->bd_number = cards_found;

--