Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: fix ethtool->set_flags not intended -EINVAL return value

Browse Source 
After commit d5dbda2380 "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>
This commit is contained in:
Stanislaw Gruszka 2011-03-22 23:54:49 +00:00 committed by David S. Miller
parent b5845f9834
commit 673e63c688
7 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/netxen/netxen_nic_ethtool.c
View File

@ -871,7 +871,7 @@ static int netxen_nic_set_flags(struct net_device *netdev, u32 data)
struct netxen_adapter *adapter = netdev_priv(netdev); struct netxen_adapter *adapter = netdev_priv(netdev);
int hw_lro; int hw_lro;
if (data & ~ETH_FLAG_LRO) if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))
return -EINVAL; return -EINVAL;
if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO)) if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))

2
drivers/net/qlcnic/qlcnic_ethtool.c
View File

@ -1003,7 +1003,7 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data)
struct qlcnic_adapter *adapter = netdev_priv(netdev); struct qlcnic_adapter *adapter = netdev_priv(netdev);
int hw_lro; int hw_lro;
if (data & ~ETH_FLAG_LRO) if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))
return -EINVAL; return -EINVAL;
if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO)) if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO))

2
drivers/net/s2io.c
View File

@ -6726,7 +6726,7 @@ static int s2io_ethtool_set_flags(struct net_device *dev, u32 data)
int rc = 0; int rc = 0;
int changed = 0; int changed = 0;
if (data & ~ETH_FLAG_LRO) if (ethtool_invalid_flags(dev, data, ETH_FLAG_LRO))
return -EINVAL; return -EINVAL;
if (data & ETH_FLAG_LRO) { if (data & ETH_FLAG_LRO) {

4
drivers/net/vmxnet3/vmxnet3_ethtool.c
View File

@ -304,8 +304,8 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1; u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;
unsigned long flags; unsigned long flags;
if (data & ~ETH_FLAG_LRO) if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))
return -EOPNOTSUPP; return -EINVAL;
if (lro_requested ^ lro_present) { if (lro_requested ^ lro_present) {
/* toggle the LRO feature*/ /* toggle the LRO feature*/

4
drivers/net/vxge/vxge-ethtool.c
View File

@ -1117,8 +1117,8 @@ static int vxge_set_flags(struct net_device *dev, u32 data)
struct vxgedev *vdev = netdev_priv(dev); struct vxgedev *vdev = netdev_priv(dev);
enum vxge_hw_status status; enum vxge_hw_status status;
if (data & ~ETH_FLAG_RXHASH) if (ethtool_invalid_flags(dev, data, ETH_FLAG_RXHASH))
return -EOPNOTSUPP; return -EINVAL;
if (!!(data & ETH_FLAG_RXHASH) == vdev->devh->config.rth_en) if (!!(data & ETH_FLAG_RXHASH) == vdev->devh->config.rth_en)
return 0; return 0;

1
include/linux/ethtool.h
View File

@ -680,6 +680,7 @@ int ethtool_op_set_ufo(struct net_device *dev, u32 data);
u32 ethtool_op_get_flags(struct net_device *dev); u32 ethtool_op_get_flags(struct net_device *dev);
int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported); int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported);
void ethtool_ntuple_flush(struct net_device *dev); void ethtool_ntuple_flush(struct net_device *dev);
bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported);
/** /**
* &ethtool_ops - Alter and report network device settings * &ethtool_ops - Alter and report network device settings

17
net/core/ethtool.c
View File

@ -141,9 +141,24 @@ u32 ethtool_op_get_flags(struct net_device *dev)
} }
EXPORT_SYMBOL(ethtool_op_get_flags); EXPORT_SYMBOL(ethtool_op_get_flags);
/* Check if device can enable (or disable) particular feature coded in "data"
* argument. Flags "supported" describe features that can be toggled by device.
* If feature can not be toggled, it state (enabled or disabled) must match
* hardcoded device features state, otherwise flags are marked as invalid.
*/
bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported)
{
u32 features = dev->features & flags_dup_features;
/* "data" can contain only flags_dup_features bits,
* see __ethtool_set_flags */
return (features & ~supported) != (data & ~supported);
}
EXPORT_SYMBOL(ethtool_invalid_flags);
int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported) int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported)
{ {
if (data & ~supported) if (ethtool_invalid_flags(dev, data, supported))
return -EINVAL; return -EINVAL;
dev->features = ((dev->features & ~flags_dup_features) | dev->features = ((dev->features & ~flags_dup_features) |