---

yaml --- r: 45036 b: refs/heads/master c: 79f3d39 h: refs/heads/master v: v3
git-mirror · Dec 26, 2006 · e7eed2b · e7eed2b
1 parent e68ba52
commit e7eed2b
Show file tree

Hide file tree

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