Commit 9a4a8429 authored by David S. Miller's avatar David S. Miller
Browse files

8390/8390p: Fix compat netdev ops handling. 



Based upon a report from Randy Dunlap.

The compat netdev ops assignments need to happen in
8390.c and 8390p.c, not lib8390.c, as only the type
specific code can assign the correct function pointers.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b124a8e

drivers/net/8390.c

+10 −1
Original line number Diff line number Diff line
@@ -72,7 +72,16 @@ EXPORT_SYMBOL(ei_netdev_ops); 


struct net_device *__alloc_ei_netdev(int size)

{

	return ____alloc_ei_netdev(size);

	struct net_device *dev = ____alloc_ei_netdev(size);

#ifdef CONFIG_COMPAT_NET_DEV_OPS

	if (dev) {

		dev->hard_start_xmit = ei_start_xmit;

		dev->get_stats	= ei_get_stats;

		dev->set_multicast_list = ei_set_multicast_list;

		dev->tx_timeout = ei_tx_timeout;

	}

#endif

	return dev;

}

EXPORT_SYMBOL(__alloc_ei_netdev);

drivers/net/8390p.c

+10 −1
Original line number Diff line number Diff line
@@ -77,7 +77,16 @@ EXPORT_SYMBOL(eip_netdev_ops); 


struct net_device *__alloc_eip_netdev(int size)

{

	return ____alloc_ei_netdev(size);

	struct net_device *dev = ____alloc_ei_netdev(size);

#ifdef CONFIG_COMPAT_NET_DEV_OPS

	if (dev) {

		dev->hard_start_xmit = eip_start_xmit;

		dev->get_stats	= eip_get_stats;

		dev->set_multicast_list = eip_set_multicast_list;

		dev->tx_timeout = eip_tx_timeout;

	}

#endif

	return dev;

}

EXPORT_SYMBOL(__alloc_eip_netdev);

drivers/net/lib8390.c

+0 −6
Original line number Diff line number Diff line
@@ -1010,12 +1010,6 @@ static void ethdev_setup(struct net_device *dev) 
	if (ei_debug > 1)

		printk(version);



#ifdef CONFIG_COMPAT_NET_DEV_OPS

	dev->hard_start_xmit = ei_start_xmit;

	dev->get_stats	= ei_get_stats;

	dev->set_multicast_list = ei_set_multicast_list;

	dev->tx_timeout = __ei_tx_timeout;

#endif

	ether_setup(dev);



	spin_lock_init(&ei_local->page_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE