lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: Use newly defined PCI channel offline routine

Browse Source 
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>
This commit is contained in:
Linas Vepstas
2006-12-12 18:29:15 -06:00
committed by Greg Kroah-Hartman
parent a7369f1f65
commit 81b1955eef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/e1000/e1000_main.c
View File

@@ -3602,7 +3602,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
*/ */
if (adapter->link_speed == 0) if (adapter->link_speed == 0)
return; return;
if (pdev->error_state && pdev->error_state != pci_channel_io_normal) if (pci_channel_offline(pdev))
return; return;
spin_lock_irqsave(&adapter->stats_lock, flags); spin_lock_irqsave(&adapter->stats_lock, flags);

2
drivers/net/ixgb/ixgb_main.c
View File

@@ -1609,7 +1609,7 @@ ixgb_update_stats(struct ixgb_adapter *adapter)
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
/* Prevent stats update while adapter is being reset */ /* 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; return;
if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) || if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||