---

yaml --- r: 45387 b: refs/heads/master c: e633117 h: refs/heads/master i: 45385: 814cedc 45383: 03281b8 v: v3
git-mirror · Jan 8, 2007 · 5aa59e2 · 5aa59e2
1 parent f8f59c1
commit 5aa59e2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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;