[PATCH 2.6] SoftMAC : fix ESSID problem

[PATCH 2.6] SoftMAC : fix ESSID problem

[Jean Tourrilhes]

	Hi,

	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.
        John : would you mind pushing that to 2.6.23 ?
        Thanks...

        Jean

Signed-off-by: Jean Tourrilhes <jt-sDzT885Ts8HQT0dZR+AlfA@public.gmane.org>

-----------------------------------------------------------

--- linux/net/ieee80211/softmac/ieee80211softmac_assoc.j1.c	2007-07-09 13:56:13.000000000 -0700
+++ linux/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-07-09 13:56:41.000000000 -0700
@@ -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: [PATCH 2.6] SoftMAC : fix ESSID problem

[Michael Buesch]

On Tuesday 10 July 2007 00:19:22 Jean Tourrilhes wrote:
> 	Hi,
> 
> 	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.
>         John : would you mind pushing that to 2.6.23 ?
>         Thanks...
> 
>         Jean
> 
> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
> 
> -----------------------------------------------------------
> 
> --- linux/net/ieee80211/softmac/ieee80211softmac_assoc.j1.c	2007-07-09 13:56:13.000000000 -0700
> +++ linux/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-07-09 13:56:41.000000000 -0700
> @@ -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;
> 

Acked-by: Michael Buesch <mb@bu3sch.de>


-- 
Greetings Michael.

Re: [PATCH 2.6] SoftMAC : fix ESSID problem

[Larry Finger]

Michael Buesch wrote:
> On Tuesday 10 July 2007 00:19:22 Jean Tourrilhes wrote:
>> 	Hi,
>>
>> 	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.
>>         John : would you mind pushing that to 2.6.23 ?
>>         Thanks...
>>
>>         Jean
>>
>> Signed-off-by: Jean Tourrilhes <jt-sDzT885Ts8HQT0dZR+AlfA@public.gmane.org>
>>
>> -----------------------------------------------------------
>>
>> --- linux/net/ieee80211/softmac/ieee80211softmac_assoc.j1.c	2007-07-09 13:56:13.000000000 -0700
>> +++ linux/net/ieee80211/softmac/ieee80211softmac_assoc.c	2007-07-09 13:56:41.000000000 -0700
>> @@ -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;
>>
> 
> Acked-by: Michael Buesch <mb-fseUSCV1ubazQB+pC5nmwQ@public.gmane.org>
Acked-by: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>

This patch should also be sent to stable-DgEjT+Ai2yi4UlQgPVntAg@public.gmane.org

Larry

Re: [PATCH 2.6] SoftMAC : fix ESSID problem

[Jean Tourrilhes]

On Mon, Jul 09, 2007 at 06:40:44PM -0500, Larry Finger wrote:
> 
> This patch should also be sent to stable-DgEjT+Ai2yi4UlQgPVntAg@public.gmane.org

	Please do so if you like it.

> Larry

	Jean