117 lines
4.0 KiB
Diff
117 lines
4.0 KiB
Diff
From 9279da2d91d4c8c4a33449e0a6fe0f03e91a40e5 Mon Sep 17 00:00:00 2001
|
|
From: OpenEmbedded <oe.patch@oe>
|
|
Date: Thu, 15 Sep 2022 12:35:29 +0000
|
|
|
|
---
|
|
hostapd/config_file.c | 6 +++---
|
|
src/ap/hostapd.c | 2 +-
|
|
src/ap/ieee802_11_shared.c | 2 --
|
|
wpa_supplicant/events.c | 6 ------
|
|
4 files changed, 4 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
|
|
index 7af9f7a72..e57c78b70 100644
|
|
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -1598,6 +1598,8 @@ static int parse_anqp_elem(struct hostapd_bss_config *bss, char *buf, int line)
|
|
return 0;
|
|
}
|
|
|
|
+#endif /* CONFIG_INTERWORKING */
|
|
+
|
|
|
|
static int parse_qos_map_set(struct hostapd_bss_config *bss,
|
|
char *buf, int line)
|
|
@@ -1639,8 +1641,6 @@ static int parse_qos_map_set(struct hostapd_bss_config *bss,
|
|
return 0;
|
|
}
|
|
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
-
|
|
|
|
#ifdef CONFIG_HS20
|
|
static int hs20_parse_conn_capab(struct hostapd_bss_config *bss, char *buf,
|
|
@@ -4042,10 +4042,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
|
|
bss->gas_frag_limit = val;
|
|
} else if (os_strcmp(buf, "gas_comeback_delay") == 0) {
|
|
bss->gas_comeback_delay = atoi(pos);
|
|
+#endif /* CONFIG_INTERWORKING */
|
|
} else if (os_strcmp(buf, "qos_map_set") == 0) {
|
|
if (parse_qos_map_set(bss, pos, line) < 0)
|
|
return 1;
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
#ifdef CONFIG_RADIUS_TEST
|
|
} else if (os_strcmp(buf, "dump_msk_file") == 0) {
|
|
os_free(bss->dump_msk_file);
|
|
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
|
|
index 377436263..e61ac39b8 100644
|
|
--- a/src/ap/hostapd.c
|
|
+++ b/src/ap/hostapd.c
|
|
@@ -1424,6 +1424,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
|
|
wpa_printf(MSG_ERROR, "GAS server initialization failed");
|
|
return -1;
|
|
}
|
|
+#endif /* CONFIG_INTERWORKING */
|
|
|
|
if (conf->qos_map_set_len &&
|
|
hostapd_drv_set_qos_map(hapd, conf->qos_map_set,
|
|
@@ -1431,7 +1432,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
|
|
wpa_printf(MSG_ERROR, "Failed to initialize QoS Map");
|
|
return -1;
|
|
}
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
|
|
if (conf->bss_load_update_period && bss_load_update_init(hapd)) {
|
|
wpa_printf(MSG_ERROR, "BSS Load initialization failed");
|
|
diff --git a/src/ap/ieee802_11_shared.c b/src/ap/ieee802_11_shared.c
|
|
index 615489511..691b1394a 100644
|
|
--- a/src/ap/ieee802_11_shared.c
|
|
+++ b/src/ap/ieee802_11_shared.c
|
|
@@ -1098,13 +1098,11 @@ u8 * hostapd_eid_rsnxe(struct hostapd_data *hapd, u8 *eid, size_t len)
|
|
u16 check_ext_capab(struct hostapd_data *hapd, struct sta_info *sta,
|
|
const u8 *ext_capab_ie, size_t ext_capab_ie_len)
|
|
{
|
|
-#ifdef CONFIG_INTERWORKING
|
|
/* check for QoS Map support */
|
|
if (ext_capab_ie_len >= 5) {
|
|
if (ext_capab_ie[4] & 0x01)
|
|
sta->qos_map_enabled = 1;
|
|
}
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
|
|
if (ext_capab_ie_len > 0) {
|
|
sta->ecsa_supported = !!(ext_capab_ie[0] & BIT(2));
|
|
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
|
|
index 86a0dc7fa..0bac5f2c2 100644
|
|
--- a/wpa_supplicant/events.c
|
|
+++ b/wpa_supplicant/events.c
|
|
@@ -2586,8 +2586,6 @@ void wnm_bss_keep_alive_deinit(struct wpa_supplicant *wpa_s)
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_INTERWORKING
|
|
-
|
|
static int wpas_qos_map_set(struct wpa_supplicant *wpa_s, const u8 *qos_map,
|
|
size_t len)
|
|
{
|
|
@@ -2620,8 +2618,6 @@ static void interworking_process_assoc_resp(struct wpa_supplicant *wpa_s,
|
|
}
|
|
}
|
|
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
-
|
|
|
|
static void multi_ap_process_assoc_resp(struct wpa_supplicant *wpa_s,
|
|
const u8 *ies, size_t ies_len)
|
|
@@ -2954,10 +2950,8 @@ static int wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
|
|
wnm_process_assoc_resp(wpa_s, data->assoc_info.resp_ies,
|
|
data->assoc_info.resp_ies_len);
|
|
#endif /* CONFIG_WNM */
|
|
-#ifdef CONFIG_INTERWORKING
|
|
interworking_process_assoc_resp(wpa_s, data->assoc_info.resp_ies,
|
|
data->assoc_info.resp_ies_len);
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
if (wpa_s->hw_capab == CAPAB_VHT &&
|
|
get_ie(data->assoc_info.resp_ies,
|
|
data->assoc_info.resp_ies_len, WLAN_EID_VHT_CAP))
|