From: Jouni Malinen <j@w1.fi>
Date: Sun, 29 Jan 2017 16:10:24 +0000 (+0200)
Subject: IBSS/mesh: Skip VHT channel setup with vht_disabled=1
X-Git-Tag: hostap_2_7~1714
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b301f54e5514ff629c1ca613b7f4c0a3d4e10f8a;p=thirdparty%2Fhostap.git

IBSS/mesh: Skip VHT channel setup with vht_disabled=1

If the VHT capability override vht_disabled=1 is used in the network
profile, skip VHT configuration of the local channel.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 1c02020ad..83c5e94df 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2071,6 +2071,13 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
 
 	vht_freq = *freq;
 
+#ifdef CONFIG_VHT_OVERRIDES
+	if (ssid->disable_vht) {
+		freq->vht_enabled = 0;
+		return;
+	}
+#endif /* CONFIG_VHT_OVERRIDES */
+
 	vht_freq.vht_enabled = vht_supported(mode);
 	if (!vht_freq.vht_enabled)
 		return;