summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-04-30 16:14:24 +0300
committerJohannes Berg <johannes.berg@intel.com>2014-05-05 15:14:58 +0200
commite669ba2d06c6195662601956454ac959892f0762 (patch)
tree1a4791e81cc8a6ed4319b5134ce8db348e11248f /net
parent792e6aa7a15ea0fb16f8687e93caede1ea9118c7 (diff)
downloadop-kernel-dev-e669ba2d06c6195662601956454ac959892f0762.zip
op-kernel-dev-e669ba2d06c6195662601956454ac959892f0762.tar.gz
mac80211: fix nested rtnl locking on ieee80211_reconfig
ieee80211_reconfig already holds rtnl, so calling cfg80211_sched_scan_stopped results in deadlock. Use the rtnl-version of this function instead. Fixes: d43c6b6 ("mac80211: reschedule sched scan after HW restart") Cc: stable@vger.kernel.org (3.14+) Signed-off-by: Eliad Peller <eliadx.peller@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 275c94f..3c36583 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1780,7 +1780,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
mutex_unlock(&local->mtx);
if (sched_scan_stopped)
- cfg80211_sched_scan_stopped(local->hw.wiphy);
+ cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy);
/*
* If this is for hw restart things are still running.
OpenPOWER on IntegriCloud