hostapd: use proper helper functions for setting seg0/seg1 idx and chwidth

Simplifies code and removes #ifdef statements

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/network/services/hostapd/src/src/ap/ucode.c b/package/network/services/hostapd/src/src/ap/ucode.c
index 080fe48b11ac7db03d182d43a3596ee9e5558dc3..33160561d4d1dff8bbd1859867edc230b2a274f7 100644 (file)
--- a/package/network/services/hostapd/src/src/ap/ucode.c
+++ b/package/network/services/hostapd/src/src/ap/ucode.c
@@ -333,36 +333,13 @@ uc_hostapd_iface_start(uc_vm_t *vm, size_t nargs)
                conf->channel = intval;
        if ((intval = ucv_int64_get(ucv_object_get(info, "sec_channel", NULL))) && !errno)
                conf->secondary_channel = intval;
-#ifdef CONFIG_IEEE80211AC
-       if ((intval = ucv_int64_get(ucv_object_get(info, "center_seg0_idx", NULL))) && !errno) {
-               conf->vht_oper_centr_freq_seg0_idx = intval;
-#ifdef CONFIG_IEEE80211AX
-               conf->he_oper_centr_freq_seg0_idx = intval;
-#endif
-#ifdef CONFIG_IEEE80211BE
-               conf->eht_oper_centr_freq_seg0_idx = intval;
-#endif
-       }
-       if ((intval = ucv_int64_get(ucv_object_get(info, "center_seg1_idx", NULL))) && !errno) {
-               conf->vht_oper_centr_freq_seg1_idx = intval;
-#ifdef CONFIG_IEEE80211AX
-               conf->he_oper_centr_freq_seg1_idx = intval;
-#endif
-#ifdef CONFIG_IEEE80211BE
-               conf->eht_oper_centr_freq_seg1_idx = intval;
-#endif
-       }
+       if ((intval = ucv_int64_get(ucv_object_get(info, "center_seg0_idx", NULL))) && !errno)
+               hostapd_set_oper_centr_freq_seg0_idx(conf, intval);
+       if ((intval = ucv_int64_get(ucv_object_get(info, "center_seg1_idx", NULL))) && !errno)
+               hostapd_set_oper_centr_freq_seg1_idx(conf, intval);
        intval = ucv_int64_get(ucv_object_get(info, "oper_chwidth", NULL));
-       if (!errno) {
-               conf->vht_oper_chwidth = intval;
-#ifdef CONFIG_IEEE80211AX
-               conf->he_oper_chwidth = intval;
-#endif
-#ifdef CONFIG_IEEE80211BE
-               conf->eht_oper_chwidth = intval;
-#endif
-       }
-#endif
+       if (!errno)
+               hostapd_set_oper_chwidth(conf, intval);
 
 out:
        if (conf->channel)