Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6331173 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging" 



This reverts commit 72f3ab74, which was
superceded by commit 683a2aa3
("e1000: Do not truncate TSO TCP header with 82544 workaround"), which
fixed the real problem.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 3a6b95c8

drivers/net/e1000/e1000_main.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -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;