Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sis190: update to net_device_ops

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Hemminger and committed by
David S. Miller
97488c5b b8aa76a2

+18 -10
+18 -10
drivers/net/sis190.c
··· 1782 1782 generic_mii_ioctl(&tp->mii_if, if_mii(ifr), cmd, NULL); 1783 1783 } 1784 1784 1785 + static const struct net_device_ops sis190_netdev_ops = { 1786 + .ndo_open = sis190_open, 1787 + .ndo_stop = sis190_close, 1788 + .ndo_do_ioctl = sis190_ioctl, 1789 + .ndo_start_xmit = sis190_start_xmit, 1790 + .ndo_tx_timeout = sis190_tx_timeout, 1791 + .ndo_set_multicast_list = sis190_set_rx_mode, 1792 + .ndo_change_mtu = eth_change_mtu, 1793 + .ndo_set_mac_address = eth_mac_addr, 1794 + .ndo_validate_addr = eth_validate_addr, 1795 + #ifdef CONFIG_NET_POLL_CONTROLLER 1796 + .ndo_poll_controller = sis190_netpoll, 1797 + #endif 1798 + }; 1799 + 1785 1800 static int __devinit sis190_init_one(struct pci_dev *pdev, 1786 1801 const struct pci_device_id *ent) 1787 1802 { ··· 1830 1815 1831 1816 INIT_WORK(&tp->phy_task, sis190_phy_task); 1832 1817 1833 - dev->open = sis190_open; 1834 - dev->stop = sis190_close; 1835 - dev->do_ioctl = sis190_ioctl; 1836 - dev->tx_timeout = sis190_tx_timeout; 1837 - dev->watchdog_timeo = SIS190_TX_TIMEOUT; 1838 - dev->hard_start_xmit = sis190_start_xmit; 1839 - #ifdef CONFIG_NET_POLL_CONTROLLER 1840 - dev->poll_controller = sis190_netpoll; 1841 - #endif 1842 - dev->set_multicast_list = sis190_set_rx_mode; 1818 + dev->netdev_ops = &sis190_netdev_ops; 1819 + 1843 1820 SET_ETHTOOL_OPS(dev, &sis190_ethtool_ops); 1844 1821 dev->irq = pdev->irq; 1845 1822 dev->base_addr = (unsigned long) 0xdead; 1823 + dev->watchdog_timeo = SIS190_TX_TIMEOUT; 1846 1824 1847 1825 spin_lock_init(&tp->lock); 1848 1826