---

yaml --- r: 184053 b: refs/heads/master c: 603f117 h: refs/heads/master i: 184051: 9599041 v: v3
git-mirror · Feb 13, 2010 · 1710242 · 1710242
1 parent 540a333
commit 1710242
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0339e4e3effeae71e2b19c6340ef9672fb7a2cb3
+refs/heads/master: 603f11738cee4d46a2a1d394ae80d718f8d37cba
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -7595,8 +7595,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 		tg3_abort_hw(tp, 1);
 	}
 
-	if (reset_phy &&
-	    !(tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB))
+	if (reset_phy)
 		tg3_phy_reset(tp);
 
 	err = tg3_chip_reset(tp);