Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf7e032f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller
Browse files

zorro8390: Fix regression caused during net_device_ops conversion 



Changeset b6114794 ("zorro8390: convert to
net_device_ops") broke zorro8390 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in zorro8390.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").

Reported-by: default avatarChristian T. Steigies <cts@debian.org>
Suggested-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarChristian T. Steigies <cts@debian.org>
Cc: stable@kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d44cf14d

drivers/net/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -219,7 +219,7 @@ obj-$(CONFIG_SC92031) += sc92031.o 
obj-$(CONFIG_LP486E) += lp486e.o

obj-$(CONFIG_LP486E) += lp486e.o





obj-$(CONFIG_ETH16I) += eth16i.o

obj-$(CONFIG_ETH16I) += eth16i.o

obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o

obj-$(CONFIG_ZORRO8390) += zorro8390.o

obj-$(CONFIG_HPLANCE) += hplance.o 7990.o

obj-$(CONFIG_HPLANCE) += hplance.o 7990.o

obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o

obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_EQUALIZER) += eql.o

drivers/net/zorro8390.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ static int __devinit zorro8390_init_one(struct zorro_dev *z, 




    board = z->resource.start;

    board = z->resource.start;

    ioaddr = board+cards[i].offset;

    ioaddr = board+cards[i].offset;

    dev = alloc_ei_netdev();

    dev = ____alloc_ei_netdev(0);

    if (!dev)

    if (!dev)

	return -ENOMEM;

	return -ENOMEM;

    if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) {

    if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) {
@@ -146,15 +146,15 @@ static int __devinit zorro8390_init_one(struct zorro_dev *z, 
static const struct net_device_ops zorro8390_netdev_ops = {

static const struct net_device_ops zorro8390_netdev_ops = {

	.ndo_open		= zorro8390_open,

	.ndo_open		= zorro8390_open,

	.ndo_stop		= zorro8390_close,

	.ndo_stop		= zorro8390_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

};

};