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 bd88d818f0826aa8f892b6efae8b99404c41390b..5130db8f5c4ec4b2ced76a400071814c3e638c60 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -361,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;
        }