From: Jean Tourrilhes <[EMAIL PROTECTED]>

Victor Porton reported that the SoftMAC layer had random problem when setting 
the ESSID :
http://bugzilla.kernel.org/show_bug.cgi?id=8686 After investigation, it turned 
out to be
worse, the SoftMAC layer is left in an inconsistent state. The fix is pretty 
trivial.

Signed-off-by: Jean Tourrilhes <[EMAIL PROTECTED]>
Acked-by: Michael Buesch <[EMAIL PROTECTED]>
Acked-by: Larry Finger <[EMAIL PROTECTED]>
Acked-by: John W. Linville <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>

---
 net/ieee80211/softmac/ieee80211softmac_assoc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -271,8 +271,11 @@ ieee80211softmac_assoc_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;

-- 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to