[][MAC80211][WiFi6][mt76][Fix patch fail]
[Description]
Fix patch fail because of this patch
https://github.com/openwrt/openwrt/commit/cdc4c551755115e0e1047a0c90a658e6238e96ee
[Release-log]
N/A
Change-Id: I240294c2c230a3f38c023a3b8dcd091aba148952
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8599209
diff --git a/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
index 610de46..ecbe516 100644
--- a/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
+++ b/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
@@ -873,16 +873,16 @@
[ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
[ -n "$iapp_interface" ] && {
local ifname
-@@ -962,6 +1022,8 @@ hostapd_set_bss_options() {
+@@ -912,6 +972,8 @@ hostapd_set_bss_options() {
fi
if [ "$wpa" -ge "2" ]; then
+ json_get_values sae_groups sae_groups
+ json_get_values owe_groups owe_groups
- if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
- set_default auth_cache 1
- append bss_conf "rsn_preauth=1" "$N"
-@@ -980,17 +1042,52 @@ hostapd_set_bss_options() {
+ if [ "$ieee80211r" -gt "0" ]; then
+ json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
+
+@@ -984,17 +1046,52 @@ hostapd_set_bss_options() {
append bss_conf "okc=$auth_cache" "$N"
[ "$auth_cache" = 0 -a "$fils" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
@@ -936,7 +936,7 @@
[ -n "$ieee80211w_max_timeout" ] && \
append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
[ -n "$ieee80211w_retry_timeout" ] && \
-@@ -1055,9 +1152,10 @@ hostapd_set_bss_options() {
+@@ -1059,9 +1156,10 @@ hostapd_set_bss_options() {
json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
json_get_vars iw_venue_name iw_venue_url
@@ -948,7 +948,7 @@
append bss_conf "interworking=1" "$N"
set_default iw_internet 1
set_default iw_asra 0
-@@ -1164,6 +1262,22 @@ hostapd_set_bss_options() {
+@@ -1168,6 +1266,22 @@ hostapd_set_bss_options() {
append bss_conf "$val" "$N"
done
@@ -971,7 +971,7 @@
append "$var" "$bss_conf" "$N"
return 0
}
-@@ -1251,6 +1365,7 @@ wpa_supplicant_prepare_interface() {
+@@ -1255,6 +1369,7 @@ wpa_supplicant_prepare_interface() {
country_str="country=$country"
}
@@ -979,7 +979,7 @@
multiap_flag_file="${_config}.is_multiap"
if [ "$multi_ap" = "1" ]; then
touch "$multiap_flag_file"
-@@ -1262,6 +1377,7 @@ wpa_supplicant_prepare_interface() {
+@@ -1266,6 +1381,7 @@ wpa_supplicant_prepare_interface() {
${scan_list:+freq_list=$scan_list}
$ap_scan
$country_str
@@ -987,7 +987,7 @@
EOF
return 0
}
-@@ -1533,12 +1649,39 @@ wpa_supplicant_add_network() {
+@@ -1537,12 +1653,39 @@ wpa_supplicant_add_network() {
;;
esac
@@ -1031,7 +1031,7 @@
case "$wpa" in
1)
append network_data "proto=WPA" "$N$T"
-@@ -1548,12 +1691,58 @@ wpa_supplicant_add_network() {
+@@ -1552,12 +1695,58 @@ wpa_supplicant_add_network() {
;;
esac
@@ -1091,7 +1091,7 @@
[ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
[ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
-@@ -1564,6 +1753,20 @@ wpa_supplicant_add_network() {
+@@ -1568,6 +1757,20 @@ wpa_supplicant_add_network() {
[ -n "$bssid_blacklist" ] && append network_data "bssid_blacklist=$bssid_blacklist" "$N$T"
[ -n "$bssid_whitelist" ] && append network_data "bssid_whitelist=$bssid_whitelist" "$N$T"
@@ -1112,7 +1112,7 @@
[ -n "$basic_rate" ] && {
local br rate_list=
for br in $basic_rate; do
-@@ -1578,6 +1781,11 @@ wpa_supplicant_add_network() {
+@@ -1582,6 +1785,11 @@ wpa_supplicant_add_network() {
append network_data "mcast_rate=$mc_rate" "$N$T"
}