Skip to content

Commit

Permalink
mac80211: fix nested rtnl locking on ieee80211_reconfig
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eliad Peller authored and Johannes Berg committed May 5, 2014
1 parent 792e6aa commit e669ba2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/mac80211/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit e669ba2

Please sign in to comment.