From b6e5a770308c22ef98e2aabc6b4dc00e9ab5e0c1 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 25 Nov 2008 18:26:38 -0800 Subject: [PATCH] --- yaml --- r: 122245 b: refs/heads/master c: 4ef8e768335637749af8d83327b174be0ea798a2 h: refs/heads/master i: 122243: 5a7756ba24e0fac9c7faf532e69177307588b38a v: v3 --- [refs] | 2 +- trunk/drivers/net/ne.c | 24 ++---------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index c40ff034f1cc..9ba3fa3a8442 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53cdd28961f979e4494c85e9ace8c3b51ae39a45 +refs/heads/master: 4ef8e768335637749af8d83327b174be0ea798a2 diff --git a/trunk/drivers/net/ne.c b/trunk/drivers/net/ne.c index f708712a374a..cb02698d1286 100644 --- a/trunk/drivers/net/ne.c +++ b/trunk/drivers/net/ne.c @@ -174,9 +174,6 @@ bad_clone_list[] __initdata = { static int ne_probe1(struct net_device *dev, unsigned long ioaddr); static int ne_probe_isapnp(struct net_device *dev); -static int ne_open(struct net_device *dev); -static int ne_close(struct net_device *dev); - static void ne_reset_8390(struct net_device *dev); static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page); @@ -536,11 +533,8 @@ static int __init ne_probe1(struct net_device *dev, unsigned long 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 = eip_poll; -#endif + + dev->netdev_ops = &eip_netdev_ops; NS8390p_init(dev, 0); ret = register_netdev(dev); @@ -557,20 +551,6 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) return ret; } -static int ne_open(struct net_device *dev) -{ - eip_open(dev); - return 0; -} - -static int ne_close(struct net_device *dev) -{ - if (ei_debug > 1) - printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name); - eip_close(dev); - return 0; -} - /* Hard reset the card. This used to pause for the same period that a 8390 reset command required, but that shouldn't be necessary. */