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

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

de600: update to net_device_ops 



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

drivers/net/de600.c

+11 −3
Original line number Diff line number Diff line
@@ -378,6 +378,16 @@ static void de600_rx_intr(struct net_device *dev) 
	 */

}



static const struct net_device_ops de600_netdev_ops = {

	.ndo_open		= de600_open,

	.ndo_stop		= de600_close,

	.ndo_start_xmit		= de600_start_xmit,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};





static struct net_device * __init de600_probe(void)

{

	int	i;
@@ -439,9 +449,7 @@ static struct net_device * __init de600_probe(void) 


	printk(", Ethernet Address: %pM\n", dev->dev_addr);



	dev->open = de600_open;

	dev->stop = de600_close;

	dev->hard_start_xmit = &de600_start_xmit;

	dev->netdev_ops = &de600_netdev_ops;



	dev->flags&=~IFF_MULTICAST;

drivers/net/de620.c

+12 −5
Original line number Diff line number Diff line
@@ -784,6 +784,17 @@ static int adapter_init(struct net_device *dev) 
	return 0; /* all ok */

}



static const struct net_device_ops de620_netdev_ops = {

	.ndo_open 		= de620_open,

	.ndo_stop 		= de620_close,

	.ndo_start_xmit 	= de620_start_xmit,

	.ndo_tx_timeout 	= de620_timeout,

	.ndo_set_multicast_list = de620_set_multicast_list,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};



/******************************************************************************

 *

 * Only start-up code below
@@ -861,12 +872,8 @@ struct net_device * __init de620_probe(int unit) 
	else

		printk(" UTP)\n");



	dev->open 		= de620_open;

	dev->stop 		= de620_close;

	dev->hard_start_xmit 	= de620_start_xmit;

	dev->tx_timeout 	= de620_timeout;

	dev->netdev_ops = &de620_netdev_ops;

	dev->watchdog_timeo	= HZ*2;

	dev->set_multicast_list = de620_set_multicast_list;



	/* base_addr and irq are already set, see above! */