From 5aa59e2d32daf369f4958dadf6522327e692c5eb Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 7 Jan 2007 22:57:38 -0500
Subject: [PATCH] --- yaml --- r: 45387 b: refs/heads/master c:
 e6331173c8703602d264b3388b515d00f72fc4ae h: refs/heads/master i:   45385:
 814cedc55d9a558590a3c88f59128649d65f49c5   45383:
 03281b81e0cfb80a587d65a152596fb8fe6614b7 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index bbc5ba9e26b6..4465966c40e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a6b95c81c522d9dbd36b33d33b08e66c87a6088
+refs/heads/master: e6331173c8703602d264b3388b515d00f72fc4ae
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 4c1ff752048c..c6259c7127f6 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/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;