diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:21:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:21:56 -0500 |
commit | 7677ced48e2bbbb8d847d34f37e5d96d2b0e41e4 (patch) | |
tree | 0a859f403c02eb854d9ffa11bd17f77056891d07 /drivers/net/ixgb/ixgb_main.c | |
parent | 21d37bbc65e39a26856de6b14be371ff24e0d03f (diff) | |
parent | ac38dfc39e7684f55174742e5f0d6c5a0093bbf6 (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits)
sk98lin: planned removal
AT91: MACB support
sky2: version 1.12
sky2: add new chip ids
sky2: Yukon Extreme support
sky2: safer transmit timeout
sky2: TSO support for EC_U
sky2: use dev_err for error reports
sky2: add Wake On Lan support
fix unaligned exception in /drivers/net/wireless/orinoco.c
Remove unused kernel config option DLCI_COUNT
z85230: spinlock logic
mips: declance: Driver model for the PMAD-A
Spidernet: Rework RX linked list
NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
hp100: convert pci_module_init() to pci_register_driver()
NetXen: Added ethtool support for user level tools.
NetXen: Firmware crb init changes.
maintainers: add atl1 maintainers
...
Diffstat (limited to 'drivers/net/ixgb/ixgb_main.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index a083a9189230..51bd7e8ff0d6 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -456,9 +456,7 @@ ixgb_probe(struct pci_dev *pdev, | |||
456 | NETIF_F_HW_VLAN_TX | | 456 | NETIF_F_HW_VLAN_TX | |
457 | NETIF_F_HW_VLAN_RX | | 457 | NETIF_F_HW_VLAN_RX | |
458 | NETIF_F_HW_VLAN_FILTER; | 458 | NETIF_F_HW_VLAN_FILTER; |
459 | #ifdef NETIF_F_TSO | ||
460 | netdev->features |= NETIF_F_TSO; | 459 | netdev->features |= NETIF_F_TSO; |
461 | #endif | ||
462 | #ifdef NETIF_F_LLTX | 460 | #ifdef NETIF_F_LLTX |
463 | netdev->features |= NETIF_F_LLTX; | 461 | netdev->features |= NETIF_F_LLTX; |
464 | #endif | 462 | #endif |
@@ -1176,7 +1174,6 @@ ixgb_watchdog(unsigned long data) | |||
1176 | static int | 1174 | static int |
1177 | ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) | 1175 | ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) |
1178 | { | 1176 | { |
1179 | #ifdef NETIF_F_TSO | ||
1180 | struct ixgb_context_desc *context_desc; | 1177 | struct ixgb_context_desc *context_desc; |
1181 | unsigned int i; | 1178 | unsigned int i; |
1182 | uint8_t ipcss, ipcso, tucss, tucso, hdr_len; | 1179 | uint8_t ipcss, ipcso, tucss, tucso, hdr_len; |
@@ -1233,7 +1230,6 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb) | |||
1233 | 1230 | ||
1234 | return 1; | 1231 | return 1; |
1235 | } | 1232 | } |
1236 | #endif | ||
1237 | 1233 | ||
1238 | return 0; | 1234 | return 0; |
1239 | } | 1235 | } |