Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4cf92a3cd9117cb90ad9441172b9f42b67ee9d26
Commit:     4cf92a3cd9117cb90ad9441172b9f42b67ee9d26
Parent:     426921bda10c33231e2b335e4ad08bc755c50740
Author:     Jean Tourrilhes <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 9 20:37:36 2007 -0500
Committer:  John W. Linville <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 14:27:00 2007 -0400

    [PATCH] softmac: Fix ESSID problem
    
    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]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 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 cc8110b..afb6c66 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)
                         */
                        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 git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to