diff options
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_assoc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index cc8110bdd579..afb6c6698b27 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c | |||
@@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_struct *work) | |||
271 | */ | 271 | */ |
272 | dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n"); | 272 | dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n"); |
273 | ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL); | 273 | ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL); |
274 | if (ieee80211softmac_start_scan(mac)) | 274 | if (ieee80211softmac_start_scan(mac)) { |
275 | dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); | 275 | dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); |
276 | mac->associnfo.associating = 0; | ||
277 | mac->associnfo.associated = 0; | ||
278 | } | ||
276 | goto out; | 279 | goto out; |
277 | } else { | 280 | } else { |
278 | mac->associnfo.associating = 0; | 281 | mac->associnfo.associating = 0; |