From: Jouni Malinen <j@w1.fi>
Date: Sat, 25 Oct 2014 08:27:48 +0000 (+0300)
Subject: Fix channel switch to disable VHT with HT
X-Git-Tag: hostap_2_4~1261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5de748187ef5c468e8d4cd7dc4cf3f1f5336b64a;p=thirdparty%2Fhostap.git

Fix channel switch to disable VHT with HT

If both HT and VHT was enabled on AP and channel switch event from the
driver indicated that HT was disabled, VHT was left enabled. This
resulted in the following channel configuration failing. Fix this by
disabling VHT if HT gets disabled.

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

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 9beb32245..bcecac1c4 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -489,6 +489,8 @@ void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht,
 
 	hapd->iconf->channel = channel;
 	hapd->iconf->ieee80211n = ht;
+	if (!ht)
+		hapd->iconf->ieee80211ac = 0;
 	hapd->iconf->secondary_channel = offset;
 	hapd->iconf->vht_oper_chwidth = chwidth;
 	hapd->iconf->vht_oper_centr_freq_seg0_idx = seg0_idx;