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_wx.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_wx.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_wx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index bae5fcc11967..ca11737de6f5 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c | |||
@@ -58,7 +58,7 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
58 | sm->associnfo.req_essid.len = length; | 58 | sm->associnfo.req_essid.len = length; |
59 | 59 | ||
60 | /* queue lower level code to do work (if necessary) */ | 60 | /* queue lower level code to do work (if necessary) */ |
61 | queue_work(sm->workqueue, &sm->associnfo.work); | 61 | schedule_work(&sm->associnfo.work); |
62 | 62 | ||
63 | spin_unlock_irqrestore(&sm->lock, flags); | 63 | spin_unlock_irqrestore(&sm->lock, flags); |
64 | return 0; | 64 | return 0; |
@@ -286,7 +286,7 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev, | |||
286 | spin_lock_irqsave(&mac->lock, flags); | 286 | spin_lock_irqsave(&mac->lock, flags); |
287 | if (!memcmp(any, data->ap_addr.sa_data, ETH_ALEN) || | 287 | if (!memcmp(any, data->ap_addr.sa_data, ETH_ALEN) || |
288 | !memcmp(off, data->ap_addr.sa_data, ETH_ALEN)) { | 288 | !memcmp(off, data->ap_addr.sa_data, ETH_ALEN)) { |
289 | queue_work(mac->workqueue, &mac->associnfo.work); | 289 | schedule_work(&mac->associnfo.work); |
290 | goto out; | 290 | goto out; |
291 | } else { | 291 | } else { |
292 | if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { | 292 | if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { |
@@ -299,7 +299,7 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev, | |||
299 | memcpy(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN); | 299 | memcpy(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN); |
300 | } | 300 | } |
301 | /* queue associate if new bssid or (old one again and not associated) */ | 301 | /* queue associate if new bssid or (old one again and not associated) */ |
302 | queue_work(mac->workqueue,&mac->associnfo.work); | 302 | schedule_work(&mac->associnfo.work); |
303 | } | 303 | } |
304 | 304 | ||
305 | out: | 305 | out: |