de2104x: convert to net_device_ops (90d8743d) · Commits · 戴 / test

drivers/net/tulip/de2104x.c

+13 −6

Original line number	Diff line number	Diff line
		@@ -1922,6 +1922,18 @@ bad_srom:
		goto fill_defaults;
		}

		static const struct net_device_ops de_netdev_ops = {
		.ndo_open = de_open,
		.ndo_stop = de_close,
		.ndo_set_multicast_list = de_set_rx_mode,
		.ndo_start_xmit = de_start_xmit,
		.ndo_get_stats = de_get_stats,
		.ndo_tx_timeout = de_tx_timeout,
		.ndo_change_mtu = eth_change_mtu,
		.ndo_set_mac_address = eth_mac_addr,
		.ndo_validate_addr = eth_validate_addr,
		};

		static int __devinit de_init_one (struct pci_dev *pdev,
		const struct pci_device_id *ent)
		{
		@@ -1944,14 +1956,9 @@ static int __devinit de_init_one (struct pci_dev *pdev,
		if (!dev)
		return -ENOMEM;

		dev->netdev_ops = &de_netdev_ops;
		SET_NETDEV_DEV(dev, &pdev->dev);
		dev->open = de_open;
		dev->stop = de_close;
		dev->set_multicast_list = de_set_rx_mode;
		dev->hard_start_xmit = de_start_xmit;
		dev->get_stats = de_get_stats;
		dev->ethtool_ops = &de_ethtool_ops;
		dev->tx_timeout = de_tx_timeout;
		dev->watchdog_timeo = TX_TIMEOUT;

		de = netdev_priv(dev);