Commit 7af3351f authored Feb 17, 2010 by Ben Hutchings Committed by David S. Miller Feb 17, 2010

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>

parent a07da6df

net/core/ethtool.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message