Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e6331173c8703602d264b3388b515d00f72fc4ae
Commit: e6331173c8703602d264b3388b515d00f72fc4ae
Parent: 3a6b95c81c522d9dbd36b33d33b08e66c87a6088
Author: Jeff Garzik <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 7 22:57:38 2007 -0500
Committer: Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sun Jan 7 22:57:38 2007 -0500
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 <[EMAIL PROTECTED]>
---
drivers/net/e1000/e1000_main.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4c1ff75..c6259c7 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
