diff options
| author |   Florian Fainelli <florian@openwrt.org> | 2012-02-13 01:23:23 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-02-13 16:04:09 -0500 |
| commit | b0c06e12b6f1dad480c459ddc5412a0fd8582201 (patch) | |
| tree | 261f5edb91526a40f616949293c650ea10015667 /drivers/net/ethernet/octeon | |
| parent | fec: fix PHY name to match fixed MDIO bus name (diff) | |
| download | linux-dev-b0c06e12b6f1dad480c459ddc5412a0fd8582201.tar.xz linux-dev-b0c06e12b6f1dad480c459ddc5412a0fd8582201.zip | |
octeon: fix PHY name to match MDIO bus name
Commit "d6c25be: mdio-octeon: use an unique MDIO bus name" changed the
octeon MDIO bus name from "0" to "mdio-octeon-0", change the PHY
formatting logic to account for that name change, so that PHY connection
on this bus succeeds.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/octeon')
| -rw-r--r-- | drivers/net/ethernet/octeon/octeon_mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index 212f43b308a3..cd827ff4a021 100644 --- a/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -670,7 +670,7 @@ static void octeon_mgmt_adjust_link(struct net_device *netdev) static int octeon_mgmt_init_phy(struct net_device *netdev) { struct octeon_mgmt *p = netdev_priv(netdev); - char phy_id[20]; + char phy_id[MII_BUS_ID_SIZE + 3]; if (octeon_is_simulation()) { /* No PHYs in the simulator. */ @@ -678,7 +678,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev) return 0; } - snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "0", p->port); + snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "mdio-octeon-0", p->port); p->phydev = phy_connect(netdev, phy_id, octeon_mgmt_adjust_link, 0, PHY_INTERFACE_MODE_MII); |