Messages in this thread Patch in this message | | | Date | Wed, 1 Nov 2006 19:10:44 -0600 | Subject | [PATCH 2/2 v2]: Use newly defined PCI channel offline routine | From | (Linas Vepstas) |
| |
On Wed, Nov 01, 2006 at 06:00:35PM -0600, Linas Vepstas wrote: [...] Resubmit, per Auke ...
--linas
Use newly minted routine to access the PCI channel state.
Signed-off-by: Linas Vepstas <linas@linas.org>
---- drivers/net/e1000/e1000_main.c | 2 +- drivers/net/ixgb/ixgb_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6.19-rc4-git3/drivers/net/e1000/e1000_main.c =================================================================== --- linux-2.6.19-rc4-git3.orig/drivers/net/e1000/e1000_main.c 2006-11-01 18:40:48.000000000 -0600 +++ linux-2.6.19-rc4-git3/drivers/net/e1000/e1000_main.c 2006-11-01 18:44:11.000000000 -0600 @@ -3297,7 +3297,7 @@ e1000_update_stats(struct e1000_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); Index: linux-2.6.19-rc4-git3/drivers/net/ixgb/ixgb_main.c =================================================================== --- linux-2.6.19-rc4-git3.orig/drivers/net/ixgb/ixgb_main.c 2006-11-01 18:40:48.000000000 -0600 +++ linux-2.6.19-rc4-git3/drivers/net/ixgb/ixgb_main.c 2006-11-01 18:44:39.000000000 -0600 @@ -1564,7 +1564,7 @@ ixgb_update_stats(struct ixgb_adapter *a 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) || - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |