hostapd: fix reload frequency change patch

[openwrt/staging/florian.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 086ade9cedec664ee566764f8f09bd2fd730ba53..0dcd7c913e829738648b2513fc027ffd60a494cd 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
-@@ -80,6 +80,16 @@ static void hostapd_reload_bss(struct ho
+@@ -80,6 +80,25 @@ static void hostapd_reload_bss(struct ho
  #endif /* CONFIG_NO_RADIUS */
  
        ssid = &hapd->conf->ssid;
@@ -13,14 +13,39 @@
 +                       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) {
                /*
-@@ -179,21 +189,12 @@ int hostapd_reload_config(struct hostapd
+@@ -158,6 +177,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 */
+@@ -179,21 +199,20 @@ int hostapd_reload_config(struct hostapd
        oldconf = hapd->iconf;
        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);
 +