From 45b22d82c84bea05ee7489e44c7dbe8870dadfe9 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 15 Dec 2006 11:06:17 -0500
Subject: [PATCH] --- yaml --- r: 45029 b: refs/heads/master c:
 bb8e3311ef9de8e72f45f910e4a977c313c7009c h: refs/heads/master i:   45027:
 42be7b2877f0bc94e5afb843395a36384664f929 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_hw.c   | 6 ++++++
 trunk/drivers/net/e1000/e1000_hw.h   | 1 +
 trunk/drivers/net/e1000/e1000_main.c | 7 +++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f0485785b7fe..4fd7388b8847 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72f3ab7462f4e153d1e8ac78e379716ad71d6923
+refs/heads/master: bb8e3311ef9de8e72f45f910e4a977c313c7009c
diff --git a/trunk/drivers/net/e1000/e1000_hw.c b/trunk/drivers/net/e1000/e1000_hw.c
index 1ea556ef093b..ea7b371e9119 100644
--- a/trunk/drivers/net/e1000/e1000_hw.c
+++ b/trunk/drivers/net/e1000/e1000_hw.c
@@ -452,6 +452,12 @@ e1000_set_mac_type(struct e1000_hw *hw)
 	if (hw->mac_type >= e1000_82571)
 		hw->has_manc2h = TRUE;
 
+	/* In rare occasions, ESB2 systems would end up started without
+	 * the RX unit being turned on.
+	 */
+	if (hw->mac_type == e1000_80003es2lan)
+		hw->rx_needs_kicking = TRUE;
+
 	return E1000_SUCCESS;
 }
 
diff --git a/trunk/drivers/net/e1000/e1000_hw.h b/trunk/drivers/net/e1000/e1000_hw.h
index 18a4ae4549ad..f4d01e169c48 100644
--- a/trunk/drivers/net/e1000/e1000_hw.h
+++ b/trunk/drivers/net/e1000/e1000_hw.h
@@ -1463,6 +1463,7 @@ struct e1000_hw {
 	boolean_t		kmrn_lock_loss_workaround_disabled;
 	boolean_t		bad_tx_carr_stats_fd;
 	boolean_t		has_manc2h;
+	boolean_t		rx_needs_kicking;
 };
 
 
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 9c2494955bfc..343eb68fff73 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -2579,6 +2579,13 @@ e1000_watchdog(unsigned long data)
 			netif_wake_queue(netdev);
 			mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
 			adapter->smartspeed = 0;
+		} else {
+			/* make sure the receive unit is started */
+			if (adapter->hw.rx_needs_kicking) {
+				struct e1000_hw *hw = &adapter->hw;
+				uint32_t rctl = E1000_READ_REG(hw, RCTL);
+				E1000_WRITE_REG(hw, RCTL, rctl | E1000_RCTL_EN);
+			}
 		}
 	} else {
 		if (netif_carrier_ok(netdev)) {