From: Kory Maincent Date: Tue, 14 Nov 2023 11:28:42 +0000 (+0100) Subject: net: ethtool: ts: Update GET_TS to reply the current selected timestamp X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=091fab122869a39e1bac2cc34df9b737a6f6f36d;p=linux.git net: ethtool: ts: Update GET_TS to reply the current selected timestamp 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 Signed-off-by: David S. Miller --- diff --git a/net/ethtool/ts.c b/net/ethtool/ts.c index f2dd65a2e69c0..bd219512b8de8 100644 --- a/net/ethtool/ts.c +++ b/net/ethtool/ts.c @@ -31,29 +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 = PHY_TIMESTAMPING; - } else if (ops->get_ts_info) { - struct ethtool_ts_info ts_info = {0}; - - ops->get_ts_info(dev, &ts_info); - if (ts_info.so_timestamping & - SOF_TIMESTAMPING_HARDWARE_MASK) - data->ts_layer = MAC_TIMESTAMPING; - - if (ts_info.so_timestamping & - SOF_TIMESTAMPING_SOFTWARE_MASK) - data->ts_layer = SOFTWARE_TIMESTAMPING; - } else { - data->ts_layer = NO_TIMESTAMPING; - } + data->ts_layer = dev->ts_layer; ethnl_ops_complete(dev);