[PATCH] softmac: Fix ESSID problem

[PATCH] softmac: Fix ESSID problem

[Larry Finger]

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.df>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
---

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

Index: linux-2.6/net/ieee80211/softmac/ieee80211softmac_assoc.c
===================================================================
--- linux-2.6.orig/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ linux-2.6/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;

----

Re: [stable] [PATCH] softmac: Fix ESSID problem

[Chris Wright]

* Larry Finger (Larry.Finger@lwfinger.net) wrote:
> 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.df>
> Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Please resend when this is accepted upstream.

thanks,
-chris

Re: [stable] [PATCH] softmac: Fix ESSID problem

[John W. Linville]

On Wed, Jul 11, 2007 at 12:14:18AM -0700, Chris Wright wrote:
> * Larry Finger (Larry.Finger@lwfinger.net) wrote:
> > 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.df>
> > Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
> 
> Please resend when this is accepted upstream.

FWIW, I passed it up to Jeff yesterday.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [stable] [PATCH] softmac: Fix ESSID problem

[Larry Finger]

Chris Wright wrote:
> * Larry Finger (Larry.Finger@lwfinger.net) wrote:
>> 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.df>
>> Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
> 
> Please resend when this is accepted upstream.

As you heard from John Linville, the patch has been sent upstream, but I'll resend it when it hits 
Linus's tree.

Larry

Re: [stable] [PATCH] softmac: Fix ESSID problem

[Chris Wright]

* Larry Finger (larry.finger@lwfinger.net) wrote:
> As you heard from John Linville, the patch has been sent upstream, but I'll 
> resend it when it hits Linus's tree.

Thanks guys.
-chris