Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cf92a3c authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by John W. Linville
Browse files

[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: default avatarJean Tourrilhes <jt@hpl.hp.com>
Acked-by: default avatarMichael Buesch <mb@bu3sch.df>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 426921bd
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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;