From a459fbb6048bc7341ec983b57b3df521ed48a129 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 13 Feb 2012 01:23:21 +0000
Subject: [PATCH] --- yaml --- r: 287687 b: refs/heads/master c:
 c56e9e2ae766b687ed66c3c9c3bb6b2ee15405b2 h: refs/heads/master i:   287685:
 5a811fc1944f1b9ea0339cb625d1117f1c487b26   287683:
 187862771496f3f0a0bc0cbf12116b2f92cb1925   287679:
 0325e3ff12b4947302df24402b13038600e50642 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 549de8368f8a..f81f94994e9a 100644
--- 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
index 986019b2c849..c7ca7ec065ee 100644
--- 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);