From ed4f97bc2925e9858b6376fb21ca9f936ee29e53 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 25 Nov 2008 18:23:59 -0800
Subject: [PATCH] --- yaml --- r: 122237 b: refs/heads/master c:
 9a9aa14a74d49f88e2c2a126b035c22bd1ab0d53 h: refs/heads/master i:   122235:
 56a35a524648b0c13f77f974ba672d2c4a193d86 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/es3210.c | 25 +------------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 7f792e996e84..40fd2b591cc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d269941b5b562d21ae37b2182846702a4a43f415
+refs/heads/master: 9a9aa14a74d49f88e2c2a126b035c22bd1ab0d53
diff --git a/trunk/drivers/net/es3210.c b/trunk/drivers/net/es3210.c
index e7df9f4a183d..5569f2ffb62c 100644
--- a/trunk/drivers/net/es3210.c
+++ b/trunk/drivers/net/es3210.c
@@ -64,9 +64,6 @@ static const char version[] =
 
 static int es_probe1(struct net_device *dev, int ioaddr);
 
-static int es_open(struct net_device *dev);
-static int es_close(struct net_device *dev);
-
 static void es_reset_8390(struct net_device *dev);
 
 static void es_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page);
@@ -289,11 +286,7 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
 	ei_status.block_output = &es_block_output;
 	ei_status.get_8390_hdr = &es_get_8390_hdr;
 
-	dev->open = &es_open;
-	dev->stop = &es_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = ei_poll;
-#endif
+	dev->netdev_ops = &ei_netdev_ops;
 	NS8390_init(dev, 0);
 
 	retval = register_netdev(dev);
@@ -385,22 +378,6 @@ static void es_block_output(struct net_device *dev, int count,
 	memcpy_toio(shmem, buf, count);
 }
 
-static int es_open(struct net_device *dev)
-{
-	ei_open(dev);
-	return 0;
-}
-
-static int es_close(struct net_device *dev)
-{
-
-	if (ei_debug > 1)
-		printk("%s: Shutting down ethercard.\n", dev->name);
-
-	ei_close(dev);
-	return 0;
-}
-
 #ifdef MODULE
 #define MAX_ES_CARDS	4	/* Max number of ES3210 cards per module */
 #define NAMELEN		8	/* # of chars for storing dev->name */