1 --- a/hostapd/config_file.c
2 +++ b/hostapd/config_file.c
3 @@ -1602,6 +1602,8 @@ static int parse_anqp_elem(struct hostap
7 +#endif /* CONFIG_INTERWORKING */
10 static int parse_qos_map_set(struct hostapd_bss_config *bss,
12 @@ -1643,8 +1645,6 @@ static int parse_qos_map_set(struct host
16 -#endif /* CONFIG_INTERWORKING */
20 static int hs20_parse_conn_capab(struct hostapd_bss_config *bss, char *buf,
21 @@ -4064,10 +4064,10 @@ static int hostapd_config_fill(struct ho
22 bss->gas_frag_limit = val;
23 } else if (os_strcmp(buf, "gas_comeback_delay") == 0) {
24 bss->gas_comeback_delay = atoi(pos);
25 +#endif /* CONFIG_INTERWORKING */
26 } else if (os_strcmp(buf, "qos_map_set") == 0) {
27 if (parse_qos_map_set(bss, pos, line) < 0)
29 -#endif /* CONFIG_INTERWORKING */
30 #ifdef CONFIG_RADIUS_TEST
31 } else if (os_strcmp(buf, "dump_msk_file") == 0) {
32 os_free(bss->dump_msk_file);
33 --- a/src/ap/hostapd.c
34 +++ b/src/ap/hostapd.c
35 @@ -1499,6 +1499,7 @@ static int hostapd_setup_bss(struct host
36 wpa_printf(MSG_ERROR, "GAS server initialization failed");
39 +#endif /* CONFIG_INTERWORKING */
41 if (conf->qos_map_set_len &&
42 hostapd_drv_set_qos_map(hapd, conf->qos_map_set,
43 @@ -1506,7 +1507,6 @@ static int hostapd_setup_bss(struct host
44 wpa_printf(MSG_ERROR, "Failed to initialize QoS Map");
47 -#endif /* CONFIG_INTERWORKING */
49 if (conf->bss_load_update_period && bss_load_update_init(hapd)) {
50 wpa_printf(MSG_ERROR, "BSS Load initialization failed");
51 --- a/wpa_supplicant/events.c
52 +++ b/wpa_supplicant/events.c
53 @@ -2672,8 +2672,6 @@ void wnm_bss_keep_alive_deinit(struct wp
57 -#ifdef CONFIG_INTERWORKING
59 static int wpas_qos_map_set(struct wpa_supplicant *wpa_s, const u8 *qos_map,
62 @@ -2706,8 +2704,6 @@ static void interworking_process_assoc_r
66 -#endif /* CONFIG_INTERWORKING */
69 static void wpa_supplicant_set_4addr_mode(struct wpa_supplicant *wpa_s)
71 @@ -3087,10 +3083,8 @@ static int wpa_supplicant_event_associnf
72 wnm_process_assoc_resp(wpa_s, data->assoc_info.resp_ies,
73 data->assoc_info.resp_ies_len);
74 #endif /* CONFIG_WNM */
75 -#ifdef CONFIG_INTERWORKING
76 interworking_process_assoc_resp(wpa_s, data->assoc_info.resp_ies,
77 data->assoc_info.resp_ies_len);
78 -#endif /* CONFIG_INTERWORKING */
79 if (wpa_s->hw_capab == CAPAB_VHT &&
80 get_ie(data->assoc_info.resp_ies,
81 data->assoc_info.resp_ies_len, WLAN_EID_VHT_CAP))
82 --- a/src/ap/ieee802_11_shared.c
83 +++ b/src/ap/ieee802_11_shared.c
84 @@ -1116,13 +1116,11 @@ u8 * hostapd_eid_rsnxe(struct hostapd_da
85 u16 check_ext_capab(struct hostapd_data *hapd, struct sta_info *sta,
86 const u8 *ext_capab_ie, size_t ext_capab_ie_len)
88 -#ifdef CONFIG_INTERWORKING
89 /* check for QoS Map support */
90 if (ext_capab_ie_len >= 5) {
91 if (ext_capab_ie[4] & 0x01)
92 sta->qos_map_enabled = 1;
94 -#endif /* CONFIG_INTERWORKING */
96 if (ext_capab_ie_len > 0) {
97 sta->ecsa_supported = !!(ext_capab_ie[0] & BIT(2));