| From stable-bounces@linux.kernel.org Tue Jul 17 08:47:14 2007 |
| From: Jean Tourrilhes <jt@hpl.hp.com> |
| Date: Tue, 17 Jul 2007 10:46:33 -0500 |
| Subject: softmac: Fix ESSID problem |
| To: stable@kernel.org |
| Cc: linux-wireless@vger.kernel.org |
| Message-ID: <469CE459.4070300@lwfinger.net> |
| |
| |
| From: Jean Tourrilhes <jt@hpl.hp.com> |
| |
| 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> |
| |
| --- |
| 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; |
