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/e1000/e1000_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/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index fb96c87f9e56..44ebc72962dc 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -338,7 +338,6 @@ e1000_set_tx_csum(struct net_device *netdev, uint32_t data) | |||
338 | return 0; | 338 | return 0; |
339 | } | 339 | } |
340 | 340 | ||
341 | #ifdef NETIF_F_TSO | ||
342 | static int | 341 | static int |
343 | e1000_set_tso(struct net_device *netdev, uint32_t data) | 342 | e1000_set_tso(struct net_device *netdev, uint32_t data) |
344 | { | 343 | { |
@@ -352,18 +351,15 @@ e1000_set_tso(struct net_device *netdev, uint32_t data) | |||
352 | else | 351 | else |
353 | netdev->features &= ~NETIF_F_TSO; | 352 | netdev->features &= ~NETIF_F_TSO; |
354 | 353 | ||
355 | #ifdef NETIF_F_TSO6 | ||
356 | if (data) | 354 | if (data) |
357 | netdev->features |= NETIF_F_TSO6; | 355 | netdev->features |= NETIF_F_TSO6; |
358 | else | 356 | else |
359 | netdev->features &= ~NETIF_F_TSO6; | 357 | netdev->features &= ~NETIF_F_TSO6; |
360 | #endif | ||
361 | 358 | ||
362 | DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled"); | 359 | DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled"); |
363 | adapter->tso_force = TRUE; | 360 | adapter->tso_force = TRUE; |
364 | return 0; | 361 | return 0; |
365 | } | 362 | } |
366 | #endif /* NETIF_F_TSO */ | ||
367 | 363 | ||
368 | static uint32_t | 364 | static uint32_t |
369 | e1000_get_msglevel(struct net_device *netdev) | 365 | e1000_get_msglevel(struct net_device *netdev) |
@@ -1971,10 +1967,8 @@ static const struct ethtool_ops e1000_ethtool_ops = { | |||
1971 | .set_tx_csum = e1000_set_tx_csum, | 1967 | .set_tx_csum = e1000_set_tx_csum, |
1972 | .get_sg = ethtool_op_get_sg, | 1968 | .get_sg = ethtool_op_get_sg, |
1973 | .set_sg = ethtool_op_set_sg, | 1969 | .set_sg = ethtool_op_set_sg, |
1974 | #ifdef NETIF_F_TSO | ||
1975 | .get_tso = ethtool_op_get_tso, | 1970 | .get_tso = ethtool_op_get_tso, |
1976 | .set_tso = e1000_set_tso, | 1971 | .set_tso = e1000_set_tso, |
1977 | #endif | ||
1978 | .self_test_count = e1000_diag_test_count, | 1972 | .self_test_count = e1000_diag_test_count, |
1979 | .self_test = e1000_diag_test, | 1973 | .self_test = e1000_diag_test, |
1980 | .get_strings = e1000_get_strings, | 1974 | .get_strings = e1000_get_strings, |