diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-04 22:25:15 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-04 22:25:15 +0100 |
commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /net/wireless/scan.c | |
parent | tcp: fix a timewait refcnt race (diff) | |
parent | iwmc3200wifi: Enable wimax core through module parameter (diff) | |
download | linux-8f56874bd7e8bee73ed6a1cf80dcec2753616262.tar.xz linux-8f56874bd7e8bee73ed6a1cf80dcec2753616262.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/scan.c')
-rw-r--r-- | net/wireless/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 96df34c3c6ee..12dfa62aad18 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -88,7 +88,7 @@ void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted) WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); request->aborted = aborted; - schedule_work(&wiphy_to_dev(request->wiphy)->scan_done_wk); + queue_work(cfg80211_wq, &wiphy_to_dev(request->wiphy)->scan_done_wk); } EXPORT_SYMBOL(cfg80211_scan_done); |