aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-02-17 09:26:54 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-17 13:38:10 -0800
commit7af3351f71f4b3b5dbccb66cdc9b097052760a7f (patch)
treec9fa0fa66c7823ed39d3ddc652bfee306f157497
parenta07da6df730b1fef933f66c03b0e51d5e7ad5b3e (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>
-rw-r--r--net/core/ethtool.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index d08a0c7675b..31b1eddc1b8 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)
if (copy_from_user(&reset, useraddr, sizeof(reset)))
return -EFAULT;
- /* Clear ethtool n-tuple list */
- ethtool_ntuple_flush(dev);
-
ret = dev->ethtool_ops->reset(dev, &reset.data);
if (ret)
return ret;