Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging"
This reverts commit72f3ab7462
, which was superceded by commit683a2aa339
("e1000: Do not truncate TSO TCP header with 82544 workaround"), which fixed the real problem. Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
@@ -995,12 +995,6 @@ e1000_probe(struct pci_dev *pdev,
|
|||||||
(adapter->hw.mac_type != e1000_82547))
|
(adapter->hw.mac_type != e1000_82547))
|
||||||
netdev->features |= NETIF_F_TSO;
|
netdev->features |= NETIF_F_TSO;
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_SLAB
|
|
||||||
/* 82544's work arounds do not play nicely with DEBUG SLAB */
|
|
||||||
if (adapter->hw.mac_type == e1000_82544)
|
|
||||||
netdev->features &= ~NETIF_F_TSO;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef NETIF_F_TSO6
|
#ifdef NETIF_F_TSO6
|
||||||
if (adapter->hw.mac_type > e1000_82547_rev_2)
|
if (adapter->hw.mac_type > e1000_82547_rev_2)
|
||||||
netdev->features |= NETIF_F_TSO6;
|
netdev->features |= NETIF_F_TSO6;
|
||||||
|
Reference in New Issue
Block a user