diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-04-13 20:46:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-14 13:03:06 -0700 |
| commit | 16756d3e77ad58cd07e36cbed724aa13ae5a0278 (patch) | |
| tree | c9ba1c42ab61d04ca305e747e0d86d562272753a /net/ethtool | |
| parent | 2afeec08ab5c86ae21952151f726bfe184f6b23d (diff) | |
| download | lwn-16756d3e77ad58cd07e36cbed724aa13ae5a0278.tar.gz lwn-16756d3e77ad58cd07e36cbed724aa13ae5a0278.zip | |
ethtool: pause: make sure we init driver stats
The intention was for pause statistics to not be reported
when driver does not have the relevant callback (only
report an empty netlink nest). What happens currently
we report all 0s instead. Make sure statistics are
initialized to "not set" (which is -1) so the dumping
code skips them.
Fixes: 9a27a33027f2 ("ethtool: add standard pause stats")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethtool')
| -rw-r--r-- | net/ethtool/pause.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ethtool/pause.c b/net/ethtool/pause.c index 09998dc5c185..d4ac02718b72 100644 --- a/net/ethtool/pause.c +++ b/net/ethtool/pause.c @@ -38,16 +38,16 @@ static int pause_prepare_data(const struct ethnl_req_info *req_base, if (!dev->ethtool_ops->get_pauseparam) return -EOPNOTSUPP; + ethtool_stats_init((u64 *)&data->pausestat, + sizeof(data->pausestat) / 8); + ret = ethnl_ops_begin(dev); if (ret < 0) return ret; dev->ethtool_ops->get_pauseparam(dev, &data->pauseparam); if (req_base->flags & ETHTOOL_FLAG_STATS && - dev->ethtool_ops->get_pause_stats) { - ethtool_stats_init((u64 *)&data->pausestat, - sizeof(data->pausestat) / 8); + dev->ethtool_ops->get_pause_stats) dev->ethtool_ops->get_pause_stats(dev, &data->pausestat); - } ethnl_ops_complete(dev); return 0; |