diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-01-07 20:57:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-07 20:57:19 -0500 |
commit | 2b7d0c7039e9fd1bd64ba3ef2676f06b068eba34 (patch) | |
tree | 0d5a8ac49f7671be6a405632f7a014cbc1c863ae /drivers/net/natsemi.c | |
parent | d49d19c962c5f409a7dc771f185afd22cdb49edf (diff) |
natsemi: 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/net/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 478edb92bca3..c5dec54251bf 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -779,6 +779,22 @@ static void __devinit natsemi_init_media (struct net_device *dev) | |||
779 | 779 | ||
780 | } | 780 | } |
781 | 781 | ||
782 | static const struct net_device_ops natsemi_netdev_ops = { | ||
783 | .ndo_open = netdev_open, | ||
784 | .ndo_stop = netdev_close, | ||
785 | .ndo_start_xmit = start_tx, | ||
786 | .ndo_get_stats = get_stats, | ||
787 | .ndo_set_multicast_list = set_rx_mode, | ||
788 | .ndo_change_mtu = natsemi_change_mtu, | ||
789 | .ndo_do_ioctl = netdev_ioctl, | ||
790 | .ndo_tx_timeout = ns_tx_timeout, | ||
791 | .ndo_set_mac_address = eth_mac_addr, | ||
792 | .ndo_validate_addr = eth_validate_addr, | ||
793 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
794 | .ndo_poll_controller = natsemi_poll_controller, | ||
795 | #endif | ||
796 | }; | ||
797 | |||
782 | static int __devinit natsemi_probe1 (struct pci_dev *pdev, | 798 | static int __devinit natsemi_probe1 (struct pci_dev *pdev, |
783 | const struct pci_device_id *ent) | 799 | const struct pci_device_id *ent) |
784 | { | 800 | { |
@@ -911,20 +927,9 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
911 | if (find_cnt < MAX_UNITS && full_duplex[find_cnt]) | 927 | if (find_cnt < MAX_UNITS && full_duplex[find_cnt]) |
912 | np->full_duplex = 1; | 928 | np->full_duplex = 1; |
913 | 929 | ||
914 | /* The chip-specific entries in the device structure. */ | 930 | dev->netdev_ops = &natsemi_netdev_ops; |
915 | dev->open = &netdev_open; | ||
916 | dev->hard_start_xmit = &start_tx; | ||
917 | dev->stop = &netdev_close; | ||
918 | dev->get_stats = &get_stats; | ||
919 | dev->set_multicast_list = &set_rx_mode; | ||
920 | dev->change_mtu = &natsemi_change_mtu; | ||
921 | dev->do_ioctl = &netdev_ioctl; | ||
922 | dev->tx_timeout = &ns_tx_timeout; | ||
923 | dev->watchdog_timeo = TX_TIMEOUT; | 931 | dev->watchdog_timeo = TX_TIMEOUT; |
924 | 932 | ||
925 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
926 | dev->poll_controller = &natsemi_poll_controller; | ||
927 | #endif | ||
928 | SET_ETHTOOL_OPS(dev, ðtool_ops); | 933 | SET_ETHTOOL_OPS(dev, ðtool_ops); |
929 | 934 | ||
930 | if (mtu) | 935 | if (mtu) |