summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/main.c
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2011-08-14 13:17:37 +0300
committerLuciano Coelho <coelho@ti.com>2011-08-22 12:35:31 +0300
commitcf42039f33c8c7c12f19390661eb00ba47b96f91 (patch)
tree2607757b8d884bf99860788dc6cf61aebc205e65 /drivers/net/wireless/wl12xx/main.c
parent9b17f1b371c5aa5179b3e5392bc22132a3371da4 (diff)
downloadtalos-obmc-linux-cf42039f33c8c7c12f19390661eb00ba47b96f91.tar.gz
talos-obmc-linux-cf42039f33c8c7c12f19390661eb00ba47b96f91.zip
wl12xx: set the AP-started flag only after setting keys
This fix eliminates a potential race between starting the AP role and setting encryption keys. Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Eliad Peller <eliad@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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index ad0b5a163b9d..a23b394291f2 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3140,12 +3140,12 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,
if (ret < 0)
goto out;
- set_bit(WL1271_FLAG_AP_STARTED, &wl->flags);
- wl1271_debug(DEBUG_AP, "started AP");
-
ret = wl1271_ap_init_hwenc(wl);
if (ret < 0)
goto out;
+
+ set_bit(WL1271_FLAG_AP_STARTED, &wl->flags);
+ wl1271_debug(DEBUG_AP, "started AP");
}
} else {
if (test_bit(WL1271_FLAG_AP_STARTED, &wl->flags)) {
OpenPOWER on IntegriCloud