lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ethtool: Change ethtool_op_set_flags to validate flags

Browse Source 
ethtool_op_set_flags() does not check for unsupported flags, and has
no way of doing so.  This means it is not suitable for use as a
default implementation of ethtool_ops::set_flags.

Add a 'supported' parameter specifying the flags that the driver and
hardware support, validate the requested flags against this, and
change all current callers to pass this parameter.

Change some other trivial implementations of ethtool_ops::set_flags to
call ethtool_op_set_flags().

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Reviewed-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings
2010-06-30 02:44:32 +00:00
committed by David S. Miller
parent b3003be36a
commit 1437ce3983
10 changed files with 32 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/sky2.c
View File

@ -4188,17 +4188,13 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
static int sky2_set_flags(struct net_device *dev, u32 data)
{
struct sky2_port *sky2 = netdev_priv(dev);
u32 supported =
(sky2->hw->flags & SKY2_HW_RSS_BROKEN) ? 0 : ETH_FLAG_RXHASH;
int rc;
if (data & ~ETH_FLAG_RXHASH)
return -EOPNOTSUPP;
if (data & ETH_FLAG_RXHASH) {
if (sky2->hw->flags & SKY2_HW_RSS_BROKEN)
return -EINVAL;
dev->features |= NETIF_F_RXHASH;
} else
dev->features &= ~NETIF_F_RXHASH;
rc = ethtool_op_set_flags(dev, data, supported);
if (rc)
return rc;
rx_set_rss(dev);