summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Skidmore2010-06-11 15:20:29 +0200
committerDavid S. Miller2010-06-14 03:20:52 +0200
commitd08935c274b7e552e47633cf0cbd74b6e953d228 (patch)
tree531cbcadc890a3b13fb3a829431fd4b72618b48c
parentnet: rxhash already set in __copy_skb_header (diff)
downloadkernel-qcow2-linux-d08935c274b7e552e47633cf0cbd74b6e953d228.tar.gz
kernel-qcow2-linux-d08935c274b7e552e47633cf0cbd74b6e953d228.tar.xz
kernel-qcow2-linux-d08935c274b7e552e47633cf0cbd74b6e953d228.zip
ixgbe: fix for race with 8259(8|9) during shutdown
There is a small window where the watchdog could be running as the interface is brought down on a NIC with two ports wired back to back. If ixgbe_update_status is then called can lead to a panic. This patch allows the update to bail if we are in that condition. This issue was orignally reported and fix proposed by Akihiko Saitou. CC: Akihiko Saitou <asaitou@users.sourceforge.net> Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index b2af2f67f604..ce30c62a97f7 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/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;