From c4f924f5179e8bf5c7733223f405d94154e71969 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 7 Jan 2009 17:34:36 -0800
Subject: [PATCH] --- yaml --- r: 127796 b: refs/heads/master c:
 b8aa76a2bd9782e1a45e96602812910d5cfe7b52 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/de600.c | 14 +++++++++++---
 trunk/drivers/net/de620.c | 17 ++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b52f16117139..8bc0a26a39c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f5ec79b8ec357516fbe14904a47f619bb3b543d
+refs/heads/master: b8aa76a2bd9782e1a45e96602812910d5cfe7b52
diff --git a/trunk/drivers/net/de600.c b/trunk/drivers/net/de600.c
index 970f820ba814..de63f1d41d32 100644
--- a/trunk/drivers/net/de600.c
+++ b/trunk/drivers/net/de600.c
@@ -378,6 +378,16 @@ static void de600_rx_intr(struct net_device *dev)
 	 */
 }
 
+static const struct net_device_ops de600_netdev_ops = {
+	.ndo_open		= de600_open,
+	.ndo_stop		= de600_close,
+	.ndo_start_xmit		= de600_start_xmit,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
+
 static struct net_device * __init de600_probe(void)
 {
 	int	i;
@@ -439,9 +449,7 @@ static struct net_device * __init de600_probe(void)
 
 	printk(", Ethernet Address: %pM\n", dev->dev_addr);
 
-	dev->open = de600_open;
-	dev->stop = de600_close;
-	dev->hard_start_xmit = &de600_start_xmit;
+	dev->netdev_ops = &de600_netdev_ops;
 
 	dev->flags&=~IFF_MULTICAST;
 
diff --git a/trunk/drivers/net/de620.c b/trunk/drivers/net/de620.c
index bdfa89403389..d52f34cc9526 100644
--- a/trunk/drivers/net/de620.c
+++ b/trunk/drivers/net/de620.c
@@ -784,6 +784,17 @@ static int adapter_init(struct net_device *dev)
 	return 0; /* all ok */
 }
 
+static const struct net_device_ops de620_netdev_ops = {
+	.ndo_open 		= de620_open,
+	.ndo_stop 		= de620_close,
+	.ndo_start_xmit 	= de620_start_xmit,
+	.ndo_tx_timeout 	= de620_timeout,
+	.ndo_set_multicast_list = de620_set_multicast_list,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 /******************************************************************************
  *
  * Only start-up code below
@@ -861,12 +872,8 @@ struct net_device * __init de620_probe(int unit)
 	else
 		printk(" UTP)\n");
 
-	dev->open 		= de620_open;
-	dev->stop 		= de620_close;
-	dev->hard_start_xmit 	= de620_start_xmit;
-	dev->tx_timeout 	= de620_timeout;
+	dev->netdev_ops = &de620_netdev_ops;
 	dev->watchdog_timeo	= HZ*2;
-	dev->set_multicast_list = de620_set_multicast_list;
 
 	/* base_addr and irq are already set, see above! */