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

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

hp-plus: convert to net_device_ops 



Another driver converted to new infrastructure.

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

drivers/net/hp-plus.c

+17 −7
Original line number Diff line number Diff line
@@ -158,6 +158,21 @@ out: 
}

#endif



static const struct net_device_ops hpp_netdev_ops = {

	.ndo_open		= hpp_open,

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

};





/* Do the interesting part of the probe at a single address. */

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

{
@@ -226,11 +241,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr) 
	/* Set the base address to point to the NIC, not the "real" base! */

	dev->base_addr = ioaddr + NIC_OFFSET;



	dev->open = &hpp_open;

	dev->stop = &hpp_close;

#ifdef CONFIG_NET_POLL_CONTROLLER

	dev->poll_controller = ei_poll;

#endif

	dev->netdev_ops = &hpp_netdev_ops;



	ei_status.name = name;

	ei_status.word16 = 0;		/* Agggghhhhh! Debug time: 2 days! */
@@ -301,8 +312,7 @@ hpp_open(struct net_device *dev) 
	/* Select the operational page. */

	outw(Perf_Page, ioaddr + HP_PAGING);



	eip_open(dev);

	return 0;

	return eip_open(dev);

}



static int