diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-01-07 20:35:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-07 20:35:41 -0500 |
commit | 97488c5b2d5b2121da3bc386558488598fb0ce23 (patch) | |
tree | 4661d21d229db91f7598025103eecb9ce275e6af /drivers | |
parent | b8aa76a2bd9782e1a45e96602812910d5cfe7b52 (diff) |
sis190: update to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sis190.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 83cc3c5f7946..a9732686134b 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -1782,6 +1782,21 @@ static int sis190_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
1782 | generic_mii_ioctl(&tp->mii_if, if_mii(ifr), cmd, NULL); | 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 | static int __devinit sis190_init_one(struct pci_dev *pdev, | 1800 | static int __devinit sis190_init_one(struct pci_dev *pdev, |
1786 | const struct pci_device_id *ent) | 1801 | const struct pci_device_id *ent) |
1787 | { | 1802 | { |
@@ -1815,19 +1830,12 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, | |||
1815 | 1830 | ||
1816 | INIT_WORK(&tp->phy_task, sis190_phy_task); | 1831 | INIT_WORK(&tp->phy_task, sis190_phy_task); |
1817 | 1832 | ||
1818 | dev->open = sis190_open; | 1833 | dev->netdev_ops = &sis190_netdev_ops; |
1819 | dev->stop = sis190_close; | 1834 | |
1820 | dev->do_ioctl = sis190_ioctl; | ||
1821 | dev->tx_timeout = sis190_tx_timeout; | ||
1822 | dev->watchdog_timeo = SIS190_TX_TIMEOUT; | ||
1823 | dev->hard_start_xmit = sis190_start_xmit; | ||
1824 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
1825 | dev->poll_controller = sis190_netpoll; | ||
1826 | #endif | ||
1827 | dev->set_multicast_list = sis190_set_rx_mode; | ||
1828 | SET_ETHTOOL_OPS(dev, &sis190_ethtool_ops); | 1835 | SET_ETHTOOL_OPS(dev, &sis190_ethtool_ops); |
1829 | dev->irq = pdev->irq; | 1836 | dev->irq = pdev->irq; |
1830 | dev->base_addr = (unsigned long) 0xdead; | 1837 | dev->base_addr = (unsigned long) 0xdead; |
1838 | dev->watchdog_timeo = SIS190_TX_TIMEOUT; | ||
1831 | 1839 | ||
1832 | spin_lock_init(&tp->lock); | 1840 | spin_lock_init(&tp->lock); |
1833 | 1841 | ||