| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869 |
- --- a/src/ap/hostapd.c
- +++ b/src/ap/hostapd.c
- @@ -80,6 +80,25 @@ 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->ieee80211n,
- + hapd->iconf->ieee80211ac,
- + 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);
- +
- + 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) {
- /*
- @@ -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);
- +
- 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);
- }
|
