mac80211: do not scan and monitor connection in parallel
Before we send probes in connection monitoring we check if scan is not pending. But we do that check without locking. Fix that and also do not start scan if connection monitoring is in progress. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
f277683477
commit
133d40f9a2
@@ -226,13 +226,8 @@ static void ieee80211_work_work(struct work_struct *work)
|
||||
run_again(local, jiffies + HZ/2);
|
||||
}
|
||||
|
||||
if (list_empty(&local->work_list) && local->scan_req &&
|
||||
!local->scanning)
|
||||
ieee80211_queue_delayed_work(&local->hw,
|
||||
&local->scan_work,
|
||||
round_jiffies_relative(0));
|
||||
|
||||
ieee80211_recalc_idle(local);
|
||||
ieee80211_run_deferred_scan(local);
|
||||
|
||||
mutex_unlock(&local->mtx);
|
||||
|
||||
|
Reference in New Issue
Block a user