From e7eed2beceee11dcb1e9377449829e6678dce93f Mon Sep 17 00:00:00 2001
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Fri, 15 Dec 2006 10:42:34 +0100
Subject: [PATCH] --- yaml --- r: 45036 b: refs/heads/master c:
 79f3d3996f06ee339c6f173e573826eccd3914ab h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ec3fd0a6d285..ec5a0c6562b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e376b4eed2575b323d575403569ec1b5f63fda
+refs/heads/master: 79f3d3996f06ee339c6f173e573826eccd3914ab
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index b06b51a55276..8c4924f1f7ed 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -556,7 +556,8 @@ e1000_up(struct e1000_adapter *adapter)
 
 	clear_bit(__E1000_DOWN, &adapter->flags);
 
-	mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+	/* fire a link change interrupt to start the watchdog */
+	E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC);
 	return 0;
 }