Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c211fe1 authored Feb 03, 2016 by Stefan Assmann Committed by Jeff Kirsher Mar 29, 2016

ixgbe: call ndo_stop() instead of dev_close() when running offline selftest



Calling dev_close() causes IFF_UP to be cleared which will remove the
interfaces routes and some addresses. That's probably not what the user
intended when running the offline selftest. Besides this does not happen
if the interface is brought down before the test, so the current
behaviour is inconsistent.
Instead call the net_device_ops ndo_stop function directly and avoid
touching IFF_UP at all.

Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent d90b5b0e

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -877,6 +877,8 @@ extern const char ixgbe_driver_version[];
	extern char ixgbe_default_device_descr[];		extern char ixgbe_default_device_descr[];
	#endif /* IXGBE_FCOE */		#endif /* IXGBE_FCOE */

			int ixgbe_open(struct net_device *netdev);
			int ixgbe_close(struct net_device *netdev);
	void ixgbe_up(struct ixgbe_adapter *adapter);		void ixgbe_up(struct ixgbe_adapter *adapter);
	void ixgbe_down(struct ixgbe_adapter *adapter);		void ixgbe_down(struct ixgbe_adapter *adapter);
	void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);		void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2053,7 +2053,7 @@ static void ixgbe_diag_test(struct net_device *netdev,

	if (if_running)		if (if_running)
	/* indicate we're in test mode */		/* indicate we're in test mode */
	dev_close(netdev);		ixgbe_close(netdev);
	else		else
	ixgbe_reset(adapter);		ixgbe_reset(adapter);

	@@ -2091,7 +2091,7 @@ static void ixgbe_diag_test(struct net_device *netdev,
	/* clear testing bit and return adapter to previous state */		/* clear testing bit and return adapter to previous state */
	clear_bit(__IXGBE_TESTING, &adapter->state);		clear_bit(__IXGBE_TESTING, &adapter->state);
	if (if_running)		if (if_running)
	dev_open(netdev);		ixgbe_open(netdev);
	else if (hw->mac.ops.disable_tx_laser)		else if (hw->mac.ops.disable_tx_laser)
	hw->mac.ops.disable_tx_laser(hw);		hw->mac.ops.disable_tx_laser(hw);
	} else {		} else {

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5992,7 +5992,7 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
	* handler is registered with the OS, the watchdog timer is started,		* handler is registered with the OS, the watchdog timer is started,
	* and the stack is notified that the interface is ready.		* and the stack is notified that the interface is ready.
	**/		**/
	static int ixgbe_open(struct net_device *netdev)		int ixgbe_open(struct net_device *netdev)
	{		{
	struct ixgbe_adapter *adapter = netdev_priv(netdev);		struct ixgbe_adapter *adapter = netdev_priv(netdev);
	struct ixgbe_hw *hw = &adapter->hw;		struct ixgbe_hw *hw = &adapter->hw;
	@@ -6094,7 +6094,7 @@ static void ixgbe_close_suspend(struct ixgbe_adapter *adapter)
	* needs to be disabled. A global MAC reset is issued to stop the		* needs to be disabled. A global MAC reset is issued to stop the
	* hardware, and all transmit and receive resources are freed.		* hardware, and all transmit and receive resources are freed.
	**/		**/
	static int ixgbe_close(struct net_device *netdev)		int ixgbe_close(struct net_device *netdev)
	{		{
	struct ixgbe_adapter *adapter = netdev_priv(netdev);		struct ixgbe_adapter *adapter = netdev_priv(netdev);