hostapd: update to version 2018-12-02 (2.7)

[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 9316794817469feff49873cd8dd8713fd505c71c..81c20970e7466c29d20d83dd354aa81d081dc1d7 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
-@@ -72,6 +72,16 @@ static void hostapd_reload_bss(struct ho
+@@ -103,6 +103,25 @@ static void hostapd_reload_bss(struct ho
  #endif /* CONFIG_NO_RADIUS */
  
        ssid = &hapd->conf->ssid;
@@ -13,17 +13,57 @@
 +                       hapd->iconf->vht_oper_chwidth,
 +                       hapd->iconf->vht_oper_centr_freq_seg0_idx,
 +                       hapd->iconf->vht_oper_centr_freq_seg1_idx);
++
++      if (hapd->iface->current_mode) {
++              if (hostapd_prepare_rates(hapd->iface, hapd->iface->current_mode)) {
++                      wpa_printf(MSG_ERROR, "Failed to prepare rates table.");
++                      hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
++                                     HOSTAPD_LEVEL_WARNING,
++                                     "Failed to prepare rates table.");
++              }
++      }
 +
        if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
            ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
                /*
-@@ -172,6 +182,9 @@ int hostapd_reload_config(struct hostapd
-       oldconf = hapd->iconf;
+@@ -200,6 +219,7 @@ int hostapd_reload_config(struct hostapd
+       struct hostapd_data *hapd = iface->bss[0];
+       struct hostapd_config *newconf, *oldconf;
+       size_t j;
++      int i;
+ 
+       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
+       }
        iface->conf = newconf;
  
++      for (i = 0; i < iface->num_hw_features; i++) {
++              struct hostapd_hw_modes *mode = &iface->hw_features[i];
++              if (mode->mode == iface->conf->hw_mode) {
++                      iface->current_mode = mode;
++                      break;
++              }
++      }
++
 +      if (iface->conf->channel)
 +              iface->freq = hostapd_hw_get_freq(hapd, iface->conf->channel);
 +
        for (j = 0; j < iface->num_bss; j++) {
                hapd = iface->bss[j];
                hapd->iconf = newconf;
+-              hapd->iconf->channel = oldconf->channel;
+-              hapd->iconf->acs = oldconf->acs;
+-              hapd->iconf->secondary_channel = oldconf->secondary_channel;
+-              hapd->iconf->ieee80211n = oldconf->ieee80211n;
+-              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;
+               hapd->conf = newconf->bss[j];
+               hostapd_reload_bss(hapd);
+       }