net: phy: split devices_in_package

[linux-2.6-microblaze.git] / drivers / net / phy / phylink.c

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 0ab65fb..7ce787c 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1638,11 +1638,11 @@ static int phylink_phy_read(struct phylink *pl, unsigned int phy_id,
                case MII_BMSR:
                case MII_PHYSID1:
                case MII_PHYSID2:
-                       devad = __ffs(phydev->c45_ids.devices_in_package);
+                       devad = __ffs(phydev->c45_ids.mmds_present);
                        break;
                case MII_ADVERTISE:
                case MII_LPA:
-                       if (!(phydev->c45_ids.devices_in_package & MDIO_DEVS_AN))
+                       if (!(phydev->c45_ids.mmds_present & MDIO_DEVS_AN))
                                return -EINVAL;
                        devad = MDIO_MMD_AN;
                        if (reg == MII_ADVERTISE)
@@ -1678,11 +1678,11 @@ static int phylink_phy_write(struct phylink *pl, unsigned int phy_id,
                case MII_BMSR:
                case MII_PHYSID1:
                case MII_PHYSID2:
-                       devad = __ffs(phydev->c45_ids.devices_in_package);
+                       devad = __ffs(phydev->c45_ids.mmds_present);
                        break;
                case MII_ADVERTISE:
                case MII_LPA:
-                       if (!(phydev->c45_ids.devices_in_package & MDIO_DEVS_AN))
+                       if (!(phydev->c45_ids.mmds_present & MDIO_DEVS_AN))
                                return -EINVAL;
                        devad = MDIO_MMD_AN;
                        if (reg == MII_ADVERTISE)