e1000: Prevent reset task killing itself.
authorTushar Dave <tushar.n.dave@intel.com>
Thu, 17 May 2012 01:04:50 +0000 (01:04 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 May 2012 21:56:52 +0000 (22:56 +0100)
commit3a58107e4ed76e3a314002233a600234e0785aa1
treec1060b53dfbf733529c7d6374ad5cdd41f99af7b
parentaa3edb47d5f969b63b42c5757c663b765d8a5d86
e1000: Prevent reset task killing itself.

commit 8ce6909f77ba1b7bcdea65cc2388fd1742b6d669 upstream.

Killing reset task while adapter is resetting causes deadlock.
Only kill reset task if adapter is not resetting.
Ref bug #43132 on bugzilla.kernel.org

Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/ethernet/intel/e1000/e1000_main.c