diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2006-01-06 01:43:45 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-03-22 22:16:52 -0500 |
commit | 5c4df6da580b9317dc0856e235232b95cbc8251c (patch) | |
tree | df82db654b024cd7204f182cbc40101681e012c0 /net/ieee80211/softmac/ieee80211softmac_scan.c | |
parent | 45867e6a55aee984d69ce8f93a87e26d32d470dc (diff) | |
download | linux-3.10-5c4df6da580b9317dc0856e235232b95cbc8251c.tar.gz linux-3.10-5c4df6da580b9317dc0856e235232b95cbc8251c.tar.bz2 linux-3.10-5c4df6da580b9317dc0856e235232b95cbc8251c.zip |
[PATCH] softmac: convert to use global workqueue
Convert softmac to use global workqueue instead of private one...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_scan.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c index b4b44fa8727..1a1eda434cf 100644 --- a/net/ieee80211/softmac/ieee80211softmac_scan.c +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c @@ -93,7 +93,7 @@ void ieee80211softmac_scan(void *d) // TODO: is this if correct, or should we do this only if scanning from assoc request? if (sm->associnfo.req_essid.len) ieee80211softmac_send_mgt_frame(sm, &sm->associnfo.req_essid, IEEE80211_STYPE_PROBE_REQ, 0); - queue_delayed_work(sm->workqueue, &si->softmac_scan, IEEE80211SOFTMAC_PROBE_DELAY); + schedule_delayed_work(&si->softmac_scan, IEEE80211SOFTMAC_PROBE_DELAY); return; } else { dprintk(PFX "Not probing Channel %d (not allowed here)\n", si->channels[current_channel_idx].channel); @@ -158,7 +158,7 @@ int ieee80211softmac_start_scan_implementation(struct net_device *dev) sm->scaninfo->current_channel_idx = 0; sm->scaninfo->started = 1; INIT_COMPLETION(sm->scaninfo->finished); - queue_work(sm->workqueue, &sm->scaninfo->softmac_scan); + schedule_work(&sm->scaninfo->softmac_scan); spin_unlock_irqrestore(&sm->lock, flags); return 0; } |