Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / net / ieee80211 / softmac / ieee80211softmac_assoc.c

diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index cc8110bdd5799359e95be983db36ba1616b6dff1..afb6c6698b279f84bbaf1e258e4de94d76e53fee 100644 (file)
--- 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)
                         */
                        dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
                        ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL);
-                       if (ieee80211softmac_start_scan(mac))
+                       if (ieee80211softmac_start_scan(mac)) {
                                dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
+                               mac->associnfo.associating = 0;
+                               mac->associnfo.associated = 0;
+                       }
                        goto out;
                } else {
                        mac->associnfo.associating = 0;