]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ixgbe: fix EEH recovery during reset on PPC
authorPaul Larson <pl@us.ibm.com>
Wed, 25 Jun 2008 00:00:56 +0000 (17:00 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 27 Jun 2008 05:27:46 +0000 (01:27 -0400)
EEh is not recovering in a resonable amount of time on PPC during
ixgbe_down().

Signed-off-by: Paul Larson <pl@us.ibm.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/ixgbe/ixgbe_main.c

index 7b859220c255b3b81017f156548df2dcca2f32e7..8f04609011538e257b820e9b521359750073cc63 100644 (file)
@@ -1969,7 +1969,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
        netif_carrier_off(netdev);
        netif_stop_queue(netdev);
 
-       ixgbe_reset(adapter);
+       if (!pci_channel_offline(adapter->pdev))
+               ixgbe_reset(adapter);
        ixgbe_clean_all_tx_rings(adapter);
        ixgbe_clean_all_rx_rings(adapter);