From: Vamsi Krishna <vamsin@codeaurora.com>
Date: Mon, 13 Jan 2020 09:29:06 +0000 (+0530)
Subject: Do not enable HT/VHT for 6 GHz band 20 MHz width channels also
X-Git-Tag: hostap_2_10~1932
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1011c79900780dd9d1efa57b49f87d43b4e37e2f;p=thirdparty%2Fhostap.git

Do not enable HT/VHT for 6 GHz band 20 MHz width channels also

The previous commit had a rebasing issue that ended up covering only the
center_segment0 != 0 case. These were supposed to apply for all 6 GHz
band cases.

Fixes: 0bfc04b8d0f8 ("Do not enable HT/VHT when operating in 6 GHz band")
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---

diff --git a/src/common/hw_features_common.c b/src/common/hw_features_common.c
index 19593a521..4f1c4935a 100644
--- a/src/common/hw_features_common.c
+++ b/src/common/hw_features_common.c
@@ -468,9 +468,9 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
 			data->bandwidth = (1 << (u8) bw) * 20;
 			data->center_freq1 = freq1;
 			data->center_freq2 = freq2;
-			data->ht_enabled = 0;
-			data->vht_enabled = 0;
 		}
+		data->ht_enabled = 0;
+		data->vht_enabled = 0;
 
 		return 0;
 	}