]> git.karo-electronics.de Git - karo-tx-linux.git/commit
net: fix ethtool->set_flags not intended -EINVAL return value
authorStanislaw Gruszka <sgruszka@redhat.com>
Tue, 22 Mar 2011 23:54:49 +0000 (23:54 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 14 Apr 2011 20:02:11 +0000 (13:02 -0700)
commit95bd481686a4848a902a340c4b4b1673cf97092f
tree5ad90b65343db7e075b993b8118f46d46aed905c
parent2743bc470c3a9c5f0bfdc085d6ed7b716865bc00
net: fix ethtool->set_flags not intended -EINVAL return value

commit 673e63c688f43104c73aad8ea4237f7ad41fa14d upstream.

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.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/netxen/netxen_nic_ethtool.c
drivers/net/qlcnic/qlcnic_ethtool.c
drivers/net/s2io.c
drivers/net/vmxnet3/vmxnet3_ethtool.c
drivers/net/vxge/vxge-ethtool.c
include/linux/ethtool.h
net/core/ethtool.c