fec: fix PHY name to match fixed MDIO bus name
authorFlorian Fainelli <florian@openwrt.org>
Mon, 13 Feb 2012 01:23:22 +0000 (01:23 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Feb 2012 21:04:09 +0000 (16:04 -0500)
Commit "391420f7: fec: use an unique MDIO bus name" first modified
the MDIO bus name to include the platform name, then in commit
"a7ed07d5: net: fec: correct phy_name buffer length when init phy_name"
the PHY name formatting was fixed in the case the PHY matches a PHY
driver.

The FEC driver however, also handles the case where we want to attach
to the fixed MDIO bus name, which was previously named "0", and now
"fixed-0". Change the PHY formatting logic to account for that.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fec.c

index 1c7aad8fa19c80cbdbe5a61fdd2c677f555f559f..e92ef1bd732a4fe9cf4f0ad8569117bb711eea31 100644 (file)
@@ -986,7 +986,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
                printk(KERN_INFO
                        "%s: no PHY, assuming direct connection to switch\n",
                        ndev->name);
-               strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE);
+               strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE);
                phy_id = 0;
        }