Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

mac80211: mark stopped sched scan only after driver does (INTERNAL)

Change internal state in mac80211 only after the driver
reports that sched scan was actually stopped.

Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information...
commit 329e192ba788b4547ad475852fa6c9f303277912 1 parent 7cef4d8
@eyalsh eyalsh authored ariknem committed
Showing with 6 additions and 3 deletions.
  1. +6 −3 net/mac80211/scan.c
View
9 net/mac80211/scan.c
@@ -976,11 +976,12 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata)
}
if (local->sched_scanning) {
- for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+ for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
kfree(local->sched_scan_ies.ie[i]);
+ local->sched_scan_ies.ie[i] = NULL;
+ }
drv_sched_scan_stop(local, sdata);
- local->sched_scanning = false;
}
out:
mutex_unlock(&sdata->local->mtx);
@@ -1012,8 +1013,10 @@ void ieee80211_sched_scan_stopped_work(struct work_struct *work)
return;
}
- for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+ for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
kfree(local->sched_scan_ies.ie[i]);
+ local->sched_scan_ies.ie[i] = NULL;
+ }
local->sched_scanning = false;
Please sign in to comment.
Something went wrong with that request. Please try again.