aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/mesh.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-11-26 16:45:59 (GMT)
committerJouni Malinen <j@w1.fi>2015-11-26 16:47:40 (GMT)
commit0530eb10866fb106923476daf483ebc3a2f4b2f8 (patch)
tree4b5b4452a3d68489253bbb02e2ce9a890d4f4aa1 /wpa_supplicant/mesh.c
parent1d6955e668a4f58af79727a0d774d6819c51d8c5 (diff)
downloadhostap-0530eb10866fb106923476daf483ebc3a2f4b2f8.zip
hostap-0530eb10866fb106923476daf483ebc3a2f4b2f8.tar.gz
hostap-0530eb10866fb106923476daf483ebc3a2f4b2f8.tar.bz2
mesh: Clear wpa_s cipher selection on starting mesh
This is needed to avoid hitting WEP/TKIP detection in ibss_mesh_setup_freq() if the previous connection used WEP or TKIP. Previously, that could have resulted in VHT and HT getting disabled for the mesh connection. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/mesh.c')
-rw-r--r--wpa_supplicant/mesh.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index 5937777..8f74b5d 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -318,6 +318,16 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
wpa_supplicant_mesh_deinit(wpa_s);
+ if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
+ wpa_s->pairwise_cipher = WPA_CIPHER_CCMP;
+ wpa_s->group_cipher = WPA_CIPHER_CCMP;
+ wpa_s->mgmt_group_cipher = 0;
+ } else {
+ wpa_s->pairwise_cipher = WPA_CIPHER_NONE;
+ wpa_s->group_cipher = WPA_CIPHER_NONE;
+ wpa_s->mgmt_group_cipher = 0;
+ }
+
os_memset(&params, 0, sizeof(params));
params.meshid = ssid->ssid;
params.meshid_len = ssid->ssid_len;