iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ethtool: do not set some flags, if others failed

Browse Source 
NETIF_F_NTUPLE flag setting introduced a bug:  non-ntuple flags
like LRO may be successfully set, before ioctl(2) returns failure
to userspace.

The set-flags operation should be all-or-none, rather than leaving
things in an inconsistent state prior to reporting failure to
userspace.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jeff Garzik 2010-02-26 21:43:38 +00:00 committed by David S. Miller
parent 6c74651c3b
commit 9675478bba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/core/ethtool.c
View File

@ -135,21 +135,23 @@ u32 ethtool_op_get_flags(struct net_device *dev)
int ethtool_op_set_flags(struct net_device *dev, u32 data) int ethtool_op_set_flags(struct net_device *dev, u32 data)
{ {
const struct ethtool_ops *ops = dev->ethtool_ops; const struct ethtool_ops *ops = dev->ethtool_ops;
unsigned long features = dev->features;
if (data & ETH_FLAG_LRO) if (data & ETH_FLAG_LRO)
dev->features |= NETIF_F_LRO; features |= NETIF_F_LRO;
else else
dev->features &= ~NETIF_F_LRO; features &= ~NETIF_F_LRO;
if (data & ETH_FLAG_NTUPLE) { if (data & ETH_FLAG_NTUPLE) {
if (!ops->set_rx_ntuple) if (!ops->set_rx_ntuple)
return -EOPNOTSUPP; return -EOPNOTSUPP;
dev->features |= NETIF_F_NTUPLE; features |= NETIF_F_NTUPLE;
} else { } else {
/* safe to clear regardless */ /* safe to clear regardless */
dev->features &= ~NETIF_F_NTUPLE; features &= ~NETIF_F_NTUPLE;
} }
dev->features = features;
return 0; return 0;
} }