Commit 217cbfa8 authored by Finn Thain's avatar Finn Thain Committed by David S. Miller
Browse files

mac8390: fix regression caused during net_device_ops conversion 



Changeset ca17584b ("mac8390: update
to net_device_ops") broke mac8390 by adding 8390.o to the link. That
meant that lib8390.c was included twice, once in mac8390.c and once in
8390.c, subject to different macros. This patch reverts that by
avoiding the wrappers in 8390.c. They seem to be of no value since
COMPAT_NET_DEV_OPS is going away soon.

Tested with a Kinetics EtherPort card.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e2fd555

drivers/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ obj-$(CONFIG_HAMACHI) += hamachi.o 
obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_SEEQ8005) += seeq8005.o

obj-$(CONFIG_NET_SB1000) += sb1000.o

obj-$(CONFIG_MAC8390) += mac8390.o 8390.o

obj-$(CONFIG_MAC8390) += mac8390.o

obj-$(CONFIG_APNE) += apne.o 8390.o

obj-$(CONFIG_PCMCIA_PCNET) += 8390.o

obj-$(CONFIG_HP100) += hp100.o

drivers/net/mac8390.c

+5 −5
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ struct net_device * __init mac8390_probe(int unit) 
	if (!MACH_IS_MAC)

		return ERR_PTR(-ENODEV);



	dev = alloc_ei_netdev();

	dev = ____alloc_ei_netdev(0);

	if (!dev)

		return ERR_PTR(-ENOMEM);
@@ -481,10 +481,10 @@ void cleanup_module(void) 
static const struct net_device_ops mac8390_netdev_ops = {

	.ndo_open 		= mac8390_open,

	.ndo_stop		= mac8390_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_change_mtu		= eth_change_mtu,

CRA Git | Maintained and supported by SUSTech CRA and CCSE