Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[karo-tx-linux.git] / drivers / net / phy / phy.c

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 64be4664ccab0c906f34ce05f49c66d7cbf6def3..5130db8f5c4ec4b2ced76a400071814c3e638c60 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -309,8 +309,9 @@ EXPORT_SYMBOL(phy_ethtool_gset);
  * current state.  Use at own risk.
  */
 int phy_mii_ioctl(struct phy_device *phydev,
-               struct mii_ioctl_data *mii_data, int cmd)
+               struct ifreq *ifr, int cmd)
 {
+       struct mii_ioctl_data *mii_data = if_mii(ifr);
        u16 val = mii_data->val_in;
 
        switch (cmd) {
@@ -360,6 +361,11 @@ int phy_mii_ioctl(struct phy_device *phydev,
                }
                break;
 
+       case SIOCSHWTSTAMP:
+               if (phydev->drv->hwtstamp)
+                       return phydev->drv->hwtstamp(phydev, ifr);
+               /* fall through */
+
        default:
                return -EOPNOTSUPP;
        }