---

yaml --- r: 39776 b: refs/heads/master c: 7800fdd h: refs/heads/master v: v3
git-mirror · Oct 17, 2006 · 4b10e68 · 4b10e68
1 parent 30c1c65
commit 4b10e68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c74ac1c236457e454804774e832046c1a7cc0bf
+refs/heads/master: 7800fddcd05a7dc89276389b96664af4f7890ea7
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -356,16 +356,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
 	}
 
-	ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL);
-	if (sky2->autoneg == AUTONEG_DISABLE)
-		ctrl &= ~PHY_CT_ANE;
-	else
-		ctrl |= PHY_CT_ANE;
-
-	ctrl |= PHY_CT_RESET;
-	gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
-
-	ctrl = 0;
+	ctrl = PHY_CT_RESET;
 	ct1000 = 0;
 	adv = PHY_AN_CSMA;
 	reg = 0;
@@ -450,8 +441,6 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 			sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
 		else
 			sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
-
-		ctrl |= PHY_CT_RESET;
 	}
 
 	gma_write16(hw, port, GM_GP_CTRL, reg);