diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-23 00:03:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-23 00:03:15 +0100 |
| commit | 7bbb71150e57875126efacc2efdc678e3cede919 (patch) | |
| tree | 98214ae416931f4ff0fdf3aca0b99dc6afc72b28 /net/ethtool/tsinfo.c | |
| parent | ffe4b381e2ea97c7a5868dbe841c7522b1b0b408 (diff) | |
| parent | 6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff) | |
regulator: Merge up v6.10-rc4
There are fixes for kselftest with clang that really help my CI.
Diffstat (limited to 'net/ethtool/tsinfo.c')
| -rw-r--r-- | net/ethtool/tsinfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ethtool/tsinfo.c b/net/ethtool/tsinfo.c index be2755c8d8fd..57d496287e52 100644 --- a/net/ethtool/tsinfo.c +++ b/net/ethtool/tsinfo.c @@ -38,11 +38,11 @@ static int tsinfo_prepare_data(const struct ethnl_req_info *req_base, ret = ethnl_ops_begin(dev); if (ret < 0) return ret; - if (req_base->flags & ETHTOOL_FLAG_STATS && - dev->ethtool_ops->get_ts_stats) { + if (req_base->flags & ETHTOOL_FLAG_STATS) { ethtool_stats_init((u64 *)&data->stats, sizeof(data->stats) / sizeof(u64)); - dev->ethtool_ops->get_ts_stats(dev, &data->stats); + if (dev->ethtool_ops->get_ts_stats) + dev->ethtool_ops->get_ts_stats(dev, &data->stats); } ret = __ethtool_get_ts_info(dev, &data->ts_info); ethnl_ops_complete(dev); |