aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorJohn Fastabend <john.r.fastabend@intel.com>2014-01-16 05:30:05 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-16 18:34:24 -0500
commit8f4c5c9fb87aa113f33ddeb4028fb0de8e18311d (patch)
treedad6cbc28f3e956635ba1ce9b31f03af0587aea4 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
parent0864c158836c2d0edb61f7128475e192b09bc851 (diff)
ixgbe: reinit_locked() should be called with rtnl_lock
ixgbe_service_task() is calling ixgbe_reinit_locked() without the rtnl_lock being held. This is because it is being called from a worker thread and not a rtnl netlink or dcbnl path. Add rtnl_{un}lock() semantics. I found this during code review. Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 3ca59d21d0b2..b445ad121de1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6392,7 +6392,9 @@ static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter)
6392 netdev_err(adapter->netdev, "Reset adapter\n"); 6392 netdev_err(adapter->netdev, "Reset adapter\n");
6393 adapter->tx_timeout_count++; 6393 adapter->tx_timeout_count++;
6394 6394
6395 rtnl_lock();
6395 ixgbe_reinit_locked(adapter); 6396 ixgbe_reinit_locked(adapter);
6397 rtnl_unlock();
6396} 6398}
6397 6399
6398/** 6400/**