summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe.h
diff options
context:
space:
mode:
authorMark Rustad2014-03-12 01:38:35 +0100
committerJeff Kirsher2014-04-01 00:48:03 +0200
commit41c62843eb6a0ea3e2f1e06ca3ec7b2f64452f7b (patch)
treede994b24163c5e42a9e75fd8d750eb090856e5e5 /drivers/net/ethernet/intel/ixgbe/ixgbe.h
parentINTEL-IGB: Convert iounmap to pci_iounmap (diff)
downloadkernel-qcow2-linux-41c62843eb6a0ea3e2f1e06ca3ec7b2f64452f7b.tar.gz
kernel-qcow2-linux-41c62843eb6a0ea3e2f1e06ca3ec7b2f64452f7b.tar.xz
kernel-qcow2-linux-41c62843eb6a0ea3e2f1e06ca3ec7b2f64452f7b.zip
ixgbe: Fix rcu warnings induced by LER
Resolve some rcu warnings produced when LER actions take place. This appears to be due to not holding the rtnl lock when calling ixgbe_down, so hold the lock. Also avoid disabling the device when it is already disabled. This check is necessary because the callback can be called more than once in some cases. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe.h')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 26d27aae9793..55c53a1cbb62 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -808,6 +808,7 @@ enum ixgbe_state_t {
__IXGBE_TESTING,
__IXGBE_RESETTING,
__IXGBE_DOWN,
+ __IXGBE_DISABLED,
__IXGBE_REMOVING,
__IXGBE_SERVICE_SCHED,
__IXGBE_IN_SFP_INIT,