Commit 19458bd4 authored Mar 01, 2014 by Mark Rustad Committed by Jeff Kirsher Mar 21, 2014

ixgbe: Break recursion in case of removal



When an adapter is removed and registers all read as all one's,
an infinite recursion can happen between ixgbe_clear_vmdq_generic
and ixgbe_clear_rar_generic. Adding a check for removal breaks
this recursion.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 10bdd67b

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -2913,6 +2913,9 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
		mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
		mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));

		if (ixgbe_removed(hw->hw_addr))
		goto done;

		if (!mpsar_lo && !mpsar_hi)
		goto done;