Ack,

Jeff, please pull this patch from:

    git://lost.foo-projects.org/~ahkok/git/netdev-2.6 upstream

which is against netdev-2.6#upstream cac925a4aab1b7233d3beb591f53498816058a08

Cheers,

Auke


---

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Acked-by: Auke Kok <auke-jan.h.kok@intel.com>

---
  e1000_main.c |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletion(-)


akpm@osdl.org wrote:
> From: Linas Vepstas <linas@austin.ibm.com>
> 
> If a PCI bus error/fault triggers a PCI bus reset, attempts to get the
> ethernet packet count statistics from the hardware will fail, returning
> garbage data upstream.  This patch skips statistics data collection if the
> PCI device is not on the bus.
[snip]