aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2009-12-11 15:41:10 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-12-28 16:31:36 -0500
commit8f648c00039a42e67a9dff034c77d41502dab1f3 (patch)
tree85f7c29cae3cd715ff758477fd2c8690a082c561
parent04477bf095afd008b73717f7a4ea1fdf18b1b5e2 (diff)
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>
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 7e6b500dfb6..4a997381a8d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -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) {