From: Arturo Buzarra Date: Mon, 9 Mar 2020 17:18:35 +0100 Subject: [PATCH] mesh: Fix CONFIG_HT_OVERRIDES build without CONFIG_VHT_OVERRIDES Commit e5a9b1e8a3 ("mesh: Implement use of VHT20 config in mesh mode") introduced the possibility to check the disable_vht param. However, this entry is only available when CONFIG_VHT_OVERRIDES is enabled and as such, this broke the build for some cases. Fix this by encapsulating VHT property with the proper CONFIG entry. Signed-off-by: Arturo Buzarra --- wpa_supplicant/wpa_supplicant.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 911d79d17..3fbcf2a70 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2237,12 +2237,14 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s, freq->channel = pri_chan->chan; #ifdef CONFIG_HT_OVERRIDES if (ssid->disable_ht40) { +#ifdef CONFIG_VHT_OVERRIDES if (ssid->disable_vht) return; +#endif /* CONFIG_VHT_OVERRIDES */ goto skip_ht40; } #endif /* CONFIG_HT_OVERRIDES */ /* Check/setup HT40+/HT40- */