From dad818d595b2bedfa00e4823a871f316c3e447c9 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 26 Mar 2009 15:11:44 +0000
Subject: [PATCH] --- yaml --- r: 136095 b: refs/heads/master c:
 6d1ec7812d6350409ecfe7f6dded3a6c801b89d3 h: refs/heads/master i:   136093:
 9a37bed9ad99863a2a55d4e2eb4267e8135b317a   136091:
 0295d3c8e5657b691f977ab7c8c2c023db2f97e6   136087:
 6bd568f27ed1f06d0014bae3be5ba0aa9c4a7182   136079:
 5cec9654cf429d55f73c68d44ba1b3c2aae0fd7e   136063:
 eb4becd5e54d54a1e0881773cc568ecb9350a527 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/eth16i.c | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 78b661c18feb..3c8a27aa3f1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15d23e7a9e02c8ecbbf9a855e626707ba839135a
+refs/heads/master: 6d1ec7812d6350409ecfe7f6dded3a6c801b89d3
diff --git a/trunk/drivers/net/eth16i.c b/trunk/drivers/net/eth16i.c
index 5c048f2fd74f..0d8b6da046f2 100644
--- a/trunk/drivers/net/eth16i.c
+++ b/trunk/drivers/net/eth16i.c
@@ -475,6 +475,17 @@ struct net_device * __init eth16i_probe(int unit)
 }
 #endif
 
+static const struct net_device_ops eth16i_netdev_ops = {
+	.ndo_open               = eth16i_open,
+	.ndo_stop               = eth16i_close,
+	.ndo_start_xmit    	= eth16i_tx,
+	.ndo_set_multicast_list = eth16i_multicast,
+	.ndo_tx_timeout 	= eth16i_timeout,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 static int __init eth16i_probe1(struct net_device *dev, int ioaddr)
 {
 	struct eth16i_local *lp = netdev_priv(dev);
@@ -549,12 +560,7 @@ static int __init eth16i_probe1(struct net_device *dev, int ioaddr)
 	BITCLR(ioaddr + CONFIG_REG_1, POWERUP);
 
 	/* Initialize the device structure */
-	memset(lp, 0, sizeof(struct eth16i_local));
-	dev->open               = eth16i_open;
-	dev->stop               = eth16i_close;
-	dev->hard_start_xmit    = eth16i_tx;
-	dev->set_multicast_list = eth16i_multicast;
-	dev->tx_timeout 	= eth16i_timeout;
+	dev->netdev_ops         = &eth16i_netdev_ops;
 	dev->watchdog_timeo	= TX_TIMEOUT;
 	spin_lock_init(&lp->lock);