Commit ea51ade9 authored Feb 13, 2012 by Florian Fainelli Committed by David S. Miller Feb 13, 2012

fec: fix PHY name to match fixed MDIO bus name



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>

parent c56e9e2a

drivers/net/ethernet/freescale/fec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}