98 lines
3.0 KiB
Diff
98 lines
3.0 KiB
Diff
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -1604,6 +1604,8 @@ static int parse_anqp_elem(struct hostap
|
|
return 0;
|
|
}
|
|
|
|
+#endif /* CONFIG_INTERWORKING */
|
|
+
|
|
|
|
static int parse_qos_map_set(struct hostapd_bss_config *bss,
|
|
char *buf, int line)
|
|
@@ -1645,8 +1647,6 @@ static int parse_qos_map_set(struct host
|
|
return 0;
|
|
}
|
|
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
-
|
|
|
|
#ifdef CONFIG_HS20
|
|
static int hs20_parse_conn_capab(struct hostapd_bss_config *bss, char *buf,
|
|
@@ -4066,10 +4066,10 @@ static int hostapd_config_fill(struct ho
|
|
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);
|
|
--- a/src/ap/hostapd.c
|
|
+++ b/src/ap/hostapd.c
|
|
@@ -1538,6 +1538,7 @@ int hostapd_setup_bss(struct hostapd_dat
|
|
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,
|
|
@@ -1545,7 +1546,6 @@ int hostapd_setup_bss(struct hostapd_dat
|
|
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");
|
|
--- a/wpa_supplicant/events.c
|
|
+++ b/wpa_supplicant/events.c
|
|
@@ -2683,8 +2683,6 @@ void wnm_bss_keep_alive_deinit(struct wp
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_INTERWORKING
|
|
-
|
|
static int wpas_qos_map_set(struct wpa_supplicant *wpa_s, const u8 *qos_map,
|
|
size_t len)
|
|
{
|
|
@@ -2717,8 +2715,6 @@ static void interworking_process_assoc_r
|
|
}
|
|
}
|
|
|
|
-#endif /* CONFIG_INTERWORKING */
|
|
-
|
|
|
|
static void wpa_supplicant_set_4addr_mode(struct wpa_supplicant *wpa_s)
|
|
{
|
|
@@ -3098,10 +3094,8 @@ static int wpa_supplicant_event_associnf
|
|
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))
|
|
--- a/src/ap/ieee802_11_shared.c
|
|
+++ b/src/ap/ieee802_11_shared.c
|
|
@@ -1116,13 +1116,11 @@ u8 * hostapd_eid_rsnxe(struct hostapd_da
|
|
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));
|