diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
| commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
| tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /net/wireless/scan.c | |
| parent | 47e1c323069bcef0acb8a2b48921688573f5ca63 (diff) | |
| parent | 159bcfeb9123c91f0dc885a42b6387a98192f896 (diff) | |
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 96df34c3c6e..12dfa62aad1 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) | |||
| 88 | WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); | 88 | WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); |
| 89 | 89 | ||
| 90 | request->aborted = aborted; | 90 | request->aborted = aborted; |
| 91 | schedule_work(&wiphy_to_dev(request->wiphy)->scan_done_wk); | 91 | queue_work(cfg80211_wq, &wiphy_to_dev(request->wiphy)->scan_done_wk); |
| 92 | } | 92 | } |
| 93 | EXPORT_SYMBOL(cfg80211_scan_done); | 93 | EXPORT_SYMBOL(cfg80211_scan_done); |
| 94 | 94 | ||