hostapd: Update to version 2.9 (2019-08-08)

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 340-reload_freq_change.patch

diff --git a/package/network/services/hostapd/patches/340-reload_freq_change.patch b/package/network/services/hostapd/patches/340-reload_freq_change.patch
index 81c20970e7466c29d20d83dd354aa81d081dc1d7..369586769c5c58be5b5a14758ddb3abb8351a97f 100644 (file)
--- a/package/network/services/hostapd/patches/340-reload_freq_change.patch
+++ b/package/network/services/hostapd/patches/340-reload_freq_change.patch
@@ -1,6 +1,6 @@
 --- a/src/ap/hostapd.c
 +++ b/src/ap/hostapd.c
-@@ -103,6 +103,25 @@ static void hostapd_reload_bss(struct ho
+@@ -108,6 +108,26 @@ static void hostapd_reload_bss(struct ho
  #endif /* CONFIG_NO_RADIUS */
  
        ssid = &hapd->conf->ssid;
@@ -9,10 +9,11 @@
 +                       hapd->iconf->channel,
 +                       hapd->iconf->ieee80211n,
 +                       hapd->iconf->ieee80211ac,
++                       hapd->iconf->ieee80211ax,
 +                       hapd->iconf->secondary_channel,
-+                       hapd->iconf->vht_oper_chwidth,
-+                       hapd->iconf->vht_oper_centr_freq_seg0_idx,
-+                       hapd->iconf->vht_oper_centr_freq_seg1_idx);
++                       hostapd_get_oper_chwidth(hapd->iconf),
++                       hostapd_get_oper_centr_freq_seg0_idx(hapd->iconf),
++                       hostapd_get_oper_centr_freq_seg1_idx(hapd->iconf));
 +
 +      if (hapd->iface->current_mode) {
 +              if (hostapd_prepare_rates(hapd->iface, hapd->iface->current_mode)) {
@@ -26,7 +27,7 @@
        if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
            ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
                /*
-@@ -200,6 +219,7 @@ int hostapd_reload_config(struct hostapd
+@@ -205,6 +225,7 @@ int hostapd_reload_config(struct hostapd
        struct hostapd_data *hapd = iface->bss[0];
        struct hostapd_config *newconf, *oldconf;
        size_t j;
@@ -34,7 +35,7 @@
  
        if (iface->config_fname == NULL) {
                /* Only in-memory config in use - assume it has been updated */
-@@ -250,21 +270,20 @@ int hostapd_reload_config(struct hostapd
+@@ -255,24 +276,20 @@ int hostapd_reload_config(struct hostapd
        }
        iface->conf = newconf;
  
@@ -59,11 +60,14 @@
 -              hapd->iconf->ieee80211ac = oldconf->ieee80211ac;
 -              hapd->iconf->ht_capab = oldconf->ht_capab;
 -              hapd->iconf->vht_capab = oldconf->vht_capab;
--              hapd->iconf->vht_oper_chwidth = oldconf->vht_oper_chwidth;
--              hapd->iconf->vht_oper_centr_freq_seg0_idx =
--                      oldconf->vht_oper_centr_freq_seg0_idx;
--              hapd->iconf->vht_oper_centr_freq_seg1_idx =
--                      oldconf->vht_oper_centr_freq_seg1_idx;
+-              hostapd_set_oper_chwidth(hapd->iconf,
+-                                       hostapd_get_oper_chwidth(oldconf));
+-              hostapd_set_oper_centr_freq_seg0_idx(
+-                      hapd->iconf,
+-                      hostapd_get_oper_centr_freq_seg0_idx(oldconf));
+-              hostapd_set_oper_centr_freq_seg1_idx(
+-                      hapd->iconf,
+-                      hostapd_get_oper_centr_freq_seg1_idx(oldconf));
                hapd->conf = newconf->bss[j];
                hostapd_reload_bss(hapd);
        }