mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
etherh: build fix for net-next
Fix build of ARM etherh driver with new net_device_ops. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6976a1d6c2
commit
b9a9b4b042
2 changed files with 17 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -637,6 +637,21 @@ static const struct ethtool_ops etherh_ethtool_ops = {
|
|||
.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, const struct ecard_id *id)
|
|||
|
||||
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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue