]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: macvlan: Use the PHY time stamping interface.
authorRichard Cochran <richardcochran@gmail.com>
Thu, 26 Dec 2019 02:16:10 +0000 (18:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Dec 2019 03:51:33 +0000 (19:51 -0800)
The macvlan layer tests fields of the phy_device in order to determine
whether to invoke the PHY's tsinfo ethtool callback.  This patch
replaces the open coded logic with an invocation of the proper
methods.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/macvlan.c

index 05631d97eeb4fbfe3ca599dfdccb1c355b1feb45..d066cf58c92666e11db2b5e76eb4f651262f1837 100644 (file)
@@ -1036,8 +1036,8 @@ static int macvlan_ethtool_get_ts_info(struct net_device *dev,
        const struct ethtool_ops *ops = real_dev->ethtool_ops;
        struct phy_device *phydev = real_dev->phydev;
 
-       if (phydev && phydev->drv && phydev->drv->ts_info) {
-                return phydev->drv->ts_info(phydev, info);
+       if (phy_has_tsinfo(phydev)) {
+               return phy_ts_info(phydev, info);
        } else if (ops->get_ts_info) {
                return ops->get_ts_info(real_dev, info);
        } else {