aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorMasashi Honma <masashi.honma@gmail.com>2016-08-18 01:06:43 (GMT)
committerJouni Malinen <j@w1.fi>2016-08-18 07:43:19 (GMT)
commit05aed438cd65ed2ab11856361f66f1f7d8896548 (patch)
tree4058671e3a1a033139caa2583486bbc9ff015df0 /wpa_supplicant
parent6b6286eb78076e098e855c608fcb1a7b27518e79 (diff)
downloadhostap-05aed438cd65ed2ab11856361f66f1f7d8896548.zip
hostap-05aed438cd65ed2ab11856361f66f1f7d8896548.tar.gz
hostap-05aed438cd65ed2ab11856361f66f1f7d8896548.tar.bz2
mesh: Set correct secondary channel offset if HT40 is disabled
Previously, secondary channel offset could be non zero even though disable_ht40=1. This patch fixes it. Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/wpa_supplicant.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 0add89d..0eee641 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1901,6 +1901,11 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
return;
+#ifdef CONFIG_HT_OVERRIDES
+ if (ssid->disable_ht40)
+ return;
+#endif /* CONFIG_HT_OVERRIDES */
+
/* Check/setup HT40+/HT40- */
for (j = 0; j < ARRAY_SIZE(ht40plus); j++) {
if (ht40plus[j] == channel) {