| From 0b25e0157dfa236a0629c16c8ad6f222f633f682 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert@linux-m68k.org> |
| Date: Thu, 12 May 2011 09:11:39 +0000 |
| Subject: hydra: Fix regression caused during net_device_ops conversion |
| |
| From: Geert Uytterhoeven <geert@linux-m68k.org> |
| |
| commit 0b25e0157dfa236a0629c16c8ad6f222f633f682 upstream. |
| |
| Changeset 5618f0d1193d6b051da9b59b0e32ad24397f06a4 ("hydra: convert to |
| net_device_ops") broke hydra by adding 8390.o to the link. That |
| meant that lib8390.c was included twice, once in hydra.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 217cbfa856dc1cbc2890781626c4032d9e3ec59f ("mac8390: |
| fix regression caused during net_device_ops conversion") and |
| 4e0168fa4842e27795a75b205a510f25b62181d9 ("mac8390: fix build with |
| NET_POLL_CONTROLLER"). |
| |
| Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/Makefile | 2 +- |
| drivers/net/hydra.c | 14 +++++++------- |
| 2 files changed, 8 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/net/Makefile |
| +++ b/drivers/net/Makefile |
| @@ -220,7 +220,7 @@ obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o |
| obj-$(CONFIG_DECLANCE) += declance.o |
| obj-$(CONFIG_ATARILANCE) += atarilance.o |
| obj-$(CONFIG_A2065) += a2065.o |
| -obj-$(CONFIG_HYDRA) += hydra.o 8390.o |
| +obj-$(CONFIG_HYDRA) += hydra.o |
| obj-$(CONFIG_ARIADNE) += ariadne.o |
| obj-$(CONFIG_CS89x0) += cs89x0.o |
| obj-$(CONFIG_MACSONIC) += macsonic.o |
| --- a/drivers/net/hydra.c |
| +++ b/drivers/net/hydra.c |
| @@ -98,15 +98,15 @@ static const struct net_device_ops hydra |
| .ndo_open = hydra_open, |
| .ndo_stop = hydra_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_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_set_mac_address = eth_mac_addr, |
| + .ndo_set_mac_address = eth_mac_addr, |
| .ndo_change_mtu = eth_change_mtu, |
| #ifdef CONFIG_NET_POLL_CONTROLLER |
| - .ndo_poll_controller = ei_poll, |
| + .ndo_poll_controller = __ei_poll, |
| #endif |
| }; |
| |
| @@ -125,7 +125,7 @@ static int __devinit hydra_init(struct z |
| 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, |
| }; |
| |
| - dev = alloc_ei_netdev(); |
| + dev = ____alloc_ei_netdev(0); |
| if (!dev) |
| return -ENOMEM; |
| |