hostapd: 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>
(cherry-picked from commit efff3520f4d8fe131c4bd54bb2e098139a7efa4d)

diff --git a/package/network/services/hostapd/patches/750-qos_map_set_without_interworking.patch b/package/network/services/hostapd/patches/750-qos_map_set_without_interworking.patch
new file mode 100644 (file)
index 0000000..8fe8893
--- /dev/null
+++ b/package/network/services/hostapd/patches/750-qos_map_set_without_interworking.patch
@@ -0,0 +1,112 @@
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -1711,6 +1711,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)
+@@ -1752,8 +1754,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,
+@@ -4050,10 +4050,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
+@@ -1386,6 +1386,7 @@ static int hostapd_setup_bss(struct host
+               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,
+@@ -1393,7 +1394,6 @@ static int hostapd_setup_bss(struct host
+               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/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -245,12 +245,10 @@ int hostapd_notif_assoc(struct hostapd_d
+       }
+ #endif /* NEED_AP_MLME */
+ 
+-#ifdef CONFIG_INTERWORKING
+       if (elems.ext_capab && elems.ext_capab_len > 4) {
+               if (elems.ext_capab[4] & 0x01)
+                       sta->qos_map_enabled = 1;
+       }
+-#endif /* CONFIG_INTERWORKING */
+ 
+ #ifdef CONFIG_HS20
+       wpabuf_free(sta->hs20_ie);
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -2884,13 +2884,11 @@ static u16 copy_supp_rates(struct hostap
+ static 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));
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -2500,8 +2500,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)
+ {
+@@ -2534,8 +2532,6 @@ static void interworking_process_assoc_r
+       }
+ }
+ 
+-#endif /* CONFIG_INTERWORKING */
+-
+ 
+ static void multi_ap_process_assoc_resp(struct wpa_supplicant *wpa_s,
+                                       const u8 *ies, size_t ies_len)
+@@ -2669,10 +2665,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))