diff options
| author | Linas Vepstas | 2006-12-13 01:29:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2007-02-08 00:50:04 +0100 |
| commit | 81b1955eef786c1b2fe29f6783543ce13d8b0bc4 (patch) | |
| tree | 20305d94da074b9e8e532fc5db09e9a7852bb27f | |
| parent | PCI: define inline for test of channel error state (diff) | |
| download | kernel-qcow2-linux-81b1955eef786c1b2fe29f6783543ce13d8b0bc4.tar.gz kernel-qcow2-linux-81b1955eef786c1b2fe29f6783543ce13d8b0bc4.tar.xz kernel-qcow2-linux-81b1955eef786c1b2fe29f6783543ce13d8b0bc4.zip | |
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.c | 2 | ||||
| -rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 2 |
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) */ if (adapter->link_speed == 0) return; - if (pdev->error_state && pdev->error_state != pci_channel_io_normal) + if (pci_channel_offline(pdev)) return; 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) struct pci_dev *pdev = adapter->pdev; /* Prevent stats update while adapter is being reset */ - if (pdev->error_state && pdev->error_state != pci_channel_io_normal) + if (pci_channel_offline(pdev)) return; if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) || |