Message ID | 20090731191317.5470.74252.send-patch@aqua |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index b70cc99..7bdefe2 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -8188,6 +8188,11 @@ static pci_ers_result_t bnx2_io_error_detected(struct pci_dev *pdev, rtnl_lock(); netif_device_detach(dev); + if (state == pci_channel_io_perm_failure) { + rtnl_unlock(); + return PCI_ERS_RESULT_DISCONNECT; + } + if (netif_running(dev)) { bnx2_netif_stop(bp); del_timer_sync(&bp->timer);
PCI drivers that implement the struct pci_error_handlers' error_detected callback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is pci_channel_io_perm_failure. This patch fixes the issue for bnx2. Signed-off-by: Dean Nelson <dnelson@redhat.com> --- This patch has not been tested, since I don't have the hardware to test it. It is based on a few recent patches. See the following commits: http://git.kernel.org/linus/c93b5a76d58656158d195a7df507ebc660010969 http://git.kernel.org/linus/eab633021c26025b34f36f79f0311d3d99f40ceb http://git.kernel.org/linus/ef681ce1e8b3e63317cd724c200b2fd39286c005 http://git.kernel.org/linus/59ed6eecff4aa00c5c5d18ffd180acac108d596e http://git.kernel.org/linus/3044b8d1ff8c05237652a692fb572a34e4d70146 drivers/net/bnx2.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html