aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinas Vepstas <linas@linas.org>2006-12-12 19:29:15 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 18:50:04 -0500
commit81b1955eef786c1b2fe29f6783543ce13d8b0bc4 (patch)
tree20305d94da074b9e8e532fc5db09e9a7852bb27f
parenta7369f1f6533b9efc3209d1df103537bbbf24b8c (diff)
PCI: Use newly defined PCI channel offline routine
Use newly minted routine to access the PCI channel state. Signed-off-by: Linas Vepstas <linas@linas.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/e1000/e1000_main.c2
-rw-r--r--drivers/net/ixgb/ixgb_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c6259c7127f6..8424a8e4cbb0 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3602,7 +3602,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
3602 */ 3602 */
3603 if (adapter->link_speed == 0) 3603 if (adapter->link_speed == 0)
3604 return; 3604 return;
3605 if (pdev->error_state && pdev->error_state != pci_channel_io_normal) 3605 if (pci_channel_offline(pdev))
3606 return; 3606 return;
3607 3607
3608 spin_lock_irqsave(&adapter->stats_lock, flags); 3608 spin_lock_irqsave(&adapter->stats_lock, flags);
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index a083a9189230..f2742179f120 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1609,7 +1609,7 @@ ixgb_update_stats(struct ixgb_adapter *adapter)
1609 struct pci_dev *pdev = adapter->pdev; 1609 struct pci_dev *pdev = adapter->pdev;
1610 1610
1611 /* Prevent stats update while adapter is being reset */ 1611 /* Prevent stats update while adapter is being reset */
1612 if (pdev->error_state && pdev->error_state != pci_channel_io_normal) 1612 if (pci_channel_offline(pdev))
1613 return; 1613 return;
1614 1614
1615 if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) || 1615 if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||