Skip to content

Commit

Permalink
mac80211: protect ->scanning by mutex in ieee80211_work_work()
Browse files Browse the repository at this point in the history
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Stanislaw Gruszka authored and John W. Linville committed Apr 13, 2012
1 parent 133d40f commit 5f54607
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/mac80211/work.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ static void ieee80211_work_work(struct work_struct *work)
enum work_action rma;
bool remain_off_channel = false;

if (local->scanning)
return;

/*
* ieee80211_queue_work() should have picked up most cases,
* here we'll pick the rest.
Expand All @@ -134,6 +131,11 @@ static void ieee80211_work_work(struct work_struct *work)

mutex_lock(&local->mtx);

if (local->scanning) {
mutex_unlock(&local->mtx);
return;
}

ieee80211_recalc_idle(local);

list_for_each_entry_safe(wk, tmp, &local->work_list, list) {
Expand Down

0 comments on commit 5f54607

Please sign in to comment.