aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/wpas_glue.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2012-11-12 18:07:53 (GMT)
committerJouni Malinen <j@w1.fi>2012-11-12 18:07:53 (GMT)
commit6e2020210afe355bd0f8fcdb2a68f31746f6f7df (patch)
tree149f7ad9f6f411a178ad99edff457f584ed72a45 /wpa_supplicant/wpas_glue.c
parent8713a2e6ff0940c03de9f2289c5c875c4df7bc9b (diff)
downloadhostap-6e2020210afe355bd0f8fcdb2a68f31746f6f7df.zip
hostap-6e2020210afe355bd0f8fcdb2a68f31746f6f7df.tar.gz
hostap-6e2020210afe355bd0f8fcdb2a68f31746f6f7df.tar.bz2
Allow OKC to be enabled by default
Previously, OKC (opportunistic key caching, a.k.a. proactive key caching) could be enabled only with a per-network parameter (proactive_key_caching). The new global parameter (okc) can now be used to change the default behavior to be OKC enabled (okc=1) for network blocks that do not override this with the proactive_key_caching parameter. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/wpas_glue.c')
-rw-r--r--wpa_supplicant/wpas_glue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c
index aec639a..1ba4c92 100644
--- a/wpa_supplicant/wpas_glue.c
+++ b/wpa_supplicant/wpas_glue.c
@@ -880,7 +880,8 @@ void wpa_supplicant_rsn_supp_set_config(struct wpa_supplicant *wpa_s,
conf.peerkey_enabled = ssid->peerkey;
conf.allowed_pairwise_cipher = ssid->pairwise_cipher;
#ifdef IEEE8021X_EAPOL
- conf.proactive_key_caching = ssid->proactive_key_caching;
+ conf.proactive_key_caching = ssid->proactive_key_caching < 0 ?
+ wpa_s->conf->okc : ssid->proactive_key_caching;
conf.eap_workaround = ssid->eap_workaround;
conf.eap_conf_ctx = &ssid->eap;
#endif /* IEEE8021X_EAPOL */