OSDN Git Service

e100: Fix napi_enable BUG_ON when recovering from EEH error
authorAndre Detsch <adetsch@br.ibm.com>
Mon, 8 Jun 2009 07:42:30 +0000 (00:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Jun 2009 07:42:30 +0000 (00:42 -0700)
commitef681ce1e8b3e63317cd724c200b2fd39286c005
tree95251ac5c80b2285fe6dc375e9f4ccbd3669c389
parent1d0ebfe7c9621d43804e9ce9f2b898541a7d9652
e100: Fix napi_enable BUG_ON when recovering from EEH error

BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state)) was being hit
during e100 EEH recovery. The problem source was a napi_enable
call being made during e100_io_error_detected. Napi should remain
disabled after e100_down, and only be reenabled when the interface
is recovered.

This patch also updates e100_io_error_detected in order to make
it similar to the current versions of the error_detected callback
in drivers such as e1000e and ixgbe.

Signed-off-by: Andre Detsch <adetsch@br.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e100.c