017320ead3
Bring back 802.11s mesh features to the level previously available
before the recent hostapd version bump. This is mostly to support use
of 802.11s on DFS channels, but also making mesh forwarding
configurable which is crucial for use of 802.11s MAC with other routing
protocols, such as batman-adv, on top.
While at it, fix new compiler warning by adapting 700-wifi-reload.patch
to upstream changes, now building without any warnings again.
Fixes: 0a3ec87a66 ("hostapd: update to latest Git hostap_2_9-1238-gdd2daf0848ed")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
75 lines
2.5 KiB
Diff
75 lines
2.5 KiB
Diff
--- a/src/ap/hostapd.c
|
|
+++ b/src/ap/hostapd.c
|
|
@@ -114,6 +114,28 @@ 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->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) {
|
|
/*
|
|
@@ -215,6 +237,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 */
|
|
@@ -265,24 +288,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;
|
|
- 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);
|
|
}
|