diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-01-27 05:17:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-28 09:01:35 -0500 |
commit | 257ddbdad13cd3c4f7d03b85af632c508aa8abc9 (patch) | |
tree | d3b85a20a32fb2a9817016131f164cab85cafd82 /drivers/net/ixgbevf | |
parent | b50c2ea72a8ed6bc2a954019b6feb6ca41fce07e (diff) |
netdev: remove HAVE_ leftovers
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbevf')
-rw-r--r-- | drivers/net/ixgbevf/ixgbevf_main.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c index 7b3af107ca84..b9f10d05049d 100644 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c | |||
@@ -3262,7 +3262,6 @@ static void ixgbevf_shutdown(struct pci_dev *pdev) | |||
3262 | pci_disable_device(pdev); | 3262 | pci_disable_device(pdev); |
3263 | } | 3263 | } |
3264 | 3264 | ||
3265 | #ifdef HAVE_NET_DEVICE_OPS | ||
3266 | static const struct net_device_ops ixgbe_netdev_ops = { | 3265 | static const struct net_device_ops ixgbe_netdev_ops = { |
3267 | .ndo_open = &ixgbevf_open, | 3266 | .ndo_open = &ixgbevf_open, |
3268 | .ndo_stop = &ixgbevf_close, | 3267 | .ndo_stop = &ixgbevf_close, |
@@ -3278,29 +3277,12 @@ static const struct net_device_ops ixgbe_netdev_ops = { | |||
3278 | .ndo_vlan_rx_add_vid = &ixgbevf_vlan_rx_add_vid, | 3277 | .ndo_vlan_rx_add_vid = &ixgbevf_vlan_rx_add_vid, |
3279 | .ndo_vlan_rx_kill_vid = &ixgbevf_vlan_rx_kill_vid, | 3278 | .ndo_vlan_rx_kill_vid = &ixgbevf_vlan_rx_kill_vid, |
3280 | }; | 3279 | }; |
3281 | #endif /* HAVE_NET_DEVICE_OPS */ | ||
3282 | 3280 | ||
3283 | static void ixgbevf_assign_netdev_ops(struct net_device *dev) | 3281 | static void ixgbevf_assign_netdev_ops(struct net_device *dev) |
3284 | { | 3282 | { |
3285 | struct ixgbevf_adapter *adapter; | 3283 | struct ixgbevf_adapter *adapter; |
3286 | adapter = netdev_priv(dev); | 3284 | adapter = netdev_priv(dev); |
3287 | #ifdef HAVE_NET_DEVICE_OPS | ||
3288 | dev->netdev_ops = &ixgbe_netdev_ops; | 3285 | dev->netdev_ops = &ixgbe_netdev_ops; |
3289 | #else /* HAVE_NET_DEVICE_OPS */ | ||
3290 | dev->open = &ixgbevf_open; | ||
3291 | dev->stop = &ixgbevf_close; | ||
3292 | |||
3293 | dev->hard_start_xmit = &ixgbevf_xmit_frame; | ||
3294 | |||
3295 | dev->get_stats = &ixgbevf_get_stats; | ||
3296 | dev->set_multicast_list = &ixgbevf_set_rx_mode; | ||
3297 | dev->set_mac_address = &ixgbevf_set_mac; | ||
3298 | dev->change_mtu = &ixgbevf_change_mtu; | ||
3299 | dev->tx_timeout = &ixgbevf_tx_timeout; | ||
3300 | dev->vlan_rx_register = &ixgbevf_vlan_rx_register; | ||
3301 | dev->vlan_rx_add_vid = &ixgbevf_vlan_rx_add_vid; | ||
3302 | dev->vlan_rx_kill_vid = &ixgbevf_vlan_rx_kill_vid; | ||
3303 | #endif /* HAVE_NET_DEVICE_OPS */ | ||
3304 | ixgbevf_set_ethtool_ops(dev); | 3286 | ixgbevf_set_ethtool_ops(dev); |
3305 | dev->watchdog_timeo = 5 * HZ; | 3287 | dev->watchdog_timeo = 5 * HZ; |
3306 | } | 3288 | } |