diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-03-22 23:54:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-27 23:35:24 -0700 |
| commit | 673e63c688f43104c73aad8ea4237f7ad41fa14d (patch) | |
| tree | 3d11c6f74a5d0823020db8642c3f2cf062347afb /include/linux/ethtool.h | |
| parent | b5845f9834d8f4c79d324bc59b99dbcf0a40f428 (diff) | |
| download | lwn-673e63c688f43104c73aad8ea4237f7ad41fa14d.tar.gz lwn-673e63c688f43104c73aad8ea4237f7ad41fa14d.zip | |
net: fix ethtool->set_flags not intended -EINVAL return value
After commit d5dbda23804156ae6f35025ade5307a49d1db6d7 "ethtool: Add
support for vlan accleration.", drivers that have NETIF_F_HW_VLAN_TX,
and/or NETIF_F_HW_VLAN_RX feature, but do not allow enable/disable vlan
acceleration via ethtool set_flags, always return -EINVAL from that
function. Fix by returning -EINVAL only if requested features do not
match current settings and can not be changed by driver.
Change any driver that define ethtool->set_flags to use
ethtool_invalid_flags() to avoid similar problems in the future
(also on drivers that do not have the problem).
Tested with modified (to reproduce this bug) myri10ge driver.
Cc: stable@kernel.org # 2.6.37+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ethtool.h')
| -rw-r--r-- | include/linux/ethtool.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index ae757bcf1280..c8fcbdd2b0e7 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -680,6 +680,7 @@ int ethtool_op_set_ufo(struct net_device *dev, u32 data); u32 ethtool_op_get_flags(struct net_device *dev); int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported); void ethtool_ntuple_flush(struct net_device *dev); +bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported); /** * ðtool_ops - Alter and report network device settings |