diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-26 16:34:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 13:42:58 -0400 |
| commit | 4a232e725b5cc1bc7fc5b177424a9ff8313b23ad (patch) | |
| tree | 66b21c41372e606010e1560897eb6972f57041f0 /net/ieee80211 | |
| parent | 8f7eb40749f4b0cf9d3892d9680c97b1bfce6de6 (diff) | |
[PATCH] softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_assoc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index 7f6ef0eee0ba..44215ce64d4e 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c | |||
| @@ -303,7 +303,7 @@ ieee80211softmac_assoc_work(void *d) | |||
| 303 | dprintk(KERN_INFO PFX "Already requested authentication, waiting...\n"); | 303 | dprintk(KERN_INFO PFX "Already requested authentication, waiting...\n"); |
| 304 | if(!mac->associnfo.assoc_wait) { | 304 | if(!mac->associnfo.assoc_wait) { |
| 305 | mac->associnfo.assoc_wait = 1; | 305 | mac->associnfo.assoc_wait = 1; |
| 306 | ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify, NULL, GFP_KERNEL); | 306 | ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL); |
| 307 | } | 307 | } |
| 308 | return; | 308 | return; |
| 309 | } | 309 | } |
| @@ -314,7 +314,7 @@ ieee80211softmac_assoc_work(void *d) | |||
| 314 | if(!mac->associnfo.assoc_wait) { | 314 | if(!mac->associnfo.assoc_wait) { |
| 315 | dprintk(KERN_INFO PFX "Cannot associate without being authenticated, requested authentication\n"); | 315 | dprintk(KERN_INFO PFX "Cannot associate without being authenticated, requested authentication\n"); |
| 316 | mac->associnfo.assoc_wait = 1; | 316 | mac->associnfo.assoc_wait = 1; |
| 317 | ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify, NULL, GFP_KERNEL); | 317 | ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL); |
| 318 | } | 318 | } |
| 319 | } else { | 319 | } else { |
| 320 | printkl(KERN_WARNING PFX "Not authenticated, but requesting authentication failed. Giving up to associate\n"); | 320 | printkl(KERN_WARNING PFX "Not authenticated, but requesting authentication failed. Giving up to associate\n"); |