Messages in this thread | | | Date | Wed, 01 Nov 2006 16:20:11 -0800 | From | Auke Kok <> | Subject | Re: [PATCH 2/2]: Use newly defined PCI channel offline routine |
| |
Linas Vepstas wrote: > Subject: [PATCH 2/2]: Use newly defined PCI channel offline routine > > Use newly minted routine to access the PCI channel state.
why not write this so that it reads:
> + if (pci_channel_offline(pdev))
iow are we assuming that there are multiple error_state's per pdev? That seems bogus.
Auke
> > 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 16:15:24.000000000 -0600 > +++ linux-2.6.19-rc4-git3/drivers/net/e1000/e1000_main.c 2006-11-01 16:20:55.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->error_state)) > 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 16:15:25.000000000 -0600 > +++ linux-2.6.19-rc4-git3/drivers/net/ixgb/ixgb_main.c 2006-11-01 16:20:55.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->error_state)) > 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/
| |