From d7b9548e2de80c36b772dd3888ae27b150fd72c6 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Sat, 11 Apr 2009 07:39:58 +0000
Subject: [PATCH] --- yaml --- r: 143439 b: refs/heads/master c:
 7e4fdcb99cd578c800fb7d6c298950a2938f9ca6 h: refs/heads/master i:   143437:
 f91ee09ed7c062c1fcf17667156ba6e4e7f32cb7   143435:
 c03e64cefc00e934cc90f2effa7b4b7f43bdea7f   143431:
 1af3ad92cdabd9ac241faed6a23f3ef88f7ca731   143423:
 c732cb3b2fd22fc73cd7e9608027fa7fe7995146 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/sun3_82586.c | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4b2aeb2c0f98..5bfca468abeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a1c28b3e4aa0ac755d73363fd1c84c0063c06be
+refs/heads/master: 7e4fdcb99cd578c800fb7d6c298950a2938f9ca6
diff --git a/trunk/drivers/net/sun3_82586.c b/trunk/drivers/net/sun3_82586.c
index e0d84772771c..a39c0b9ba8b6 100644
--- a/trunk/drivers/net/sun3_82586.c
+++ b/trunk/drivers/net/sun3_82586.c
@@ -331,6 +331,18 @@ struct net_device * __init sun3_82586_probe(int unit)
 	return ERR_PTR(err);
 }
 
+static const struct net_device_ops sun3_82586_netdev_ops = {
+	.ndo_open		= sun3_82586_open,
+	.ndo_stop		= sun3_82586_close,
+	.ndo_start_xmit		= sun3_82586_send_packet,
+	.ndo_set_multicast_list	= set_multicast_list,
+	.ndo_tx_timeout		= sun3_82586_timeout,
+	.ndo_get_stats		= sun3_82586_get_stats,
+	.ndo_validate_addr	= eth_validate_addr,
+	.ndo_set_mac_address	= eth_mac_addr,
+	.ndo_change_mtu		= eth_change_mtu,
+};
+
 static int __init sun3_82586_probe1(struct net_device *dev,int ioaddr)
 {
 	int i, size, retval;
@@ -381,13 +393,8 @@ static int __init sun3_82586_probe1(struct net_device *dev,int ioaddr)
 
 	printk("Memaddr: 0x%lx, Memsize: %d, IRQ %d\n",dev->mem_start,size, dev->irq);
 
-	dev->open		= sun3_82586_open;
-	dev->stop		= sun3_82586_close;
-	dev->get_stats		= sun3_82586_get_stats;
-	dev->tx_timeout 	= sun3_82586_timeout;
+	dev->netdev_ops		= &sun3_82586_netdev_ops;
 	dev->watchdog_timeo	= HZ/20;
-	dev->hard_start_xmit 	= sun3_82586_send_packet;
-	dev->set_multicast_list = set_multicast_list;
 
 	dev->if_port 		= 0;
 	return 0;