---

yaml --- r: 287687 b: refs/heads/master c: c56e9e2 h: refs/heads/master i: 287685: 5a811fc 287683: 1878627 287679: 0325e3f v: v3
git-mirror · Feb 13, 2012 · a459fbb · a459fbb
1 parent 6753b8a
commit a459fbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a19c5d68410a90c19521d966c88939700c4a1b3d
+refs/heads/master: c56e9e2ae766b687ed66c3c9c3bb6b2ee15405b2
diff --git a/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -797,7 +797,7 @@ static int bcm_enet_open(struct net_device *dev)
 	if (priv->has_phy) {
 		/* connect to PHY */
 		snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
-			 priv->mac_id ? "1" : "0", priv->phy_id);
+			 priv->mii_bus->id, priv->phy_id);
 
 		phydev = phy_connect(dev, phy_id, bcm_enet_adjust_phy_link, 0,
 				     PHY_INTERFACE_MODE_MII);