diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2006-01-05 19:43:45 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-03-22 22:16:52 -0500 |
commit | 5c4df6da580b9317dc0856e235232b95cbc8251c (patch) | |
tree | df82db654b024cd7204f182cbc40101681e012c0 /net/ieee80211/softmac/ieee80211softmac_auth.c | |
parent | 45867e6a55aee984d69ce8f93a87e26d32d470dc (diff) |
[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_auth.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_auth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c index 286f0718eb7e..5a773528110f 100644 --- a/net/ieee80211/softmac/ieee80211softmac_auth.c +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c | |||
@@ -36,7 +36,7 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac, | |||
36 | 36 | ||
37 | /* add to list */ | 37 | /* add to list */ |
38 | list_add_tail(&auth->list, &mac->auth_queue); | 38 | list_add_tail(&auth->list, &mac->auth_queue); |
39 | queue_work(mac->workqueue, &auth->work); | 39 | schedule_work(&auth->work); |
40 | spin_unlock_irqrestore(&mac->lock, flags); | 40 | spin_unlock_irqrestore(&mac->lock, flags); |
41 | 41 | ||
42 | return 0; | 42 | return 0; |
@@ -67,7 +67,7 @@ ieee80211softmac_auth_queue(void *data) | |||
67 | net->authenticated = 0; | 67 | net->authenticated = 0; |
68 | net->authenticating = 1; | 68 | net->authenticating = 1; |
69 | /* add a timeout call so we eventually give up waiting for an auth reply */ | 69 | /* add a timeout call so we eventually give up waiting for an auth reply */ |
70 | queue_delayed_work(mac->workqueue, &auth->work, IEEE80211SOFTMAC_AUTH_TIMEOUT); | 70 | schedule_delayed_work(&auth->work, IEEE80211SOFTMAC_AUTH_TIMEOUT); |
71 | auth->retry--; | 71 | auth->retry--; |
72 | spin_unlock_irqrestore(&mac->lock, flags); | 72 | spin_unlock_irqrestore(&mac->lock, flags); |
73 | if (ieee80211softmac_send_mgt_frame(mac, auth->net, IEEE80211_STYPE_AUTH, auth->state)) | 73 | if (ieee80211softmac_send_mgt_frame(mac, auth->net, IEEE80211_STYPE_AUTH, auth->state)) |
@@ -279,7 +279,7 @@ ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac, | |||
279 | kfree(net); | 279 | kfree(net); |
280 | 280 | ||
281 | /* let's try to re-associate */ | 281 | /* let's try to re-associate */ |
282 | queue_work(mac->workqueue, &mac->associnfo.work); | 282 | schedule_work(&mac->associnfo.work); |
283 | spin_unlock_irqrestore(&mac->lock, flags); | 283 | spin_unlock_irqrestore(&mac->lock, flags); |
284 | } | 284 | } |
285 | 285 | ||