From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Tue, 27 Jun 2006 16:08:13 +0000 (-0700)
Subject: e1000: disable ERT
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ab7bc0ad72a12ef8eacc1560c9342aa567f3531d;p=deliverable%2Flinux.git

e1000: disable ERT

Hardware is reported to have problems with ERT. We disable it for
all hardware to make sure we are not seeing unexplainable user
problems.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index a9e55dc10c55..cc0c77c4c170 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/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);
 }