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 19593a521f9e5b89eccd8e6e03cdddc38b314bb9..4f1c4935a4fa610940d50d752f369f0c72a41c12 100644 (file)
--- 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;
        }