diff options
author | David Bauer <mail@david-bauer.net> | 2022-05-12 22:18:49 +0200 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2022-06-08 23:16:06 +0200 |
commit | c35ff1affe8f347b60a7539648a90b45ad43ffef (patch) | |
tree | 962b8519af922f062c4ad8ef2d50237a738c1709 /package/network/services/hostapd/patches/750-qos_map_set_without_interworking.patch | |
parent | 98d91e4d5ee1bdc13764b14eb6d2784dfb2cac3c (diff) | |
download | upstream-c35ff1affe8f347b60a7539648a90b45ad43ffef.tar.gz upstream-c35ff1affe8f347b60a7539648a90b45ad43ffef.tar.bz2 upstream-c35ff1affe8f347b60a7539648a90b45ad43ffef.zip |
hostapd: update to 2022-05-08
Update hostapd to Git HEAD from 2022-05-08. This allows us to take
advantage of background radar-detection as well as BSS color collision
detection.
Suggested-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: David Bauer <mail@david-bauer.net>
Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'package/network/services/hostapd/patches/750-qos_map_set_without_interworking.patch')
-rw-r--r-- | package/network/services/hostapd/patches/750-qos_map_set_without_interworking.patch | 63 |
1 files changed, 24 insertions, 39 deletions
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 index 43a4ea73b3..43360fb2e7 100644 --- 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 @@ -1,6 +1,6 @@ --- a/hostapd/config_file.c +++ b/hostapd/config_file.c -@@ -1644,6 +1644,8 @@ static int parse_anqp_elem(struct hostap +@@ -1598,6 +1598,8 @@ static int parse_anqp_elem(struct hostap return 0; } @@ -9,7 +9,7 @@ static int parse_qos_map_set(struct hostapd_bss_config *bss, char *buf, int line) -@@ -1685,8 +1687,6 @@ static int parse_qos_map_set(struct host +@@ -1639,8 +1641,6 @@ static int parse_qos_map_set(struct host return 0; } @@ -18,7 +18,7 @@ #ifdef CONFIG_HS20 static int hs20_parse_conn_capab(struct hostapd_bss_config *bss, char *buf, -@@ -4077,10 +4077,10 @@ static int hostapd_config_fill(struct ho +@@ -4040,10 +4040,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); @@ -32,7 +32,7 @@ os_free(bss->dump_msk_file); --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c -@@ -1415,6 +1415,7 @@ static int hostapd_setup_bss(struct host +@@ -1423,6 +1423,7 @@ static int hostapd_setup_bss(struct host wpa_printf(MSG_ERROR, "GAS server initialization failed"); return -1; } @@ -40,7 +40,7 @@ if (conf->qos_map_set_len && hostapd_drv_set_qos_map(hapd, conf->qos_map_set, -@@ -1422,7 +1423,6 @@ static int hostapd_setup_bss(struct host +@@ -1430,7 +1431,6 @@ static int hostapd_setup_bss(struct host wpa_printf(MSG_ERROR, "Failed to initialize QoS Map"); return -1; } @@ -48,40 +48,9 @@ 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 -@@ -271,12 +271,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 -@@ -4129,13 +4129,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 -@@ -2540,8 +2540,6 @@ void wnm_bss_keep_alive_deinit(struct wp +@@ -2586,8 +2586,6 @@ void wnm_bss_keep_alive_deinit(struct wp } @@ -90,7 +59,7 @@ static int wpas_qos_map_set(struct wpa_supplicant *wpa_s, const u8 *qos_map, size_t len) { -@@ -2574,8 +2572,6 @@ static void interworking_process_assoc_r +@@ -2620,8 +2618,6 @@ static void interworking_process_assoc_r } } @@ -99,7 +68,7 @@ static void multi_ap_process_assoc_resp(struct wpa_supplicant *wpa_s, const u8 *ies, size_t ies_len) -@@ -2908,10 +2904,8 @@ static int wpa_supplicant_event_associnf +@@ -2954,10 +2950,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 */ @@ -110,3 +79,19 @@ 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 +@@ -1098,13 +1098,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)); |