diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2019-12-26 03:16:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-26 04:51:33 +0100 |
| commit | dfe6d68fc4049c799b2194d88523679a694ead75 (patch) | |
| tree | 24b886aa72ff211d9a4d7f8a321e2f782f8be09c /net/8021q | |
| parent | net: macvlan: Use the PHY time stamping interface. (diff) | |
| download | linux-dfe6d68fc4049c799b2194d88523679a694ead75.tar.xz linux-dfe6d68fc4049c799b2194d88523679a694ead75.zip | |
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: 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>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index e5bff5cc6f97..5ff8059837b4 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -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; struct phy_device *phydev = vlan->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(vlan->real_dev, info); } else { |