ソースを参照

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>
Linas Vepstas 18 年 前
コミット
81b1955eef
2 ファイル変更2 行追加2 行削除
  1. 1 1
      drivers/net/e1000/e1000_main.c
  2. 1 1
      drivers/net/ixgb/ixgb_main.c

+ 1 - 1
drivers/net/e1000/e1000_main.c

@@ -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);

+ 1 - 1
drivers/net/ixgb/ixgb_main.c

@@ -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) ||