aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/main.c
diff options
context:
space:
mode:
authorOhad Ben-Cohen <ohad@wizery.com>2011-03-30 19:18:31 +0200
committerLuciano Coelho <coelho@ti.com>2011-04-19 16:49:16 +0300
commit8bf69aae4cb9b196ba5ac386f83a1ca3865af11f (patch)
treebce6bf3d22bfc854acfb8cc32df17496fc600852 /drivers/net/wireless/wl12xx/main.c
parentc5745187a4812f2991a58e469a866582a7326d91 (diff)
downloadkernel_samsung_smdk4412-8bf69aae4cb9b196ba5ac386f83a1ca3865af11f.zip
kernel_samsung_smdk4412-8bf69aae4cb9b196ba5ac386f83a1ca3865af11f.tar.gz
kernel_samsung_smdk4412-8bf69aae4cb9b196ba5ac386f83a1ca3865af11f.tar.bz2
wl12xx: fix "JOIN while associated" commentary
Issuing multiple JOIN commands to the wl12xx's firmware, while we're associated, might have undesired implications, so the driver prints a message when that happens, and warn developers who check out the source. Update the commentary in order to consider the one valid scenario where this can happen: roaming. Cautiously keep the message for now, until we either gain confidence there are no unintentional JOIN-while-associated events, or until we move to the new multi-role fw who solves this multiple-join issue for good. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r--drivers/net/wireless/wl12xx/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 0efa7a0..01205ea 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1591,10 +1591,10 @@ static int wl1271_join(struct wl1271 *wl, bool set_assoc)
* One of the side effects of the JOIN command is that is clears
* WPA/WPA2 keys from the chipset. Performing a JOIN while associated
* to a WPA/WPA2 access point will therefore kill the data-path.
- * Currently there is no supported scenario for JOIN during
- * association - if it becomes a supported scenario, the WPA/WPA2 keys
- * must be handled somehow.
- *
+ * Currently the only valid scenario for JOIN during association
+ * is on roaming, in which case we will also be given new keys.
+ * Keep the below message for now, unless it starts bothering
+ * users who really like to roam a lot :)
*/
if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
wl1271_info("JOIN while associated.");