diff options
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index f772e4dc328f..9c2494955bfc 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -911,6 +911,12 @@ e1000_probe(struct pci_dev *pdev, | |||
911 | (adapter->hw.mac_type != e1000_82547)) | 911 | (adapter->hw.mac_type != e1000_82547)) |
912 | netdev->features |= NETIF_F_TSO; | 912 | netdev->features |= NETIF_F_TSO; |
913 | 913 | ||
914 | #ifdef CONFIG_DEBUG_SLAB | ||
915 | /* 82544's work arounds do not play nicely with DEBUG SLAB */ | ||
916 | if (adapter->hw.mac_type == e1000_82544) | ||
917 | netdev->features &= ~NETIF_F_TSO; | ||
918 | #endif | ||
919 | |||
914 | #ifdef NETIF_F_TSO6 | 920 | #ifdef NETIF_F_TSO6 |
915 | if (adapter->hw.mac_type > e1000_82547_rev_2) | 921 | if (adapter->hw.mac_type > e1000_82547_rev_2) |
916 | netdev->features |= NETIF_F_TSO6; | 922 | netdev->features |= NETIF_F_TSO6; |