diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-07-30 22:50:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-09-02 10:02:08 +0100 |
| commit | ea00b42dcb76ad1849d122b15feefa94669ec563 (patch) | |
| tree | 3dc097199dd5db48073e5bfd0a5ed0a51ba86e92 | |
| parent | c05245689470468940694c0c51a9cb54187dac11 (diff) | |
net: ethtool: allow MAC drivers to override ethtool get_ts_info
Check whether the MAC driver has implemented the get_ts_info()
method first, and call it if present. If this method returns
-EOPNOTSUPP, defer to the phylib or default implementation.
XXX: review any drivers that use phylib and provide get_ts_info().
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | net/ethtool/common.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ethtool/common.c b/net/ethtool/common.c index aaecfc916a4d..0db5c397a645 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -358,14 +358,18 @@ int __ethtool_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) { const struct ethtool_ops *ops = dev->ethtool_ops; struct phy_device *phydev = dev->phydev; + int ret; memset(info, 0, sizeof(*info)); info->cmd = ETHTOOL_GET_TS_INFO; + if (ops->get_ts_info) { + ret = ops->get_ts_info(dev, info); + if (ret != -EOPNOTSUPP) + return ret; + } if (phy_has_tsinfo(phydev)) return phy_ts_info(phydev, info); - if (ops->get_ts_info) - return ops->get_ts_info(dev, info); info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE | SOF_TIMESTAMPING_SOFTWARE; |