-From 91976250359b263a44861aebe553b20627fe487e Mon Sep 17 00:00:00 2001
+From 7f8ac02e8524633d92941f7934440c19f1002616 Mon Sep 17 00:00:00 2001
From: Markus Theil <markus.theil@tu-ilmenau.de>
Date: Tue, 30 Jun 2020 13:53:17 +0200
-Subject: [PATCH 01/19] HE/VHT: fix frequency setup with HE enabled
+Subject: HE/VHT: Fix frequency setup with HE enabled
-Some places in the code base were not using the
-wrappers like hostapd_set_oper_centr_freq_seg0_idx
-and friends. This could lead to errors, for example when
-joining 80 MHz mesh networks. Fix this, by enforcing
-usage of these wrappers.
+Some places in the code base were not using the wrappers like
+hostapd_set_oper_centr_freq_seg0_idx and friends. This could lead to
+errors, for example when joining 80 MHz mesh networks. Fix this, by
+enforcing usage of these wrappers.
-wpa_supplicant_conf_ap_ht now checks for HE capability
-before dealing with VHT in order for these wrappers to work,
-as they first check HE support in the config.
+wpa_supplicant_conf_ap_ht() now checks for HE capability before dealing
+with VHT in order for these wrappers to work, as they first check HE
+support in the config.
-While doing these changes, I've noticed that the extra
-channel setup code for mesh networks in wpa_supplicant/mesh.c
-should not be necessary anymore and dropped it.
-wpa_supplicant_conf_ap_ht should handle this setup already.
+While doing these changes, I've noticed that the extra channel setup
+code for mesh networks in wpa_supplicant/mesh.c should not be necessary
+anymore and dropped it. wpa_supplicant_conf_ap_ht() should handle this
+setup already.
Acked-by: John Crispin <john@phrozen.org>
Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
- conf->vht_oper_centr_freq_seg0_idx =
- conf->channel + conf->secondary_channel * 2;
- conf->vht_oper_chwidth = CHANWIDTH_USE_HT;
-+ hostapd_set_oper_centr_freq_seg0_idx(conf,
-+ conf->channel + conf->secondary_channel * 2);
++ hostapd_set_oper_centr_freq_seg0_idx(
++ conf, conf->channel + conf->secondary_channel * 2);
+ hostapd_set_oper_chwidth(conf, CHANWIDTH_USE_HT);
}