mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-12 16:58:53 +00:00
Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging"
This reverts commit 72f3ab7462f4e153d1e8ac78e379716ad71d6923, which was superceded by commit 683a2aa339f607c8a422835161ceab68b2a5a18a ("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:
parent
3a6b95c81c
commit
e6331173c8
@ -995,12 +995,6 @@ e1000_probe(struct pci_dev *pdev,
|
||||
(adapter->hw.mac_type != e1000_82547))
|
||||
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
|
||||
if (adapter->hw.mac_type > e1000_82547_rev_2)
|
||||
netdev->features |= NETIF_F_TSO6;
|
||||
|
Loading…
x
Reference in New Issue
Block a user