Commit b9f628fc authored Dec 16, 2015 by Eliad Peller Committed by Johannes Berg Jan 14, 2016

mac80211: clear local->sched_scan_req properly on reconfig



On reconfig, in case of sched_scan_req->n_scan_plans > 1,
local->sched_scan_req was never cleared, although
cfg80211_sched_scan_stopped_rtnl() was called, resulting
in local->sched_scan_req holding a stale and preventing
further scheduled scan requests.

Clear it explicitly in this case.

Fixes: 42a7e82c6792 ("mac80211: Do not restart scheduled scan if multiple scan plans are set")
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 470f4d61

net/mac80211/util.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2043,8 +2043,11 @@ int ieee80211_reconfig(struct ieee80211_local *local)
		*/
		if (sched_scan_req->n_scan_plans > 1 \|\|
		__ieee80211_request_sched_scan_start(sched_scan_sdata,
		sched_scan_req))
		sched_scan_req)) {
		RCU_INIT_POINTER(local->sched_scan_sdata, NULL);
		RCU_INIT_POINTER(local->sched_scan_req, NULL);
		sched_scan_stopped = true;
		}
		mutex_unlock(&local->mtx);

		if (sched_scan_stopped)

Admin message