9c7784e5f3
madwifi was dropped upstream, can't find it anywhere in OpenWrt either, thus finally burrying madwifi. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45045
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
--- a/src/ap/hostapd.c
|
|
+++ b/src/ap/hostapd.c
|
|
@@ -76,6 +76,16 @@ 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 (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
|
|
ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
|
|
/*
|
|
@@ -175,21 +185,12 @@ int hostapd_reload_config(struct hostapd
|
|
oldconf = hapd->iconf;
|
|
iface->conf = newconf;
|
|
|
|
+ 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);
|
|
}
|