From: Stephen Hemminger <shemminger@vyatta.com>
To: Randy Dunlap <randy.dunlap@oracle.com>,
David Miller <davem@davemloft.net>,
Jeff Garzik <jgarzik@pobox.com>
Cc: Russell King <rmk@arm.linux.org.uk>, netdev@vger.kernel.org
Subject: [PATCH] etherh: build fix for net-next
Date: Tue, 2 Dec 2008 07:58:50 -0800 [thread overview]
Message-ID: <20081202075850.036421a2@extreme> (raw)
In-Reply-To: <4934B7B5.9010004@oracle.com>
Fix build of ARM etherh driver with new net_device_ops.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/arm/etherh.c 2008-12-01 15:24:01.000000000 -0800
+++ b/drivers/net/arm/etherh.c 2008-12-01 15:27:32.000000000 -0800
@@ -637,6 +637,21 @@ static const struct ethtool_ops etherh_e
.get_drvinfo = etherh_get_drvinfo,
};
+static const struct net_device_ops etherh_netdev_ops = {
+ .ndo_open = etherh_open,
+ .ndo_stop = etherh_close,
+ .ndo_set_config = etherh_set_config,
+ .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 u32 etherh_regoffsets[16];
static u32 etherm_regoffsets[16];
@@ -663,9 +678,7 @@ etherh_probe(struct expansion_card *ec,
SET_NETDEV_DEV(dev, &ec->dev);
- dev->open = etherh_open;
- dev->stop = etherh_close;
- dev->set_config = etherh_set_config;
+ dev->netdev_ops = ðerh_netdev_ops;
dev->irq = ec->irq;
dev->ethtool_ops = ðerh_ethtool_ops;
--- a/drivers/net/arm/Makefile 2008-12-02 07:48:13.000000000 -0800
+++ b/drivers/net/arm/Makefile 2008-12-02 07:48:56.000000000 -0800
@@ -4,7 +4,7 @@
#
obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
-obj-$(CONFIG_ARM_ETHERH) += etherh.o
+obj-$(CONFIG_ARM_ETHERH) += etherh.o ../8390.o
obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
next parent reply other threads:[~2008-12-02 15:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20081201212931.GB18511@flint.arm.linux.org.uk>
[not found] ` <20081201153030.235a8c84@extreme>
[not found] ` <4934B7B5.9010004@oracle.com>
2008-12-02 15:58 ` Stephen Hemminger [this message]
2008-12-02 22:52 ` [PATCH] etherh: build fix for net-next David Miller
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=20081202075850.036421a2@extreme \
--to=shemminger@vyatta.com \
--cc=davem@davemloft.net \
--cc=jgarzik@pobox.com \
--cc=netdev@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=rmk@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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