From: Ben Hutchings Date: Wed, 17 Feb 2010 09:26:54 +0000 (+0000) Subject: ethtool: Don't flush n-tuple list from ethtool_reset() X-Git-Tag: v2.6.34-rc1~233^2~193 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=7af3351f71f4b3b5dbccb66cdc9b097052760a7f;p=net-next-2.6.git 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 Signed-off-by: David S. Miller --- 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;