From 05aed438cd65ed2ab11856361f66f1f7d8896548 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Thu, 18 Aug 2016 10:06:43 +0900 Subject: [PATCH] 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 --- wpa_supplicant/wpa_supplicant.c | 5 +++++ 1 file changed, 5 insertions(+) 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) { -- 2.1.4