From 55c9b5e8163818b57a170265a0abf6bee18770b5 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Sat, 11 Apr 2009 07:44:06 +0000
Subject: [PATCH] --- yaml --- r: 143444 b: refs/heads/master c:
 9b6bfecd6556b9844a70147fe94dd86bb00aee97 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/net/isa-skeleton.c | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 62e677be029f..b3d142a82ab4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0174aea3ee8d51a82b5793c3a177efff89121fa
+refs/heads/master: 9b6bfecd6556b9844a70147fe94dd86bb00aee97
diff --git a/trunk/drivers/net/isa-skeleton.c b/trunk/drivers/net/isa-skeleton.c
index 3126678bdd3c..73585fd8f29f 100644
--- a/trunk/drivers/net/isa-skeleton.c
+++ b/trunk/drivers/net/isa-skeleton.c
@@ -181,6 +181,18 @@ struct net_device * __init netcard_probe(int unit)
 }
 #endif
 
+static const struct net_device_ops netcard_netdev_ops = {
+	.ndo_open		= net_open,
+	.ndo_stop		= net_close,
+	.ndo_start_xmit		= net_send_packet,
+	.ndo_get_stats		= net_get_stats,
+	.ndo_set_multicast_list	= set_multicast_list,
+	.ndo_tx_timeout		= net_tx_timeout,
+	.ndo_validate_addr	= eth_validate_addr,
+	.ndo_set_mac_address	= eth_mac_addr,
+	.ndo_change_mtu		= eth_change_mtu,
+};
+
 /*
  * This is the real probe routine. Linux has a history of friendly device
  * probes on the ISA bus. A good device probes avoids doing writes, and
@@ -303,13 +315,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
 	np = netdev_priv(dev);
 	spin_lock_init(&np->lock);
 
-	dev->open		= net_open;
-	dev->stop		= net_close;
-	dev->hard_start_xmit	= net_send_packet;
-	dev->get_stats		= net_get_stats;
-	dev->set_multicast_list = &set_multicast_list;
-
-        dev->tx_timeout		= &net_tx_timeout;
+        dev->netdev_ops		= &netcard_netdev_ops;
         dev->watchdog_timeo	= MY_TX_TIMEOUT;
 
 	err = register_netdev(dev);