pcnet32: update to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d9a811d5fd
commit
3bc124dd02
1 changed files with 17 additions and 11 deletions
|
@ -1568,6 +1568,22 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const struct net_device_ops pcnet32_netdev_ops = {
|
||||||
|
.ndo_open = pcnet32_open,
|
||||||
|
.ndo_stop = pcnet32_close,
|
||||||
|
.ndo_start_xmit = pcnet32_start_xmit,
|
||||||
|
.ndo_tx_timeout = pcnet32_tx_timeout,
|
||||||
|
.ndo_get_stats = pcnet32_get_stats,
|
||||||
|
.ndo_set_multicast_list = pcnet32_set_multicast_list,
|
||||||
|
.ndo_do_ioctl = pcnet32_ioctl,
|
||||||
|
.ndo_change_mtu = eth_change_mtu,
|
||||||
|
.ndo_set_mac_address = eth_mac_addr,
|
||||||
|
.ndo_validate_addr = eth_validate_addr,
|
||||||
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||||
|
.ndo_poll_controller = pcnet32_poll_controller,
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
/* pcnet32_probe1
|
/* pcnet32_probe1
|
||||||
* Called from both pcnet32_probe_vlbus and pcnet_probe_pci.
|
* Called from both pcnet32_probe_vlbus and pcnet_probe_pci.
|
||||||
* pdev will be NULL when called from pcnet32_probe_vlbus.
|
* pdev will be NULL when called from pcnet32_probe_vlbus.
|
||||||
|
@ -1934,20 +1950,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
|
||||||
lp->watchdog_timer.function = (void *)&pcnet32_watchdog;
|
lp->watchdog_timer.function = (void *)&pcnet32_watchdog;
|
||||||
|
|
||||||
/* The PCNET32-specific entries in the device structure. */
|
/* The PCNET32-specific entries in the device structure. */
|
||||||
dev->open = &pcnet32_open;
|
dev->netdev_ops = &pcnet32_netdev_ops;
|
||||||
dev->hard_start_xmit = &pcnet32_start_xmit;
|
|
||||||
dev->stop = &pcnet32_close;
|
|
||||||
dev->get_stats = &pcnet32_get_stats;
|
|
||||||
dev->set_multicast_list = &pcnet32_set_multicast_list;
|
|
||||||
dev->do_ioctl = &pcnet32_ioctl;
|
|
||||||
dev->ethtool_ops = &pcnet32_ethtool_ops;
|
dev->ethtool_ops = &pcnet32_ethtool_ops;
|
||||||
dev->tx_timeout = pcnet32_tx_timeout;
|
|
||||||
dev->watchdog_timeo = (5 * HZ);
|
dev->watchdog_timeo = (5 * HZ);
|
||||||
|
|
||||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
||||||
dev->poll_controller = pcnet32_poll_controller;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Fill in the generic fields of the device structure. */
|
/* Fill in the generic fields of the device structure. */
|
||||||
if (register_netdev(dev))
|
if (register_netdev(dev))
|
||||||
goto err_free_ring;
|
goto err_free_ring;
|
||||||
|
|
Reference in a new issue