Commit e669ba2d authored Apr 30, 2014 by Eliad Peller Committed by Johannes Berg May 05, 2014

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: d43c6b6e ("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>

parent 792e6aa7

net/mac80211/util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.

Admin message