From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org
Subject: [PATCH 1/3] zorro8390: convert to net_device_ops
Date: Wed, 03 Dec 2008 12:10:14 -0800 [thread overview]
Message-ID: <20081203201028.362917093@vyatta.com> (raw)
In-Reply-To: 20081203201013.653215120@vyatta.com
[-- Attachment #1: zorro.patch --]
[-- Type: text/plain, Size: 2184 bytes --]
Another device using 8390 library that needs converting.
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/drivers/net/Makefile 2008-12-03 11:56:50.000000000 -0800
+++ b/drivers/net/Makefile 2008-12-03 11:56:59.000000000 -0800
@@ -190,7 +190,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
obj-$(CONFIG_LP486E) += lp486e.o
obj-$(CONFIG_ETH16I) += eth16i.o
-obj-$(CONFIG_ZORRO8390) += zorro8390.o
+obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
obj-$(CONFIG_EQUALIZER) += eql.o
--- a/drivers/net/zorro8390.c 2008-12-03 11:56:42.000000000 -0800
+++ b/drivers/net/zorro8390.c 2008-12-03 11:59:24.000000000 -0800
@@ -122,7 +122,7 @@ static int __devinit zorro8390_init_one(
break;
board = z->resource.start;
ioaddr = board+cards[i].offset;
- dev = ____alloc_ei_netdev(0);
+ dev = alloc_ei_netdev();
if (!dev)
return -ENOMEM;
if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) {
@@ -139,6 +139,20 @@ static int __devinit zorro8390_init_one(
return 0;
}
+static const struct net_device_ops zorro8390_netdev_ops = {
+ .ndo_open = zorro8390_open,
+ .ndo_stop = zorro8390_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 __devinit zorro8390_init(struct net_device *dev,
unsigned long board, const char *name,
unsigned long ioaddr)
@@ -230,12 +244,8 @@ static int __devinit zorro8390_init(stru
ei_status.block_output = &zorro8390_block_output;
ei_status.get_8390_hdr = &zorro8390_get_8390_hdr;
ei_status.reg_offset = zorro8390_offsets;
- dev->open = &zorro8390_open;
- dev->stop = &zorro8390_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = __ei_poll;
-#endif
+ dev->netdev_ops = &zorro8390_netdev_ops;
__NS8390_init(dev, 0);
err = register_netdev(dev);
if (err) {
--
next prev parent reply other threads:[~2008-12-03 20:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-03 20:10 [PATCH 0/3] More embedded 8390 netdevice ops conversions Stephen Hemminger
2008-12-03 20:10 ` Stephen Hemminger [this message]
2008-12-04 6:09 ` [PATCH 1/3] zorro8390: convert to net_device_ops David Miller
2008-12-03 20:10 ` [PATCH 2/3] hydra: " Stephen Hemminger
2008-12-04 6:10 ` David Miller
2008-12-03 20:10 ` [PATCH 3/3] ne-h8300: " Stephen Hemminger
2008-12-04 6:10 ` David Miller
2009-01-14 6:37 ` Magnus Damm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081203201028.362917093@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox