[][MAC80211][wifi7][hostapd][rebase internal hostapd patches based on AP/STA ucode reimplmentation]
[Description]
Fix patch fail because internal hostapd patches need to rebase
[Release-log]
N/A
Change-Id: I902be8f35f7db02e9223dbcad9006c6b4f43dc05
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7944070
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 9820e67..7566015 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
@@ -1,5 +1,5 @@
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index a7472ee7..f06c889b 100644
+index a7472ee..f06c889 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -20,6 +20,7 @@ PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
@@ -31,17 +31,16 @@
$(PKG_BUILD_DIR)/include/linux/ssb \
$(PKG_BUILD_DIR)/include/linux/bcma \
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-index 39683376..3c7a88dd 100644
+index 3b88af4..b6624c3 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-@@ -24,10 +24,11 @@ drv_mac80211_init_device_config() {
-
+@@ -25,9 +25,10 @@ drv_mac80211_init_device_config() {
config_add_string path phy 'macaddr:macaddr'
config_add_string tx_burst
-+ config_add_int mbssid mu_onoff sr_enable sr_enhanced rnr
config_add_string distance
++ config_add_int mbssid mu_onoff sr_enable sr_enhanced rnr obss_interval
config_add_int beacon_int chanbw frag rts
- config_add_int rxantenna txantenna antenna_gain txpower min_tx_power
+ config_add_int rxantenna txantenna txpower min_tx_power
- config_add_boolean noscan ht_coex acs_exclude_dfs background_radar
+ config_add_boolean noscan ht_coex acs_exclude_dfs background_radar background_cert_mode
config_add_array ht_capab
@@ -64,7 +63,7 @@
append base_cfg "acs_exclude_dfs=1" "$N"
- json_get_vars noscan ht_coex min_tx_power:0 tx_burst
-+ json_get_vars noscan ht_coex min_tx_power:0 tx_burst mbssid mu_onoff rnr
++ json_get_vars noscan ht_coex min_tx_power:0 tx_burst mbssid mu_onoff rnr obss_interval
+ json_get_vars etxbfen:1 itxbfen:0
json_get_values ht_capab_list ht_capab
json_get_values channel_list channels
@@ -111,7 +110,19 @@
*)
if [ "$channel" -lt 7 ]; then
ht_capab="[HT40+]"
-@@ -202,7 +218,7 @@ mac80211_hostapd_setup_base() {
+@@ -191,6 +207,11 @@ mac80211_hostapd_setup_base() {
+ set_default ht_coex 0
+ append base_cfg "ht_coex=$ht_coex" "$N"
+
++ [ "$ht_coex" -eq 1 ] && {
++ set_default obss_interval 300
++ append base_cfg "obss_interval=$obss_interval" "$N"
++ }
++
+ json_get_vars \
+ ldpc:1 \
+ greenfield:0 \
+@@ -202,7 +223,7 @@ mac80211_hostapd_setup_base() {
dsss_cck_40:1
ht_cap_mask=0
@@ -120,7 +131,7 @@
ht_cap_mask="$(($ht_cap_mask | $cap))"
done
-@@ -233,8 +249,8 @@ mac80211_hostapd_setup_base() {
+@@ -233,8 +254,8 @@ mac80211_hostapd_setup_base() {
idx="$channel"
case "$htmode" in
@@ -131,7 +142,7 @@
case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
1) idx=$(($channel + 2));;
0) idx=$(($channel - 2));;
-@@ -242,7 +258,7 @@ mac80211_hostapd_setup_base() {
+@@ -242,7 +263,7 @@ mac80211_hostapd_setup_base() {
enable_ac=1
vht_center_seg0=$idx
;;
@@ -140,7 +151,7 @@
case "$(( (($channel / 4) + $chan_ofs) % 4 ))" in
1) idx=$(($channel + 6));;
2) idx=$(($channel + 2));;
-@@ -253,7 +269,7 @@ mac80211_hostapd_setup_base() {
+@@ -253,7 +274,7 @@ mac80211_hostapd_setup_base() {
vht_oper_chwidth=1
vht_center_seg0=$idx
;;
@@ -149,7 +160,7 @@
if [ "$band" = "6g" ]; then
case "$channel" in
1|5|9|13|17|21|25|29) idx=15;;
-@@ -268,23 +284,58 @@ mac80211_hostapd_setup_base() {
+@@ -268,23 +289,58 @@ mac80211_hostapd_setup_base() {
case "$channel" in
36|40|44|48|52|56|60|64) idx=50;;
100|104|108|112|116|120|124|128) idx=114;;
@@ -211,7 +222,7 @@
esac
[ -n "$op_class" ] && append base_cfg "op_class=$op_class" "$N"
}
-@@ -312,7 +363,6 @@ mac80211_hostapd_setup_base() {
+@@ -312,7 +368,6 @@ mac80211_hostapd_setup_base() {
vht_link_adapt:3 \
vht160:2
@@ -219,7 +230,7 @@
append base_cfg "ieee80211ac=1" "$N"
vht_cap=0
for cap in $(iw phy "$phy" info | awk -F "[()]" '/VHT Capabilities/ { print $2 }'); do
-@@ -326,6 +376,12 @@ mac80211_hostapd_setup_base() {
+@@ -326,6 +381,12 @@ mac80211_hostapd_setup_base() {
[ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
@@ -232,7 +243,7 @@
mac80211_add_capabilities vht_capab $vht_cap \
RXLDPC:0x10::$rxldpc \
SHORT-GI-80:0x20::$short_gi_80 \
-@@ -407,7 +463,7 @@ mac80211_hostapd_setup_base() {
+@@ -407,7 +468,7 @@ mac80211_hostapd_setup_base() {
# 802.11ax
enable_ax=0
case "$htmode" in
@@ -241,7 +252,7 @@
esac
if [ "$enable_ax" != "0" ]; then
-@@ -416,10 +472,11 @@ mac80211_hostapd_setup_base() {
+@@ -416,10 +477,11 @@ mac80211_hostapd_setup_base() {
he_su_beamformee:1 \
he_mu_beamformer:1 \
he_twt_required:0 \
@@ -254,7 +265,7 @@
he_bss_color_enabled:1
he_phy_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1)
-@@ -433,6 +490,11 @@ mac80211_hostapd_setup_base() {
+@@ -433,6 +495,11 @@ mac80211_hostapd_setup_base() {
append base_cfg "he_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
}
@@ -266,7 +277,7 @@
mac80211_add_he_capabilities \
he_su_beamformer:${he_phy_cap:6:2}:0x80:$he_su_beamformer \
he_su_beamformee:${he_phy_cap:8:2}:0x1:$he_su_beamformee \
-@@ -440,7 +502,14 @@ mac80211_hostapd_setup_base() {
+@@ -440,7 +507,14 @@ mac80211_hostapd_setup_base() {
he_spr_psr_enabled:${he_phy_cap:14:2}:0x1:$he_spr_psr_enabled \
he_twt_required:${he_mac_cap:0:2}:0x6:$he_twt_required
@@ -281,7 +292,7 @@
append base_cfg "he_bss_color=$he_bss_color" "$N"
[ "$he_spr_non_srg_obss_pd_max_offset" -gt 0 ] && { \
append base_cfg "he_spr_non_srg_obss_pd_max_offset=$he_spr_non_srg_obss_pd_max_offset" "$N"
-@@ -459,34 +528,69 @@ mac80211_hostapd_setup_base() {
+@@ -459,34 +533,69 @@ mac80211_hostapd_setup_base() {
append base_cfg "he_mu_edca_qos_info_q_ack=0" "$N"
append base_cfg "he_mu_edca_qos_info_queue_request=0" "$N"
append base_cfg "he_mu_edca_qos_info_txop_request=0" "$N"
@@ -355,7 +366,7 @@
$base_cfg
EOF
-@@ -512,7 +616,7 @@ mac80211_hostapd_setup_bss() {
+@@ -512,7 +621,7 @@ mac80211_hostapd_setup_bss() {
append hostapd_cfg "wds_sta=1" "$N"
[ -n "$wds_bridge" ] && append hostapd_cfg "wds_bridge=$wds_bridge" "$N"
}
@@ -364,7 +375,7 @@
cat >> /var/run/hostapd-$phy.conf <<EOF
$hostapd_cfg
-@@ -522,6 +626,31 @@ ${max_listen_int:+max_listen_interval=$max_listen_int}
+@@ -522,6 +631,31 @@ ${max_listen_int:+max_listen_interval=$max_listen_int}
EOF
}
@@ -396,7 +407,7 @@
mac80211_get_addr() {
local phy="$1"
local idx="$(($2 + 1))"
-@@ -684,7 +813,19 @@ mac80211_prepare_vif() {
+@@ -684,7 +818,19 @@ mac80211_prepare_vif() {
set_default powersave 0
json_add_string _ifname "$ifname"
@@ -417,7 +428,7 @@
macaddr="$(mac80211_generate_mac $phy)"
macidx="$(($macidx + 1))"
elif [ "$macaddr" = 'random' ]; then
-@@ -948,6 +1089,14 @@ hostapd_set_config() {
+@@ -946,6 +1092,14 @@ hostapd_set_config() {
}
ubus wait_for hostapd
@@ -432,7 +443,7 @@
local hostapd_res="$(ubus call hostapd config_set "{ \"phy\": \"$phy\", \"config\":\"${hostapd_conf_file}\", \"prev_config\": \"${hostapd_conf_file}.prev\"}")"
ret="$?"
[ "$ret" != 0 -o -z "$hostapd_res" ] && {
-@@ -1024,6 +1173,9 @@ mac80211_setup_vif() {
+@@ -1022,6 +1176,9 @@ mac80211_setup_vif() {
json_select ..
[ -n "$failed" ] || wireless_add_vif "$name" "$ifname"
@@ -442,7 +453,7 @@
}
get_freq() {
-@@ -1075,6 +1227,10 @@ mac80211_reset_config() {
+@@ -1073,6 +1230,10 @@ mac80211_reset_config() {
wdev_tool "$phy" '{}'
}
@@ -453,9 +464,9 @@
drv_mac80211_setup() {
json_select config
json_get_vars \
-@@ -1082,7 +1238,8 @@ drv_mac80211_setup() {
+@@ -1080,7 +1241,8 @@ drv_mac80211_setup() {
country chanbw distance \
- txpower antenna_gain \
+ txpower \
rxantenna txantenna \
- frag rts beacon_int:100 htmode
+ frag rts beacon_int:100 htmode \
@@ -463,7 +474,7 @@
json_get_values basic_rate_list basic_rate
json_get_values scan_list scan_list
json_select ..
-@@ -1117,6 +1274,7 @@ drv_mac80211_setup() {
+@@ -1115,6 +1277,7 @@ drv_mac80211_setup() {
macidx=0
staidx=0
@@ -471,7 +482,7 @@
[ -n "$chanbw" ] && {
for file in /sys/kernel/debug/ieee80211/$phy/ath9k*/chanbw /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode; do
-@@ -1167,6 +1325,16 @@ drv_mac80211_setup() {
+@@ -1163,6 +1326,16 @@ drv_mac80211_setup() {
wpa_supplicant_init_config
@@ -488,7 +499,7 @@
mac80211_prepare_iw_htmode
active_ifnames=
for_each_interface "ap sta adhoc mesh monitor" mac80211_prepare_vif
-@@ -1175,6 +1343,9 @@ drv_mac80211_setup() {
+@@ -1171,6 +1344,9 @@ drv_mac80211_setup() {
[ -x /usr/sbin/wpa_supplicant ] && wpa_supplicant_set_config "$phy"
[ -x /usr/sbin/hostapd ] && hostapd_set_config "$phy"
@@ -499,7 +510,7 @@
json_set_namespace wdev_uc prev
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-index e24a2a63..da3ee8cc 100644
+index e24a2a6..da3ee8c 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -60,6 +60,9 @@ BEGIN {
@@ -654,11 +665,11 @@
done
}
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-index 65ae662c..6eab470d 100644
+index a0945fd..192bf6c 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -60,7 +60,14 @@ hostapd_append_wpa_key_mgmt() {
- [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256"
+ append wpa_key_mgmt "WPA-EAP-SHA256"
;;
sae)
- append wpa_key_mgmt "SAE"
@@ -673,7 +684,7 @@
[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-SAE"
;;
psk-sae)
-@@ -115,6 +122,7 @@ hostapd_common_add_device_config() {
+@@ -119,6 +126,7 @@ hostapd_common_add_device_config() {
config_add_int rts_threshold
config_add_int rssi_reject_assoc_rssi
config_add_int rssi_ignore_probe_request
@@ -681,7 +692,7 @@
config_add_int maxassoc
config_add_string acs_chan_bias
-@@ -227,8 +235,10 @@ hostapd_prepare_device_config() {
+@@ -231,8 +239,10 @@ hostapd_prepare_device_config() {
hostapd_add_rate brlist "$br"
done
@@ -692,7 +703,7 @@
[ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
[ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
[ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
-@@ -379,6 +389,24 @@ hostapd_common_add_bss_config() {
+@@ -383,6 +393,24 @@ hostapd_common_add_bss_config() {
config_add_string fils_dhcp
config_add_int ocv
@@ -717,7 +728,7 @@
}
hostapd_set_vlan_file() {
-@@ -443,11 +471,11 @@ append_iw_nai_realm() {
+@@ -447,11 +475,11 @@ append_iw_nai_realm() {
}
append_iw_venue_name() {
@@ -731,7 +742,7 @@
}
append_hs20_oper_friendly_name() {
-@@ -565,7 +593,8 @@ hostapd_set_bss_options() {
+@@ -569,7 +597,8 @@ hostapd_set_bss_options() {
ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
multicast_to_unicast_all proxy_arp per_sta_vif \
eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
@@ -741,7 +752,7 @@
set_default fils 0
set_default isolate 0
-@@ -793,6 +822,35 @@ hostapd_set_bss_options() {
+@@ -797,6 +826,35 @@ hostapd_set_bss_options() {
local auth_algs="$((($auth_mode_shared << 1) | $auth_mode_open))"
append bss_conf "auth_algs=${auth_algs:-1}" "$N"
append bss_conf "wpa=$wpa" "$N"
@@ -777,7 +788,7 @@
[ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
set_default wps_pushbutton 0
-@@ -844,7 +902,7 @@ hostapd_set_bss_options() {
+@@ -848,7 +906,7 @@ hostapd_set_bss_options() {
}
append bss_conf "ssid=$ssid" "$N"
@@ -786,7 +797,7 @@
[ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
[ -n "$iapp_interface" ] && {
local ifname
-@@ -957,6 +1015,8 @@ hostapd_set_bss_options() {
+@@ -963,6 +1021,8 @@ hostapd_set_bss_options() {
fi
if [ "$wpa" -ge "2" ]; then
@@ -795,7 +806,7 @@
if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
set_default auth_cache 1
append bss_conf "rsn_preauth=1" "$N"
-@@ -975,17 +1035,42 @@ hostapd_set_bss_options() {
+@@ -981,17 +1041,42 @@ 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"
@@ -839,7 +850,7 @@
[ -n "$ieee80211w_max_timeout" ] && \
append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
[ -n "$ieee80211w_retry_timeout" ] && \
-@@ -1050,9 +1135,10 @@ hostapd_set_bss_options() {
+@@ -1056,9 +1141,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
@@ -851,7 +862,7 @@
append bss_conf "interworking=1" "$N"
set_default iw_internet 1
set_default iw_asra 0
-@@ -1159,6 +1245,22 @@ hostapd_set_bss_options() {
+@@ -1165,6 +1251,22 @@ hostapd_set_bss_options() {
append bss_conf "$val" "$N"
done
@@ -874,7 +885,7 @@
append "$var" "$bss_conf" "$N"
return 0
}
-@@ -1246,6 +1348,7 @@ wpa_supplicant_prepare_interface() {
+@@ -1252,6 +1354,7 @@ wpa_supplicant_prepare_interface() {
country_str="country=$country"
}
@@ -882,7 +893,7 @@
multiap_flag_file="${_config}.is_multiap"
if [ "$multi_ap" = "1" ]; then
touch "$multiap_flag_file"
-@@ -1257,6 +1360,7 @@ wpa_supplicant_prepare_interface() {
+@@ -1263,6 +1366,7 @@ wpa_supplicant_prepare_interface() {
${scan_list:+freq_list=$scan_list}
$ap_scan
$country_str
@@ -890,7 +901,7 @@
EOF
return 0
}
-@@ -1528,12 +1632,38 @@ wpa_supplicant_add_network() {
+@@ -1534,12 +1638,38 @@ wpa_supplicant_add_network() {
;;
esac
@@ -933,7 +944,7 @@
case "$wpa" in
1)
append network_data "proto=WPA" "$N$T"
-@@ -1543,12 +1673,48 @@ wpa_supplicant_add_network() {
+@@ -1549,12 +1679,48 @@ wpa_supplicant_add_network() {
;;
esac
@@ -983,7 +994,7 @@
[ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
[ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
-@@ -1559,6 +1725,20 @@ wpa_supplicant_add_network() {
+@@ -1565,6 +1731,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"
@@ -1004,7 +1015,7 @@
[ -n "$basic_rate" ] && {
local br rate_list=
for br in $basic_rate; do
-@@ -1573,6 +1753,11 @@ wpa_supplicant_add_network() {
+@@ -1579,6 +1759,11 @@ wpa_supplicant_add_network() {
append network_data "mcast_rate=$mc_rate" "$N$T"
}