Respect disable_ht40/disable_vht/disable_he in AP/mesh mode

When using wpa_supplicant to connect to a mesh network or to create an
AP, the current code doesn't respect all CONFIG_XXX_OVERRIDES network
parameters, just disable_ht in CONFIG_HT_OVERRIDES.

Add support for some of the others modulation related disable flags:
 - disable_ht40 with CONFIG_HT_OVERRIDES
 - disable_vht with CONFIG_VHT_OVERRIDES
 - disable_he with CONFIG_HE_OVERRIDES

Signed-off-by: Nicolas Escande <nico.escande@gmail.com>

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index ff7c75644dce719fb0749e65cca06ba9b4dd564d..2fc9f453bbe14062439a066898e7ab30c665dcc1 100644 (file)
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -314,8 +314,20 @@ int wpa_supplicant_conf_ap_ht(struct wpa_supplicant *wpa_s,
 #ifdef CONFIG_HT_OVERRIDES
                if (ssid->disable_ht)
                        ssid->ht = 0;
+               if (ssid->disable_ht40)
+                       ssid->ht40 = 0;
 #endif /* CONFIG_HT_OVERRIDES */
 
+#ifdef CONFIG_VHT_OVERRIDES
+               if (ssid->disable_vht)
+                       ssid->vht = 0;
+#endif /* CONFIG_VHT_OVERRIDES */
+
+#ifdef CONFIG_HE_OVERRIDES
+               if (ssid->disable_he)
+                       ssid->he = 0;
+#endif /* CONFIG_HE_OVERRIDES */
+
                if (!ssid->ht) {
                        wpa_printf(MSG_DEBUG,
                                   "HT not enabled in network profile");