diff options
| author | Jean Tourrilhes <jt@hpl.hp.com> | 2007-07-17 10:46:33 -0500 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2007-08-25 17:24:09 +0200 |
| commit | 50dd9072c45f64348e10ae61df948fef43430a0e (patch) | |
| tree | 171650ea42886b65237c2f17ca395ca41c71dac8 | |
| parent | 04745f208c5b7de16fb35628b0003744b760b2cd (diff) | |
| download | lwn-50dd9072c45f64348e10ae61df948fef43430a0e.tar.gz lwn-50dd9072c45f64348e10ae61df948fef43430a0e.zip | |
[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 <jt@hpl.hp.com>
Acked-by: Michael Buesch <mb@bu3sch.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 a824852909e4..dadb65c06918 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; |