From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org
Subject: [PATCH 3/3] ne-h8300: convert to net_device_ops
Date: Wed, 03 Dec 2008 12:10:16 -0800 [thread overview]
Message-ID: <20081203201028.533294548@vyatta.com> (raw)
In-Reply-To: 20081203201013.653215120@vyatta.com
[-- Attachment #1: ne-h300.patch --]
[-- Type: text/plain, Size: 2160 bytes --]
Another device using 8390 library that needs converting.
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/drivers/net/Makefile 2008-12-03 12:04:17.000000000 -0800
+++ b/drivers/net/Makefile 2008-12-03 12:07:25.000000000 -0800
@@ -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
--- a/drivers/net/ne-h8300.c 2008-12-03 12:04:13.000000000 -0800
+++ b/drivers/net/ne-h8300.c 2008-12-03 12:07:17.000000000 -0800
@@ -167,7 +167,7 @@ static void cleanup_card(struct net_devi
#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 @@ out:
}
#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_d
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]) {
--
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 ` [PATCH 1/3] zorro8390: convert to net_device_ops Stephen Hemminger
2008-12-04 6:09 ` 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 ` Stephen Hemminger [this message]
2008-12-04 6:10 ` [PATCH 3/3] ne-h8300: " 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.533294548@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