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: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
04477bf095
commit
8f648c0003
|
@ -1223,7 +1223,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
|
||||||
if (conf->flags & IEEE80211_CONF_IDLE &&
|
if (conf->flags & IEEE80211_CONF_IDLE &&
|
||||||
test_bit(WL1271_FLAG_JOINED, &wl->flags))
|
test_bit(WL1271_FLAG_JOINED, &wl->flags))
|
||||||
wl1271_unjoin_channel(wl);
|
wl1271_unjoin_channel(wl);
|
||||||
else
|
else if (!(conf->flags & IEEE80211_CONF_IDLE))
|
||||||
wl1271_join_channel(wl, channel);
|
wl1271_join_channel(wl, channel);
|
||||||
|
|
||||||
if (conf->flags & IEEE80211_CONF_IDLE) {
|
if (conf->flags & IEEE80211_CONF_IDLE) {
|
||||||
|
|
Loading…
Reference in New Issue