From 0b467213fe1ccdbdb85e247b7a76ef6f96d83f36 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 3 Dec 2008 22:10:38 -0800
Subject: [PATCH] --- yaml --- r: 122451 b: refs/heads/master c:
 dcd39c90290297f6e6ed8a04bb20da7ac2b043c5 h: refs/heads/master i:   122449:
 71f61a7aa5f43a62321d8a49d4ddffb6e3b01edc   122447:
 6d5475b475e2dee55ced9c5770328c150e0d306a v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/Makefile   |  2 +-
 trunk/drivers/net/ne-h8300.c | 27 ++++++++++++++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8a645d8b6f01..1865b8533239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5618f0d1193d6b051da9b59b0e32ad24397f06a4
+refs/heads/master: dcd39c90290297f6e6ed8a04bb20da7ac2b043c5
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 1a758dc4394e..35fbe12473d3 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -124,7 +124,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o
 obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
 obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_NE_H8300) += ne-h8300.o
+obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
 obj-$(CONFIG_AX88796) += ax88796.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
diff --git a/trunk/drivers/net/ne-h8300.c b/trunk/drivers/net/ne-h8300.c
index aa99f5e09d37..b57239171046 100644
--- a/trunk/drivers/net/ne-h8300.c
+++ b/trunk/drivers/net/ne-h8300.c
@@ -167,7 +167,7 @@ static void cleanup_card(struct net_device *dev)
 #ifndef MODULE
 struct net_device * __init ne_probe(int unit)
 {
-	struct net_device *dev = ____alloc_ei_netdev(0);
+	struct net_device *dev = alloc_ei_netdev();
 	int err;
 
 	if (!dev)
@@ -193,6 +193,21 @@ struct net_device * __init ne_probe(int unit)
 }
 #endif
 
+static const struct net_device_ops ne_netdev_ops = {
+	.ndo_open		= ne_open,
+	.ndo_stop		= ne_close,
+
+	.ndo_start_xmit		= ei_start_xmit,
+	.ndo_tx_timeout		= ei_tx_timeout,
+	.ndo_get_stats		= ei_get_stats,
+	.ndo_set_multicast_list = ei_set_multicast_list,
+	.ndo_validate_addr	= eth_validate_addr,
+	.ndo_change_mtu		= eth_change_mtu,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.ndo_poll_controller	= ei_poll,
+#endif
+};
+
 static int __init ne_probe1(struct net_device *dev, int ioaddr)
 {
 	int i;
@@ -319,11 +334,9 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
 	ei_status.block_output = &ne_block_output;
 	ei_status.get_8390_hdr = &ne_get_8390_hdr;
 	ei_status.priv = 0;
-	dev->open = &ne_open;
-	dev->stop = &ne_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = __ei_poll;
-#endif
+
+	dev->netdev_ops = &ne_netdev_ops;
+
 	__NS8390_init(dev, 0);
 
 	ret = register_netdev(dev);
@@ -624,7 +637,7 @@ int init_module(void)
 	int err;
 
 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-		struct net_device *dev = ____alloc_ei_netdev(0);
+		struct net_device *dev = alloc_ei_netdev();
 		if (!dev)
 			break;
 		if (io[this_dev]) {