From: Andre Detsch <adetsch@br.ibm.com>
Date: Mon, 8 Jun 2009 07:42:30 +0000 (-0700)
Subject: e100: Fix napi_enable BUG_ON when recovering from EEH error
X-Git-Tag: v2.6.31-rc1~330^2~115
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef681ce1e8b3e63317cd724c200b2fd39286c005;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed