diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-03-16 13:47:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-17 20:56:58 -0700 |
| commit | 9000edb71ab29d184aa33f5a77fa6e52d8812bb9 (patch) | |
| tree | 9640630ca6bd67eff03758b3a7dc6930b309b7b7 /net/ethtool | |
| parent | 329bab6ea945e5d14193e650d5a1283b6d2f6d29 (diff) | |
| download | linux-stable-9000edb71ab29d184aa33f5a77fa6e52d8812bb9.tar.gz linux-stable-9000edb71ab29d184aa33f5a77fa6e52d8812bb9.tar.bz2 linux-stable-9000edb71ab29d184aa33f5a77fa6e52d8812bb9.zip | |
net: ethtool: require drivers to set supported_coalesce_params
Now that all in-tree drivers have been updated we can
make the supported_coalesce_params mandatory.
To save debugging time in case some driver was missed
(or is out of tree) add a warning when netdev is registered
with set_coalesce but without supported_coalesce_params.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethtool')
| -rw-r--r-- | net/ethtool/common.c | 11 | ||||
| -rw-r--r-- | net/ethtool/ioctl.c | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/net/ethtool/common.c b/net/ethtool/common.c index 0b22741b2f8f..dab047eec943 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -289,3 +289,14 @@ out: kfree(indir); return ret; } + +int ethtool_check_ops(const struct ethtool_ops *ops) +{ + if (WARN_ON(ops->set_coalesce && !ops->supported_coalesce_params)) + return -EINVAL; + /* NOTE: sufficiently insane drivers may swap ethtool_ops at runtime, + * the fact that ops are checked at registration time does not + * mean the ops attached to a netdev later on are sane. + */ + return 0; +} diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 258840b19fb5..3852a58d7f95 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1519,9 +1519,6 @@ ethtool_set_coalesce_supported(struct net_device *dev, u32 supported_params = dev->ethtool_ops->supported_coalesce_params; u32 nonzero_params = 0; - if (!supported_params) - return true; - if (coalesce->rx_coalesce_usecs) nonzero_params |= ETHTOOL_COALESCE_RX_USECS; if (coalesce->rx_max_coalesced_frames) |