]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
mesh: Fix CONFIG_HT_OVERRIDES build without CONFIG_VHT_OVERRIDES
authorArturo Buzarra <arturo.buzarra@digi.com>
Mon, 9 Mar 2020 17:18:16 +0000 (18:18 +0100)
committerJouni Malinen <j@w1.fi>
Tue, 10 Mar 2020 20:55:16 +0000 (22:55 +0200)
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.

Fixes: e5a9b1e8a3a5 ("mesh: Implement use of VHT20 config in mesh mode")
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
wpa_supplicant/wpa_supplicant.c

index 839afe32d32ba1f2c20ef44f23f55564df241216..ba8ae65ae0cea75592a7b9c6bbea8164312c2b75 100644 (file)
@@ -2396,8 +2396,10 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
 
 #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 */