aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/mesh_mpm.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-01-10 10:52:50 (GMT)
committerJouni Malinen <j@w1.fi>2015-01-10 15:35:53 (GMT)
commit6334330ed682c3a462fbe0543ac238b5dd6aec4d (patch)
tree38990c4e710d97cc3348fa4b68d3d805e5122918 /wpa_supplicant/mesh_mpm.c
parent1fc4ab2367807e50fb49a84456602ccc17cb5d84 (diff)
downloadhostap-6334330ed682c3a462fbe0543ac238b5dd6aec4d.zip
hostap-6334330ed682c3a462fbe0543ac238b5dd6aec4d.tar.gz
hostap-6334330ed682c3a462fbe0543ac238b5dd6aec4d.tar.bz2
mesh: Use a separate variable to track whether HT is enabled
A network profile parameter should not be used to check whether the currently operating mesh has HT enabled. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/mesh_mpm.c')
-rw-r--r--wpa_supplicant/mesh_mpm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/wpa_supplicant/mesh_mpm.c b/wpa_supplicant/mesh_mpm.c
index e7c53ea..4a259ff 100644
--- a/wpa_supplicant/mesh_mpm.c
+++ b/wpa_supplicant/mesh_mpm.c
@@ -229,8 +229,7 @@ static void mesh_mpm_send_plink_action(struct wpa_supplicant *wpa_s,
2 + 96 + /* AMPE */
2 + 16; /* MIC */
#ifdef CONFIG_IEEE80211N
- if (type != PLINK_CLOSE &&
- wpa_s->current_ssid->mesh_ht_mode > CHAN_NO_HT) {
+ if (type != PLINK_CLOSE && wpa_s->mesh_ht_enabled) {
buf_len += 2 + 26 + /* HT capabilities */
2 + 22; /* HT operation */
}
@@ -323,8 +322,7 @@ static void mesh_mpm_send_plink_action(struct wpa_supplicant *wpa_s,
}
#ifdef CONFIG_IEEE80211N
- if (type != PLINK_CLOSE &&
- wpa_s->current_ssid->mesh_ht_mode > CHAN_NO_HT) {
+ if (type != PLINK_CLOSE && wpa_s->mesh_ht_enabled) {
pos = hostapd_eid_ht_capabilities(bss, ht_capa_oper);
pos = hostapd_eid_ht_operation(bss, pos);
wpabuf_put_data(buf, ht_capa_oper, pos - ht_capa_oper);