To be consistent with the other uses of multi_ap in the code.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@xxxxxxx>
Cc: Venkateswara Naralasetty <vnaralas@xxxxxxxxxxxxxx>
---
wpa_supplicant/config.c | 2 +-
wpa_supplicant/config_ssid.h | 2 +-
wpa_supplicant/events.c | 2 +-
wpa_supplicant/sme.c | 2 +-
wpa_supplicant/wpa_supplicant.c | 2 +-
wpa_supplicant/wpa_supplicant.conf | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index d536f8a2e..4ff93f62f 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2320,7 +2320,7 @@ static const struct parse_data ssid_fields[] = {
#endif /* CONFIG_DPP */
{ INT_RANGE(owe_group, 0, 65535) },
{ INT_RANGE(owe_only, 0, 1) },
- { INT_RANGE(multiap_backhaul_sta, 0, 1) },
+ { INT_RANGE(multi_ap_backhaul_sta, 0, 1) },
};
#undef OFFSET
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index f5d01328e..8d56a1ff1 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -942,7 +942,7 @@ struct wpa_ssid {
* 0 = normal station
* 1 = backhaul station
*/
- int multiap_backhaul_sta;
+ int multi_ap_backhaul_sta;
};
#endif /* CONFIG_SSID_H */
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 9c1a50b34..b999e2c06 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2273,7 +2273,7 @@ static void multi_ap_process_assoc_resp(struct wpa_supplicant *wpa_s,
const u8 *map_sub_elem, *pos;
size_t len;
- if (!wpa_s->current_ssid->multiap_backhaul_sta)
+ if (!wpa_s->current_ssid->multi_ap_backhaul_sta)
return;
if (ies == NULL)
diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index 650b93559..55df63f8b 100644
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -1547,7 +1547,7 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
}
#endif /* CONFIG_OWE */
- if (wpa_s->conf->ssid->multiap_backhaul_sta) {
+ if (wpa_s->conf->ssid->multi_ap_backhaul_sta) {
if (wpa_s->sme.assoc_req_ie_len + 9 >
sizeof(wpa_s->sme.assoc_req_ie)) {
wpa_printf(MSG_ERROR,
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index d54638d49..e63fbe5a6 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2823,7 +2823,7 @@ static u8 * wpas_populate_assoc_ies(
}
#endif /* CONFIG_IEEE80211R */
- if (ssid->multiap_backhaul_sta && ((max_wpa_ie_len - wpa_ie_len) > 9))
+ if (ssid->multi_ap_backhaul_sta && ((max_wpa_ie_len - wpa_ie_len) > 9))
wpa_add_multi_ap_info_ie(wpa_ie, &wpa_ie_len);
params->wpa_ie = wpa_ie;
diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
index 1d5c6a175..1cd09216d 100644
--- a/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant/wpa_supplicant.conf
@@ -1424,7 +1424,7 @@ fast_reauth=1
# Set satation to use as BACKHAUL STA.
# default = 0
-# multiap_backhaul_sta = 1 (configure as backhaul STA).
+# multi_ap_backhaul_sta = 1 (configure as backhaul STA).
# Example blocks:
--
2.19.2
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
