[2.6.22.2 review 49/84] softmac: Fix ESSID problem
From: Greg KH <gregkh@suse.de>
Date: 2007-08-07 21:13:05
Also in:
lkml
From: Jean Tourrilhes <redacted> 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 <redacted> Acked-by: Michael Buesch <redacted> Acked-by: Larry Finger <redacted> Acked-by: John W. Linville <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- 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;
--