Commit 8cb89571 authored by Oliver Neukum's avatar Oliver Neukum Committed by David S. Miller
Browse files

net: convert pegasus driver to net_device_ops 



This converts the pegasus driver to use of the new net_device_ops structure

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f4c9583

drivers/net/usb/pegasus.c

+14 −7
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ module_param (msg_level, int, 0); 
MODULE_PARM_DESC (msg_level, "Override default message level");



MODULE_DEVICE_TABLE(usb, pegasus_ids);

static const struct net_device_ops pegasus_netdev_ops;



static int update_eth_regs_async(pegasus_t *);

/* Aargh!!! I _really_ hate such tweaks */
@@ -1360,14 +1361,10 @@ static int pegasus_probe(struct usb_interface *intf, 
	pegasus->intf = intf;

	pegasus->usb = dev;

	pegasus->net = net;

	net->open = pegasus_open;

	net->stop = pegasus_close;





	net->watchdog_timeo = PEGASUS_TX_TIMEOUT;

	net->tx_timeout = pegasus_tx_timeout;

	net->do_ioctl = pegasus_ioctl;

	net->hard_start_xmit = pegasus_start_xmit;

	net->set_multicast_list = pegasus_set_multicast;

	net->get_stats = pegasus_netdev_stats;

	net->netdev_ops = &pegasus_netdev_ops;

	SET_ETHTOOL_OPS(net, &ops);

	pegasus->mii.dev = net;

	pegasus->mii.mdio_read = mdio_read;
@@ -1482,6 +1479,16 @@ static int pegasus_resume (struct usb_interface *intf) 
	return 0;

}



static const struct net_device_ops pegasus_netdev_ops = {

	.ndo_open =			pegasus_open,

	.ndo_stop =			pegasus_close,

	.ndo_do_ioctl =			pegasus_ioctl,

	.ndo_start_xmit =		pegasus_start_xmit,

	.ndo_set_multicast_list =	pegasus_set_multicast,

	.ndo_get_stats =		pegasus_netdev_stats,

	.ndo_tx_timeout =		pegasus_tx_timeout,

};



static struct usb_driver pegasus_driver = {

	.name = driver_name,

	.probe = pegasus_probe,