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

hamachi: convert to net_device_ops 



Convert driver to new net_device_ops. Compile tested only.

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

drivers/net/hamachi.c

+14 −7
Original line number Diff line number Diff line
@@ -568,6 +568,19 @@ static void set_rx_mode(struct net_device *dev); 
static const struct ethtool_ops ethtool_ops;

static const struct ethtool_ops ethtool_ops_no_mii;



static const struct net_device_ops hamachi_netdev_ops = {

	.ndo_open		= hamachi_open,

	.ndo_stop		= hamachi_close,

	.ndo_start_xmit		= hamachi_start_xmit,

	.ndo_get_stats		= hamachi_get_stats,

	.ndo_set_multicast_list	= set_rx_mode,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_tx_timeout		= hamachi_tx_timeout,

	.ndo_do_ioctl		= netdev_ioctl,

};





static int __devinit hamachi_init_one (struct pci_dev *pdev,

				    const struct pci_device_id *ent)

{
@@ -722,17 +735,11 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev, 




	/* The Hamachi-specific entries in the device structure. */

	dev->open = &hamachi_open;

	dev->hard_start_xmit = &hamachi_start_xmit;

	dev->stop = &hamachi_close;

	dev->get_stats = &hamachi_get_stats;

	dev->set_multicast_list = &set_rx_mode;

	dev->do_ioctl = &netdev_ioctl;

	dev->netdev_ops = &hamachi_netdev_ops;

	if (chip_tbl[hmp->chip_id].flags & CanHaveMII)

		SET_ETHTOOL_OPS(dev, &ethtool_ops);

	else

		SET_ETHTOOL_OPS(dev, &ethtool_ops_no_mii);

	dev->tx_timeout = &hamachi_tx_timeout;

	dev->watchdog_timeo = TX_TIMEOUT;

	if (mtu)

		dev->mtu = mtu;