3 files changed, 13 insertions, 17 deletions

diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
index 65391891d8c4..daec9b05d168 100644
--- a/drivers/net/phy/mdio-bitbang.c
+++ b/drivers/net/phy/mdio-bitbang.c
@@ -202,6 +202,14 @@ static int mdiobb_write(struct mii_bus *bus, int phy, int reg, u16 val)
         return 0;
 }
 
+static int mdiobb_reset(struct mii_bus *bus)
+{
+        struct mdiobb_ctrl *ctrl = bus->priv;
+        if (ctrl->reset)
+                ctrl->reset(bus);
+        return 0;
+}
+
 struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)
 {
         struct mii_bus *bus;
@@ -214,6 +222,7 @@ struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl)
 
         bus->read = mdiobb_read;
         bus->write = mdiobb_write;
+        bus->reset = mdiobb_reset;
         bus->priv = ctrl;
 
         return bus;
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 2843c90f712f..89c5a3eccc12 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -95,6 +95,7 @@ static struct mii_bus * __devinit mdio_gpio_bus_init(struct device *dev,
                 goto out;
 
         bitbang->ctrl.ops = &mdio_gpio_ops;
+        bitbang->ctrl.reset = pdata->reset;
         bitbang->mdc = pdata->mdc;
         bitbang->mdio = pdata->mdio;
 
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 83a5a5afec67..f320f466f03b 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -563,20 +563,9 @@ static int genphy_config_advert(struct phy_device *phydev)
         if (adv < 0)
                 return adv;
 
-        adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP | 
+        adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP |
                  ADVERTISE_PAUSE_ASYM);
-        if (advertise & ADVERTISED_10baseT_Half)
-                adv |= ADVERTISE_10HALF;
-        if (advertise & ADVERTISED_10baseT_Full)
-                adv |= ADVERTISE_10FULL;
-        if (advertise & ADVERTISED_100baseT_Half)
-                adv |= ADVERTISE_100HALF;
-        if (advertise & ADVERTISED_100baseT_Full)
-                adv |= ADVERTISE_100FULL;
-        if (advertise & ADVERTISED_Pause)
-                adv |= ADVERTISE_PAUSE_CAP;
-        if (advertise & ADVERTISED_Asym_Pause)
-                adv |= ADVERTISE_PAUSE_ASYM;
+        adv |= ethtool_adv_to_mii_adv_t(advertise);
 
         if (adv != oldadv) {
                 err = phy_write(phydev, MII_ADVERTISE, adv);
@@ -595,10 +584,7 @@ static int genphy_config_advert(struct phy_device *phydev)
                         return adv;
 
                 adv &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
-                if (advertise & SUPPORTED_1000baseT_Half)
-                        adv |= ADVERTISE_1000HALF;
-                if (advertise & SUPPORTED_1000baseT_Full)
-                        adv |= ADVERTISE_1000FULL;
+                adv |= ethtool_adv_to_mii_ctrl1000_t(advertise);
 
                 if (adv != oldadv) {
                         err = phy_write(phydev, MII_CTRL1000, adv);