diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2006-12-12 08:06:23 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 16:58:45 -0500 |
commit | 1d39ed565cfcc7c4fe586de621aef495c4f94ffb (patch) | |
tree | af3280a25eb796385c851dc7b83e82f0ff38f1ac /drivers/net/ixgb/ixgb_ethtool.c | |
parent | 6d24998f07588ca83ce04e60af5a79e805df7532 (diff) |
remove NETIF_F_TSO ifdefery
Remove the NETIF_F_TSO #ifdef-ery in drivers/net; this was
for old-old-2.4 compat (even current 2.4 has NETIF_F_TSO)
but it's time to get rid of it by now.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ixgb/ixgb_ethtool.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_ethtool.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c index 82c044d6e08a..d6628bd9590a 100644 --- a/drivers/net/ixgb/ixgb_ethtool.c +++ b/drivers/net/ixgb/ixgb_ethtool.c | |||
@@ -82,10 +82,8 @@ static struct ixgb_stats ixgb_gstrings_stats[] = { | |||
82 | {"tx_restart_queue", IXGB_STAT(restart_queue) }, | 82 | {"tx_restart_queue", IXGB_STAT(restart_queue) }, |
83 | {"rx_long_length_errors", IXGB_STAT(stats.roc)}, | 83 | {"rx_long_length_errors", IXGB_STAT(stats.roc)}, |
84 | {"rx_short_length_errors", IXGB_STAT(stats.ruc)}, | 84 | {"rx_short_length_errors", IXGB_STAT(stats.ruc)}, |
85 | #ifdef NETIF_F_TSO | ||
86 | {"tx_tcp_seg_good", IXGB_STAT(stats.tsctc)}, | 85 | {"tx_tcp_seg_good", IXGB_STAT(stats.tsctc)}, |
87 | {"tx_tcp_seg_failed", IXGB_STAT(stats.tsctfc)}, | 86 | {"tx_tcp_seg_failed", IXGB_STAT(stats.tsctfc)}, |
88 | #endif | ||
89 | {"rx_flow_control_xon", IXGB_STAT(stats.xonrxc)}, | 87 | {"rx_flow_control_xon", IXGB_STAT(stats.xonrxc)}, |
90 | {"rx_flow_control_xoff", IXGB_STAT(stats.xoffrxc)}, | 88 | {"rx_flow_control_xoff", IXGB_STAT(stats.xoffrxc)}, |
91 | {"tx_flow_control_xon", IXGB_STAT(stats.xontxc)}, | 89 | {"tx_flow_control_xon", IXGB_STAT(stats.xontxc)}, |
@@ -240,7 +238,6 @@ ixgb_set_tx_csum(struct net_device *netdev, uint32_t data) | |||
240 | return 0; | 238 | return 0; |
241 | } | 239 | } |
242 | 240 | ||
243 | #ifdef NETIF_F_TSO | ||
244 | static int | 241 | static int |
245 | ixgb_set_tso(struct net_device *netdev, uint32_t data) | 242 | ixgb_set_tso(struct net_device *netdev, uint32_t data) |
246 | { | 243 | { |
@@ -250,7 +247,6 @@ ixgb_set_tso(struct net_device *netdev, uint32_t data) | |||
250 | netdev->features &= ~NETIF_F_TSO; | 247 | netdev->features &= ~NETIF_F_TSO; |
251 | return 0; | 248 | return 0; |
252 | } | 249 | } |
253 | #endif /* NETIF_F_TSO */ | ||
254 | 250 | ||
255 | static uint32_t | 251 | static uint32_t |
256 | ixgb_get_msglevel(struct net_device *netdev) | 252 | ixgb_get_msglevel(struct net_device *netdev) |
@@ -722,10 +718,8 @@ static const struct ethtool_ops ixgb_ethtool_ops = { | |||
722 | .set_sg = ethtool_op_set_sg, | 718 | .set_sg = ethtool_op_set_sg, |
723 | .get_msglevel = ixgb_get_msglevel, | 719 | .get_msglevel = ixgb_get_msglevel, |
724 | .set_msglevel = ixgb_set_msglevel, | 720 | .set_msglevel = ixgb_set_msglevel, |
725 | #ifdef NETIF_F_TSO | ||
726 | .get_tso = ethtool_op_get_tso, | 721 | .get_tso = ethtool_op_get_tso, |
727 | .set_tso = ixgb_set_tso, | 722 | .set_tso = ixgb_set_tso, |
728 | #endif | ||
729 | .get_strings = ixgb_get_strings, | 723 | .get_strings = ixgb_get_strings, |
730 | .phys_id = ixgb_phys_id, | 724 | .phys_id = ixgb_phys_id, |
731 | .get_stats_count = ixgb_get_stats_count, | 725 | .get_stats_count = ixgb_get_stats_count, |