diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-02-17 04:26:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:38:10 -0500 |
commit | 7af3351f71f4b3b5dbccb66cdc9b097052760a7f (patch) | |
tree | c9fa0fa66c7823ed39d3ddc652bfee306f157497 /net/core/ethtool.c | |
parent | a07da6df730b1fef933f66c03b0e51d5e7ad5b3e (diff) |
ethtool: Don't flush n-tuple list from ethtool_reset()
The n-tuple list should be flushed if and only if the ETH_RESET_FILTER
flag is set and the driver is able to reset filtering/flow direction
hardware without also resetting a component whose flag is not set.
This test is best left to the driver.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/ethtool.c')
-rw-r--r-- | net/core/ethtool.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index d08a0c7675bf..31b1eddc1b84 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
@@ -654,9 +654,6 @@ static int ethtool_reset(struct net_device *dev, char __user *useraddr) | |||
654 | if (copy_from_user(&reset, useraddr, sizeof(reset))) | 654 | if (copy_from_user(&reset, useraddr, sizeof(reset))) |
655 | return -EFAULT; | 655 | return -EFAULT; |
656 | 656 | ||
657 | /* Clear ethtool n-tuple list */ | ||
658 | ethtool_ntuple_flush(dev); | ||
659 | |||
660 | ret = dev->ethtool_ops->reset(dev, &reset.data); | 657 | ret = dev->ethtool_ops->reset(dev, &reset.data); |
661 | if (ret) | 658 | if (ret) |
662 | return ret; | 659 | return ret; |