diff options
| author | John Fastabend | 2014-01-16 11:30:05 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-17 00:34:24 +0100 |
| commit | 8f4c5c9fb87aa113f33ddeb4028fb0de8e18311d (patch) | |
| tree | dad6cbc28f3e956635ba1ce9b31f03af0587aea4 /drivers/net/ethernet | |
| parent | net: eth_type_trans() should use skb_header_pointer() (diff) | |
| download | kernel-qcow2-linux-8f4c5c9fb87aa113f33ddeb4028fb0de8e18311d.tar.gz kernel-qcow2-linux-8f4c5c9fb87aa113f33ddeb4028fb0de8e18311d.tar.xz kernel-qcow2-linux-8f4c5c9fb87aa113f33ddeb4028fb0de8e18311d.zip | |
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')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 |
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) netdev_err(adapter->netdev, "Reset adapter\n"); adapter->tx_timeout_count++; + rtnl_lock(); ixgbe_reinit_locked(adapter); + rtnl_unlock(); } /** |