pci-skeleton: convert to net_device_ops (1ec847f6) · Commits · 戴 / test

drivers/net/pci-skeleton.c

+12 −7

Original line number	Original line	Diff line number	Diff line
	@@ -728,6 +728,17 @@ err_out:
	return rc;		return rc;
	}		}

			static const struct net_device_ops netdrv_netdev_ops = {
			.ndo_open = netdrv_open,
			.ndo_stop = netdrv_close,
			.ndo_start_xmit = netdrv_start_xmit,
			.ndo_set_multicast_list = netdrv_set_rx_mode,
			.ndo_do_ioctl = netdrv_ioctl,
			.ndo_tx_timeout = netdrv_tx_timeout,
			.ndo_change_mtu = eth_change_mtu,
			.ndo_validate_addr = eth_validate_addr,
			.ndo_set_mac_address = eth_mac_addr,
			};

	static int __devinit netdrv_init_one (struct pci_dev *pdev,		static int __devinit netdrv_init_one (struct pci_dev *pdev,
	const struct pci_device_id *ent)		const struct pci_device_id *ent)
	@@ -769,13 +780,7 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
	((u16 *) (dev->dev_addr))[i] =		((u16 *) (dev->dev_addr))[i] =
	le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));		le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));

	/* The Rtl8139-specific entries in the device structure. */		dev->netdev_ops = &netdrv_netdev_ops;
	dev->open = netdrv_open;
	dev->hard_start_xmit = netdrv_start_xmit;
	dev->stop = netdrv_close;
	dev->set_multicast_list = netdrv_set_rx_mode;
	dev->do_ioctl = netdrv_ioctl;
	dev->tx_timeout = netdrv_tx_timeout;
	dev->watchdog_timeo = TX_TIMEOUT;		dev->watchdog_timeo = TX_TIMEOUT;

	dev->irq = pdev->irq;		dev->irq = pdev->irq;