Commit c3049c8f authored Jan 14, 2014 by Mark Rustad Committed by David S. Miller Jan 14, 2014

ixbge: Protect ixgbe_down with __IXGBE_DOWN bit



The ixgbe_down function can now prevent multiple executions by
doing test_and_set_bit on __IXGBE_DOWN. This did not work before
introduction of the __IXGBE_REMOVING bit, because of overloading
of __IXGBE_DOWN. Also add smp_mb__before_clear_bit call before
clearing the __IXGBE_DOWN bit.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 09f40aed

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -4573,6 +4573,7 @@ static void ixgbe_up_complete(struct ixgbe_adapter *adapter)
		if (hw->mac.ops.enable_tx_laser)
		hw->mac.ops.enable_tx_laser(hw);

		smp_mb__before_clear_bit();
		clear_bit(__IXGBE_DOWN, &adapter->state);
		ixgbe_napi_enable_all(adapter);

		@@ -4784,7 +4785,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
		int i;

		/* signal that we are down to the interrupt handler */
		set_bit(__IXGBE_DOWN, &adapter->state);
		if (test_and_set_bit(__IXGBE_DOWN, &adapter->state))
		return; /* do nothing if already down */

		/* disable receives */
		rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);