From e18e7fc8f690a67247e0fcf48ea9ce92ef4193a9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 4 Nov 2021 11:29:00 +0100 Subject: [PATCH] hostapd: update qos_map_set code inside the script-foo Signed-off-by: John Crispin --- .../0019-hostapd-update-to-latest-HEAD.patch | 32 +++++++++++-------- feeds/wifi-ax/hostapd/files/hostapd.sh | 7 +++- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/backports/0019-hostapd-update-to-latest-HEAD.patch b/backports/0019-hostapd-update-to-latest-HEAD.patch index 4bb95b893..c099a26f9 100644 --- a/backports/0019-hostapd-update-to-latest-HEAD.patch +++ b/backports/0019-hostapd-update-to-latest-HEAD.patch @@ -1,14 +1,14 @@ -From beaf8ac8acf93bc617d3ed141c750fe1d4f2b047 Mon Sep 17 00:00:00 2001 +From 3ad2d6c00e559d5a55bf607f774229f59d3e738a Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 4 Sep 2021 05:48:27 +0200 -Subject: [PATCH 01/56] hostapd: update to latest HEAD +Subject: [PATCH 01/59] hostapd: update to latest HEAD Signed-off-by: John Crispin --- package/network/services/hostapd/Makefile | 15 +- .../hostapd/files/hostapd-basic.config | 2 +- .../hostapd/files/hostapd-full.config | 4 +- - .../network/services/hostapd/files/hostapd.sh | 181 +++++++++--- + .../network/services/hostapd/files/hostapd.sh | 186 +++++++++--- ...-fix-frequency-setup-with-HE-enabled.patch | 196 ------------- ...> 001-wolfssl-init-RNG-with-ECC-key.patch} | 11 +- ...-init-order-disable-pri-sec-channel-.patch | 126 -------- @@ -73,7 +73,7 @@ Signed-off-by: John Crispin .../services/hostapd/src/src/ap/ubus.c | 214 +++++++++++++- .../services/hostapd/src/src/ap/ubus.h | 16 + .../hostapd/src/src/utils/build_features.h | 2 - - 68 files changed, 1336 insertions(+), 2347 deletions(-) + 68 files changed, 1341 insertions(+), 2347 deletions(-) delete mode 100644 package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch rename package/network/services/hostapd/patches/{802-wolfssl-init-RNG-with-ECC-key.patch => 001-wolfssl-init-RNG-with-ECC-key.patch} (76%) delete mode 100644 package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch @@ -181,7 +181,7 @@ index df272e443a..61b6daf861 100644 # EAP-SAKE for the integrated EAP server #CONFIG_EAP_SAKE=y diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh -index aa72e09eba..0265c0518a 100644 +index aa72e09eba..ba277fb079 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -48,13 +48,17 @@ hostapd_append_wpa_key_mgmt() { @@ -566,12 +566,16 @@ index aa72e09eba..0265c0518a 100644 iw_domain_name_conf= json_for_each_item append_iw_domain_name iw_domain_name -@@ -921,14 +1003,18 @@ hostapd_set_bss_options() { - [ -n "$iw_anqp_3gpp_cell_net_conf" ] && \ +@@ -922,13 +1004,22 @@ hostapd_set_bss_options() { append bss_conf "anqp_3gpp_cell_net=$iw_anqp_3gpp_cell_net_conf" "$N" fi -+ [ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N" ++ set_default iw_qos_map_set 0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56 ++ case "$iw_qos_map_set" in ++ *,*);; ++ *) iw_qos_map_set="";; ++ esac ++ [ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N" local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \ - osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp @@ -587,7 +591,7 @@ index aa72e09eba..0265c0518a 100644 set_default disable_dgaf $hs20 set_default osen 0 set_default anqp_domain_id 0 -@@ -936,6 +1022,7 @@ hostapd_set_bss_options() { +@@ -936,6 +1027,7 @@ hostapd_set_bss_options() { if [ "$hs20" = "1" ]; then append bss_conf "hs20=1" "$N" append_hs20_icons @@ -595,7 +599,7 @@ index aa72e09eba..0265c0518a 100644 append bss_conf "disable_dgaf=$disable_dgaf" "$N" append bss_conf "osen=$osen" "$N" append bss_conf "anqp_domain_id=$anqp_domain_id" "$N" -@@ -945,16 +1032,31 @@ hostapd_set_bss_options() { +@@ -945,16 +1037,31 @@ hostapd_set_bss_options() { [ -n "$hs20_operating_class" ] && append bss_conf "hs20_operating_class=$hs20_operating_class" "$N" [ -n "$hs20_t_c_filename" ] && append bss_conf "hs20_t_c_filename=$hs20_t_c_filename" "$N" [ -n "$hs20_t_c_timestamp" ] && append bss_conf "hs20_t_c_timestamp=$hs20_t_c_timestamp" "$N" @@ -628,7 +632,7 @@ index aa72e09eba..0265c0518a 100644 set_default per_sta_vif 0 if [ "$per_sta_vif" -gt 0 ]; then -@@ -1079,16 +1181,16 @@ wpa_supplicant_set_fixed_freq() { +@@ -1079,16 +1186,16 @@ wpa_supplicant_set_fixed_freq() { append network_data "frequency=$freq" "$N$T" case "$htmode" in NOHT) append network_data "disable_ht=1" "$N$T";; @@ -649,7 +653,7 @@ index aa72e09eba..0265c0518a 100644 *) append network_data "disable_vht=1" "$N$T";; esac } -@@ -1106,19 +1208,21 @@ wpa_supplicant_add_network() { +@@ -1106,19 +1213,21 @@ wpa_supplicant_add_network() { ssid bssid key \ basic_rate mcast_rate \ ieee80211w ieee80211r \ @@ -674,7 +678,7 @@ index aa72e09eba..0265c0518a 100644 local key_mgmt='NONE' local network_data= -@@ -1150,7 +1254,10 @@ wpa_supplicant_add_network() { +@@ -1150,7 +1259,10 @@ wpa_supplicant_add_network() { scan_ssid="" } @@ -686,7 +690,7 @@ index aa72e09eba..0265c0518a 100644 case "$auth_type" in none) ;; -@@ -1186,7 +1293,7 @@ wpa_supplicant_add_network() { +@@ -1186,7 +1298,7 @@ wpa_supplicant_add_network() { fi append network_data "$passphrase" "$N$T" ;; diff --git a/feeds/wifi-ax/hostapd/files/hostapd.sh b/feeds/wifi-ax/hostapd/files/hostapd.sh index 0265c0518..ba277fb07 100644 --- a/feeds/wifi-ax/hostapd/files/hostapd.sh +++ b/feeds/wifi-ax/hostapd/files/hostapd.sh @@ -1003,8 +1003,13 @@ hostapd_set_bss_options() { [ -n "$iw_anqp_3gpp_cell_net_conf" ] && \ append bss_conf "anqp_3gpp_cell_net=$iw_anqp_3gpp_cell_net_conf" "$N" fi - [ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N" + set_default iw_qos_map_set 0,0,2,16,1,1,255,255,18,22,24,38,40,40,44,46,48,56 + case "$iw_qos_map_set" in + *,*);; + *) iw_qos_map_set="";; + esac + [ -n "$iw_qos_map_set" ] && append bss_conf "qos_map_set=$iw_qos_map_set" "$N" local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \ osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \