| --- a/src/ap/hostapd.c |
| +++ b/src/ap/hostapd.c |
| @@ -143,6 +143,29 @@ static void hostapd_reload_bss(struct ho |
| #endif /* CONFIG_NO_RADIUS */ |
| |
| ssid = &hapd->conf->ssid; |
| + |
| + hostapd_set_freq(hapd, hapd->iconf->hw_mode, hapd->iface->freq, |
| + hapd->iconf->channel, |
| + hapd->iconf->enable_edmg, |
| + hapd->iconf->edmg_channel, |
| + hapd->iconf->ieee80211n, |
| + hapd->iconf->ieee80211ac, |
| + hapd->iconf->ieee80211ax, |
| + hapd->iconf->ieee80211be, |
| + hapd->iconf->secondary_channel, |
| + 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)) { |
| + 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) { |
| /* |
| @@ -251,6 +274,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 */ |
| @@ -301,6 +325,17 @@ 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]; |
| if (!hapd->conf->config_id || !newconf->bss[j]->config_id || |
| @@ -308,21 +343,6 @@ int hostapd_reload_config(struct hostapd |
| newconf->bss[j]->config_id) != 0) |
| hostapd_clear_old_bss(hapd); |
| 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; |
| - 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); |
| } |