From: Kory Maincent <kory.maincent@xxxxxxxxxxx>
As the default selected timestamp API change we have to change also the
timestamp return by ethtool. This patch return now the current selected
timestamp.
Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx>
---
net/ethtool/ts.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/net/ethtool/ts.c b/net/ethtool/ts.c
index d52b9800dc3b..11041a16de5b 100644
--- a/net/ethtool/ts.c
+++ b/net/ethtool/ts.c
@@ -31,19 +31,13 @@ static int ts_prepare_data(const struct ethnl_req_info *req_base,
{
struct ts_reply_data *data = TS_REPDATA(reply_base);
struct net_device *dev = reply_base->dev;
- const struct ethtool_ops *ops = dev->ethtool_ops;
int ret;
ret = ethnl_ops_begin(dev);
if (ret < 0)
return ret;
- if (phy_has_tsinfo(dev->phydev))
- data->ts_layer = PHYLIB_TIMESTAMPING;
- else if (ops->get_ts_info)
- data->ts_layer = NETDEV_TIMESTAMPING;
- else
- data->ts_layer = NO_TIMESTAMPING;
+ data->ts_layer = dev->ts_layer;
ethnl_ops_complete(dev);
--
2.25.1
