Support qos_map_set without CONFIG_INTERWORKING

This feature is useful on its own even without full interworking
support.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 7a32c22f32d9f9091112b99e77e262ee3e8becba..20ee59081dad6197d825ca53eef437da99490390 100644 (file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1678,6 +1678,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)
@@ -1719,8 +1721,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,
@@ -4258,10 +4258,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 c08be0a0dc0653cac3be732f7dcf61572ba6b09d..56bac4526cc0cdd90238a038ea8947d7e04d9343 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -1584,6 +1584,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,
@@ -1591,7 +1592,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 a5716f0379b522f7d32f0427713e82da9e6aa97c..85790c7ed600931b909f14ec69872e0d2061b4ba 100644 (file)
--- a/src/ap/ieee802_11_shared.c
+++ b/src/ap/ieee802_11_shared.c
@@ -1138,13 +1138,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 ca27946384b695528377df618e84742b51e7882a..e58fc12e9ef5b0fa0ba575c823cd2888eeb38f9c 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2935,8 +2935,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)
 {
@@ -2969,8 +2967,6 @@ static void interworking_process_assoc_resp(struct wpa_supplicant *wpa_s,
        }
 }
 
-#endif /* CONFIG_INTERWORKING */
-
 
 static void wpa_supplicant_set_4addr_mode(struct wpa_supplicant *wpa_s)
 {
@@ -3349,10 +3345,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))