diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-15 14:31:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-15 14:31:06 -0700 |
| commit | 3eb14b944f2b5b6efe4e0ae3fe9601db78437d57 (patch) | |
| tree | bea3d9ce130de0a73504ab94882115004b826fd6 /net/mac80211/work.c | |
| parent | 791f58c0640f906d3f63518d3f02630dbbafb7a2 (diff) | |
| parent | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/work.c')
| -rw-r--r-- | net/mac80211/work.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 15e1ba931b8..bdb1d05b16f 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -920,11 +920,16 @@ static void ieee80211_work_work(struct work_struct *work) run_again(local, jiffies + HZ/2); } - if (list_empty(&local->work_list) && local->scan_req) + mutex_lock(&local->scan_mtx); + + if (list_empty(&local->work_list) && local->scan_req && + !local->scanning) ieee80211_queue_delayed_work(&local->hw, &local->scan_work, round_jiffies_relative(0)); + mutex_unlock(&local->scan_mtx); + mutex_unlock(&local->work_mtx); ieee80211_recalc_idle(local); |