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.h | |
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.h')
-rw-r--r-- | drivers/net/e1000/e1000.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 8e7acb08d9a3..689f158a469e 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
@@ -59,17 +59,13 @@ | |||
59 | #include <linux/capability.h> | 59 | #include <linux/capability.h> |
60 | #include <linux/in.h> | 60 | #include <linux/in.h> |
61 | #include <linux/ip.h> | 61 | #include <linux/ip.h> |
62 | #ifdef NETIF_F_TSO6 | ||
63 | #include <linux/ipv6.h> | 62 | #include <linux/ipv6.h> |
64 | #endif | ||
65 | #include <linux/tcp.h> | 63 | #include <linux/tcp.h> |
66 | #include <linux/udp.h> | 64 | #include <linux/udp.h> |
67 | #include <net/pkt_sched.h> | 65 | #include <net/pkt_sched.h> |
68 | #include <linux/list.h> | 66 | #include <linux/list.h> |
69 | #include <linux/reboot.h> | 67 | #include <linux/reboot.h> |
70 | #ifdef NETIF_F_TSO | ||
71 | #include <net/checksum.h> | 68 | #include <net/checksum.h> |
72 | #endif | ||
73 | #include <linux/mii.h> | 69 | #include <linux/mii.h> |
74 | #include <linux/ethtool.h> | 70 | #include <linux/ethtool.h> |
75 | #include <linux/if_vlan.h> | 71 | #include <linux/if_vlan.h> |
@@ -347,9 +343,7 @@ struct e1000_adapter { | |||
347 | boolean_t have_msi; | 343 | boolean_t have_msi; |
348 | #endif | 344 | #endif |
349 | /* to not mess up cache alignment, always add to the bottom */ | 345 | /* to not mess up cache alignment, always add to the bottom */ |
350 | #ifdef NETIF_F_TSO | ||
351 | boolean_t tso_force; | 346 | boolean_t tso_force; |
352 | #endif | ||
353 | boolean_t smart_power_down; /* phy smart power down */ | 347 | boolean_t smart_power_down; /* phy smart power down */ |
354 | boolean_t quad_port_a; | 348 | boolean_t quad_port_a; |
355 | unsigned long flags; | 349 | unsigned long flags; |