diff --git a/backports/0019-hostapd-update-to-latest-HEAD.patch b/backports/0019-hostapd-update-to-latest-HEAD.patch index 5c9a23e3a..7203adf68 100644 --- a/backports/0019-hostapd-update-to-latest-HEAD.patch +++ b/backports/0019-hostapd-update-to-latest-HEAD.patch @@ -1,14 +1,14 @@ -From 3b094ed6b1602969f0dd71b48ed220d0caace7ab Mon Sep 17 00:00:00 2001 +From c51842eff4bcbc1def57e54d5eab0e5df2046d7e Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 4 Sep 2021 05:48:27 +0200 -Subject: [PATCH 19/27] hostapd: update to latest HEAD +Subject: [PATCH 01/56] 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 | 141 +++++++-- + .../network/services/hostapd/files/hostapd.sh | 145 +++++++-- ...-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 -------- @@ -72,7 +72,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 - - 67 files changed, 1277 insertions(+), 2334 deletions(-) + 67 files changed, 1280 insertions(+), 2335 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 @@ -179,7 +179,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..e941fa4f77 100644 +index aa72e09eba..c1f48326fa 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -49,6 +49,7 @@ hostapd_append_wpa_key_mgmt() { @@ -261,7 +261,7 @@ index aa72e09eba..e941fa4f77 100644 config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string' -@@ -319,7 +333,7 @@ hostapd_common_add_bss_config() { +@@ -319,23 +333,33 @@ hostapd_common_add_bss_config() { config_add_int iw_ipaddr_type_availability iw_gas_address3 config_add_string iw_hessid iw_network_auth_type iw_qos_map_set config_add_array iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm @@ -270,7 +270,11 @@ index aa72e09eba..e941fa4f77 100644 config_add_boolean hs20 disable_dgaf osen config_add_int anqp_domain_id -@@ -330,12 +344,22 @@ hostapd_common_add_bss_config() { +- config_add_int hs20_deauth_req_timeout ++ config_add_int hs20_deauth_req_timeout hs20_release + config_add_array hs20_oper_friendly_name + config_add_array osu_provider + config_add_array operator_icon config_add_array hs20_conn_capab config_add_string osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp @@ -508,21 +512,32 @@ index aa72e09eba..e941fa4f77 100644 iw_domain_name_conf= json_for_each_item append_iw_domain_name iw_domain_name -@@ -924,9 +995,11 @@ hostapd_set_bss_options() { +@@ -924,11 +995,14 @@ hostapd_set_bss_options() { 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 + osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \ -+ hs20_t_c_server_url ++ hs20_t_c_server_url hs20_release json_get_vars 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 + osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \ -+ hs20_t_c_server_url ++ hs20_t_c_server_url hs20_release set_default hs20 0 ++ set_default hs20_release 1 set_default disable_dgaf $hs20 -@@ -945,16 +1018,31 @@ hostapd_set_bss_options() { + set_default osen 0 + set_default anqp_domain_id 0 +@@ -936,6 +1010,7 @@ hostapd_set_bss_options() { + if [ "$hs20" = "1" ]; then + append bss_conf "hs20=1" "$N" + append_hs20_icons ++ append bss_conf "hs20_release=$hs20_release" "$N" + 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 +1020,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" @@ -555,7 +570,7 @@ index aa72e09eba..e941fa4f77 100644 set_default per_sta_vif 0 if [ "$per_sta_vif" -gt 0 ]; then -@@ -1079,16 +1167,16 @@ wpa_supplicant_set_fixed_freq() { +@@ -1079,16 +1169,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";; @@ -576,7 +591,7 @@ index aa72e09eba..e941fa4f77 100644 *) append network_data "disable_vht=1" "$N$T";; esac } -@@ -1106,7 +1194,8 @@ wpa_supplicant_add_network() { +@@ -1106,7 +1196,8 @@ wpa_supplicant_add_network() { ssid bssid key \ basic_rate mcast_rate \ ieee80211w ieee80211r \ @@ -586,7 +601,7 @@ index aa72e09eba..e941fa4f77 100644 case "$auth_type" in sae|owe|eap192|eap-eap192) -@@ -1119,6 +1208,7 @@ wpa_supplicant_add_network() { +@@ -1119,6 +1210,7 @@ wpa_supplicant_add_network() { set_default ieee80211r 0 set_default multi_ap 0 @@ -594,7 +609,7 @@ index aa72e09eba..e941fa4f77 100644 local key_mgmt='NONE' local network_data= -@@ -1150,7 +1240,10 @@ wpa_supplicant_add_network() { +@@ -1150,7 +1242,10 @@ wpa_supplicant_add_network() { scan_ssid="" }