diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-04-30 16:14:24 +0300 |
|---|---|---|
| committer | Show Liu <show.liu@linaro.org> | 2014-06-18 12:04:30 +0800 |
| commit | ed40b2181c6891cc2d3f336684c927d066d01b75 (patch) | |
| tree | 6287a4389c11c4687acf8513a9c183c1d410214f /net | |
| parent | 55885dd0980724dcdab5d8e20d020c16aa0b815e (diff) | |
mac80211: fix nested rtnl locking on ieee80211_reconfig
commit e669ba2d06c6195662601956454ac959892f0762 upstream.
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")
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index b8700d417a9..64276251821 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1754,7 +1754,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. |