2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index bd88d818f082..5130db8f5c4e 100644
--- 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;
         }
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 1a99bb244106..c0761197c07e 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -460,6 +460,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
         }
 
         phydev->attached_dev = dev;
+        dev->phydev = phydev;
 
         phydev->dev_flags = flags;
 
@@ -513,6 +514,7 @@ EXPORT_SYMBOL(phy_attach);
  */
 void phy_detach(struct phy_device *phydev)
 {
+        phydev->attached_dev->phydev = NULL;
         phydev->attached_dev = NULL;
 
         /* If the device had no specific driver before (i.e. - it