diff options
| author |   Florian Fainelli <florian@openwrt.org> | 2012-02-13 01:23:21 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-02-13 16:04:08 -0500 |
| commit | c56e9e2ae766b687ed66c3c9c3bb6b2ee15405b2 (patch) | |
| tree | 1aeab13179c124113d22529834f0c60ae6e86330 /drivers/net | |
| parent | cpmac: fix PHY name to match MDIO bus name (diff) | |
| download | linux-dev-c56e9e2ae766b687ed66c3c9c3bb6b2ee15405b2.tar.xz linux-dev-c56e9e2ae766b687ed66c3c9c3bb6b2ee15405b2.zip | |
bcm63xx-enet: fix PHY name to match MDIO bus name
Commit 3e617506: bcm63xx_enet: use an unique MDIO bus name introduced
a regression in the PHY connection logic, since the PHY name was formatted
to expect the bus name to be "0" or "1", whereas it is now "bcm63xx-enet-0"
or "bcm63xx-enet-1".
Reported-by: Joel EJC <joel_ejc@yahoofr>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 986019b2c849..c7ca7ec065ee 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/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); |