From 42d4c7809d5df43baaf6143e83ddd8734cd23012 Mon Sep 17 00:00:00 2001
From: Don Skidmore <donald.c.skidmore@intel.com>
Date: Fri, 11 Jun 2010 13:20:29 +0000
Subject: [PATCH] --- yaml --- r: 200509 b: refs/heads/master c:
 d08935c274b7e552e47633cf0cbd74b6e953d228 h: refs/heads/master i:   200507:
 13bf62ef5f78420139d15e304165c9fdad66c46c v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_main.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13991362890b..e089c564d3b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8d15e6460cb0eea00f2574a80d94496943403ba
+refs/heads/master: d08935c274b7e552e47633cf0cbd74b6e953d228
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index b2af2f67f604..ce30c62a97f7 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -5282,6 +5282,10 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
 	u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
 	u64 non_eop_descs = 0, restart_queue = 0;
 
+	if (test_bit(__IXGBE_DOWN, &adapter->state) ||
+	    test_bit(__IXGBE_RESETTING, &adapter->state))
+		return;
+
 	if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
 		u64 rsc_count = 0;
 		u64 rsc_flush = 0;