Commit dfe6d68f authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller

net: vlan: Use the PHY time stamping interface.

The vlan 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: default avatarRichard Cochran <richardcochran@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d25de984
...@@ -646,8 +646,8 @@ static int vlan_ethtool_get_ts_info(struct net_device *dev, ...@@ -646,8 +646,8 @@ static int vlan_ethtool_get_ts_info(struct net_device *dev,
const struct ethtool_ops *ops = vlan->real_dev->ethtool_ops; const struct ethtool_ops *ops = vlan->real_dev->ethtool_ops;
struct phy_device *phydev = vlan->real_dev->phydev; struct phy_device *phydev = vlan->real_dev->phydev;
if (phydev && phydev->drv && phydev->drv->ts_info) { if (phy_has_tsinfo(phydev)) {
return phydev->drv->ts_info(phydev, info); return phy_ts_info(phydev, info);
} else if (ops->get_ts_info) { } else if (ops->get_ts_info) {
return ops->get_ts_info(vlan->real_dev, info); return ops->get_ts_info(vlan->real_dev, info);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment