diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-14 22:59:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-14 22:59:34 -0700 |
| commit | 6b08f516244abda22c07b5e7db10ef109dc43f2d (patch) | |
| tree | 098fbb9b45213feeb5e093a9a690ef76e624469a /drivers/net/ixgbe/ixgbe_main.c | |
| parent | 0b5c25e8ac3a60bd01a52ca7405ba96aec8c16be (diff) | |
| parent | 28c8e4790ca5ef75f54895ca46437f9fbb433ddf (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_ethtool.c
With merge conflict help from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 6b483d352f23..9cca737e4885 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -5269,6 +5269,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; |