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

Commit 4a232e72 authored by John W. Linville's avatar John W. Linville Committed by Jeff Garzik
Browse files

[PATCH] softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549 



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8f7eb407

net/ieee80211/softmac/ieee80211softmac_assoc.c

+2 −2
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ ieee80211softmac_assoc_work(void *d) 
		dprintk(KERN_INFO PFX "Already requested authentication, waiting...\n");

		if(!mac->associnfo.assoc_wait) {

			mac->associnfo.assoc_wait = 1;

			ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify, NULL, GFP_KERNEL);

			ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL);

		}

		return;

	}
@@ -314,7 +314,7 @@ ieee80211softmac_assoc_work(void *d) 
			if(!mac->associnfo.assoc_wait) {

				dprintk(KERN_INFO PFX "Cannot associate without being authenticated, requested authentication\n");

				mac->associnfo.assoc_wait = 1;

				ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify, NULL, GFP_KERNEL);

				ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL);

			}

		} else {

			printkl(KERN_WARNING PFX "Not authenticated, but requesting authentication failed. Giving up to associate\n");