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

Commit 8f648c00 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Prevent performing "join" before association 



There is a minor bug in the code causing a "join" to be performed before
there is an intention to associate. Fix this.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04477bf0

drivers/net/wireless/wl12xx/wl1271_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) 
		if (conf->flags & IEEE80211_CONF_IDLE &&

		    test_bit(WL1271_FLAG_JOINED, &wl->flags))

			wl1271_unjoin_channel(wl);

		else

		else if (!(conf->flags & IEEE80211_CONF_IDLE))

			wl1271_join_channel(wl, channel);



		if (conf->flags & IEEE80211_CONF_IDLE) {