15 lines
749 B
Diff
15 lines
749 B
Diff
|
diff -pruN linux-2.6.24.2.old/drivers/net/cpmac.c linux-2.6.24.2/drivers/net/cpmac.c
|
||
|
|
--- linux-2.6.24.2.old/drivers/net/cpmac.c 2008-03-20 20:33:01.000000000 +0100
|
||
|
|
+++ linux-2.6.24.2/drivers/net/cpmac.c 2008-03-20 20:47:31.000000000 +0100
|
||
|
|
@@ -1178,9 +1179,7 @@ static int __devinit cpmac_probe(struct
|
||
|
|
priv->msg_enable = netif_msg_init(debug_level, 0xff);
|
||
|
|
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
|
||
|
|
|
||
|
|
- snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
|
||
|
|
-
|
||
|
|
- priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0,
|
||
|
|
+ priv->phy = phy_connect(dev, cpmac_mii.phy_map[phy_id]->dev.bus_id, &cpmac_adjust_link, 0,
|
||
|
|
PHY_INTERFACE_MODE_MII);
|
||
|
|
if (IS_ERR(priv->phy)) {
|
||
|
|
if (netif_msg_drv(priv))
|