Skip to content

Commit

Permalink
net: ethtool: ts: Update GET_TS to reply the current selected timestamp
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
kmaincent authored and davem330 committed Nov 18, 2023
1 parent 0f7f463 commit 091fab1
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions net/ethtool/ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 091fab1

Please sign in to comment.