]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
igb: fix EEH recovery during reset on PPC
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 25 Jun 2008 00:01:15 +0000 (17:01 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 27 Jun 2008 05:27:47 +0000 (01:27 -0400)
EEH is not recovering in a reasonable amount of time on PPC during
igb_down().

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/igb/igb_main.c

index ae398f04c7b44d8ef8865ed4f902dba1d12a0172..e79a26a886c883e0fc56ba0318a1aaa87b41e366 100644 (file)
@@ -718,7 +718,8 @@ void igb_down(struct igb_adapter *adapter)
        adapter->link_speed = 0;
        adapter->link_duplex = 0;
 
-       igb_reset(adapter);
+       if (!pci_channel_offline(adapter->pdev))
+               igb_reset(adapter);
        igb_clean_all_tx_rings(adapter);
        igb_clean_all_rx_rings(adapter);
 }