Commit 2592a735 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller

ne-h8300: Fix regression caused during net_device_ops conversion

Changeset dcd39c90 ("ne-h8300: convert to
net_device_ops") broke ne-h8300 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in ne-h8300.c and once in
8390.c, subject to different macros. This patch reverts that by
avoiding the wrappers in 8390.c.

Fix based on commits 217cbfa8 ("mac8390:
fix regression caused during net_device_ops conversion") and
4e0168fa ("mac8390: fix build with
NET_POLL_CONTROLLER").
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: stable@kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b25e015
...@@ -144,7 +144,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o ...@@ -144,7 +144,7 @@ obj-$(CONFIG_NE3210) += ne3210.o 8390.o
obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
obj-$(CONFIG_B44) += b44.o obj-$(CONFIG_B44) += b44.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o obj-$(CONFIG_FORCEDETH) += forcedeth.o
obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o obj-$(CONFIG_NE_H8300) += ne-h8300.o
obj-$(CONFIG_AX88796) += ax88796.o obj-$(CONFIG_AX88796) += ax88796.o
obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
obj-$(CONFIG_FTMAC100) += ftmac100.o obj-$(CONFIG_FTMAC100) += ftmac100.o
......
...@@ -167,7 +167,7 @@ static void cleanup_card(struct net_device *dev) ...@@ -167,7 +167,7 @@ static void cleanup_card(struct net_device *dev)
#ifndef MODULE #ifndef MODULE
struct net_device * __init ne_probe(int unit) struct net_device * __init ne_probe(int unit)
{ {
struct net_device *dev = alloc_ei_netdev(); struct net_device *dev = ____alloc_ei_netdev(0);
int err; int err;
if (!dev) if (!dev)
...@@ -197,15 +197,15 @@ static const struct net_device_ops ne_netdev_ops = { ...@@ -197,15 +197,15 @@ static const struct net_device_ops ne_netdev_ops = {
.ndo_open = ne_open, .ndo_open = ne_open,
.ndo_stop = ne_close, .ndo_stop = ne_close,
.ndo_start_xmit = ei_start_xmit, .ndo_start_xmit = __ei_start_xmit,
.ndo_tx_timeout = ei_tx_timeout, .ndo_tx_timeout = __ei_tx_timeout,
.ndo_get_stats = ei_get_stats, .ndo_get_stats = __ei_get_stats,
.ndo_set_multicast_list = ei_set_multicast_list, .ndo_set_multicast_list = __ei_set_multicast_list,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr, .ndo_set_mac_address = eth_mac_addr,
.ndo_change_mtu = eth_change_mtu, .ndo_change_mtu = eth_change_mtu,
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = ei_poll, .ndo_poll_controller = __ei_poll,
#endif #endif
}; };
...@@ -637,7 +637,7 @@ int init_module(void) ...@@ -637,7 +637,7 @@ int init_module(void)
int err; int err;
for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
struct net_device *dev = alloc_ei_netdev(); struct net_device *dev = ____alloc_ei_netdev(0);
if (!dev) if (!dev)
break; break;
if (io[this_dev]) { if (io[this_dev]) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment