From 940522a2d7fc0e643f8835c2624c01984f75cbb8 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Tue, 27 Jun 2006 09:08:13 -0700
Subject: [PATCH] --- yaml --- r: 32183 b: refs/heads/master c:
 ab7bc0ad72a12ef8eacc1560c9342aa567f3531d h: refs/heads/master i:   32181:
 cabdc806a6af4cd2f9ba31841e6ea8ff46dab5d8   32179:
 98dd697025234aedab6b8942690827d51f0ab0f7   32175:
 9f9b44b41b9464e46e680d4f0d5d1a61fb1aef82 v: v3

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

diff --git a/[refs] b/[refs]
index d4c48912521a..fcc0bbf43d90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 592600a0536f0d5aab4dc95f19515a37d03430f8
+refs/heads/master: ab7bc0ad72a12ef8eacc1560c9342aa567f3531d
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index a9e55dc10c55..cc0c77c4c170 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -1806,9 +1806,6 @@ e1000_configure_rx(struct e1000_adapter *adapter)
 		E1000_WRITE_REG(hw, RXCSUM, rxcsum);
 	}
 
-	if (hw->mac_type == e1000_82573)
-		E1000_WRITE_REG(hw, ERT, 0x0100);
-
 	/* Enable Receives */
 	E1000_WRITE_REG(hw, RCTL, rctl);
 }