---

yaml --- r: 18801 b: refs/heads/master c: 526f995 h: refs/heads/master i: 18799: 16f2d24 v: v3
git-mirror · Jan 17, 2006 · 54741dd · 54741dd
1 parent 926a3d9
commit 54741dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 492731632cce0a7c8817376e1316f0af093830c4
+refs/heads/master: 526f99572e9f18f42c8da2c9adafbe64482c0737
diff --git a/trunk/drivers/net/e1000/e1000_hw.c b/trunk/drivers/net/e1000/e1000_hw.c
@@ -838,6 +838,11 @@ e1000_setup_link(struct e1000_hw *hw)
 
     DEBUGFUNC("e1000_setup_link");
 
+    /* In the case of the phy reset being blocked, we already have a link.
+     * We do not have to set it up again. */
+    if (e1000_check_phy_reset_block(hw))
+        return E1000_SUCCESS;
+
     /* Read and store word 0x0F of the EEPROM. This word contains bits
      * that determine the hardware's default PAUSE (flow control) mode,
      * a bit that determines whether the HW defaults to enabling or