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

Commit dcd39c90 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

ne-h8300: convert to net_device_ops 



Another device using 8390 library that needs converting.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5618f0d1

drivers/net/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -124,7 +124,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

obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o

obj-$(CONFIG_AX88796) += ax88796.o

obj-$(CONFIG_AX88796) += ax88796.o





obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o

obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o

drivers/net/ne-h8300.c

+20 −7
Original line number Original line Diff line number Diff line
@@ -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(0);

	struct net_device *dev = alloc_ei_netdev();

	int err;

	int err;





	if (!dev)

	if (!dev)
@@ -193,6 +193,21 @@ struct net_device * __init ne_probe(int unit) 
}

}

#endif

#endif





static const struct net_device_ops ne_netdev_ops = {

	.ndo_open		= ne_open,

	.ndo_stop		= ne_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_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ei_poll,

#endif

};



static int __init ne_probe1(struct net_device *dev, int ioaddr)

static int __init ne_probe1(struct net_device *dev, int ioaddr)

{

{

	int i;

	int i;
@@ -319,11 +334,9 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr) 
	ei_status.block_output = &ne_block_output;

	ei_status.block_output = &ne_block_output;

	ei_status.get_8390_hdr = &ne_get_8390_hdr;

	ei_status.get_8390_hdr = &ne_get_8390_hdr;

	ei_status.priv = 0;

	ei_status.priv = 0;

	dev->open = &ne_open;



	dev->stop = &ne_close;

	dev->netdev_ops = &ne_netdev_ops;

#ifdef CONFIG_NET_POLL_CONTROLLER



	dev->poll_controller = __ei_poll;

#endif

	__NS8390_init(dev, 0);

	__NS8390_init(dev, 0);





	ret = register_netdev(dev);

	ret = register_netdev(dev);
@@ -624,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(0);

		struct net_device *dev = alloc_ei_netdev();

		if (!dev)

		if (!dev)

			break;

			break;

		if (io[this_dev]) {

		if (io[this_dev]) {