Commit 5962bc21 authored Jan 20, 2011 by Bruce Allan Committed by Jeff Kirsher Feb 11, 2011

e1000e: return appropriate errors for 'ethtool -r'



...when invoked while interface is not up or when auto-negotiation is
disabled as done by other drivers.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 5c1bda0a

drivers/net/e1000e/ethtool.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1963,8 +1963,15 @@ static int e1000_set_coalesce(struct net_device *netdev,
		static int e1000_nway_reset(struct net_device *netdev)
		{
		struct e1000_adapter *adapter = netdev_priv(netdev);
		if (netif_running(netdev))

		if (!netif_running(netdev))
		return -EAGAIN;

		if (!adapter->hw.mac.autoneg)
		return -EINVAL;

		e1000e_reinit_locked(adapter);

		return 0;
		}