[rdkb][common][bsp][Refactor and sync wifi from openwrt]
[Description]
a05cc330 [MAC80211][WiFi6][mt76][rebase patches]
4bd6fb05 [MAC80211][WiFi6][mt76][Support spatial reuse debug commands]
f59fb1fe [MAC80211][WiFi7][misc][Add wifi-scripts packages]
52ac14cd [MAC80211][WiFi6][hostapd][Fix DFS radar trigger issue during first setup CAC]
7e33638a [MAC80211][WiFi6][Rebase Patches][Fix patch fail on mt76-2024-02-04]
b81d400b [MAC80211][Rebase Patches][Add support for WMM PBC configuration]
6e1f46b8 [MAC80211][WiFi6][mt76][Add support for WMM PBC configuration]
4a12d531 [mac80211][wifi6][mt76][Remove revert patch and add sanity check]
46c5e65d [mac80211][wifi6][mt76][Fix tx statistics]
d9b7c50d [MAC80211][WiFi6][mt76][Fix patch fail]
c8c49a13 [MAC80211][WiFi6][mt76][Add no_beacon vendor command for cert]
620200d9 [MAC80211][WiFi6][mt76][Remove redundant argument in add_beacon function]
f5fe56a6 [MAC80211][WiFi6][hostapd][New support for single BSS operations]
ff6e20a8 [MAC80211][WiFi6][hostapd][ACS: remove chan/freq list check when scan request and factor calculation]
3f25a0e5 [MAC80211][WiFi6][mt76][Fix bug in VoW DebugFS command]
33cb7faf [MAC80211][WiFi6][core][Sync wifi7 cert SQC fix to wifi6]
3a1c492a [MAC80211][WiFi6][core][Add support for scan dwell time customization]
7e7a47e4 [mac80211][wifi6][mt76][Fix patch fail]
5fc4c9d6 [MAC80211][misc][Fix external build fail of MAC80211]
b5d42444 [mac80211][wifi6][mt76][add support for realtime Rx rate updates]
638298f6 [mac80211][WiFi7][misc][Fix patch fail]
5c710bc2 [MAC80211][WiFi6][mt76][Add efuse content dump for cal free data verification]
[Release-log]
Change-Id: Ia86a987807efb6f1ef119e2e46232ce08afca96e
diff --git a/recipes-wifi/hostapd/files/common.uc b/recipes-wifi/hostapd/files/common.uc
index 4c33779..750e3ae 100644
--- a/recipes-wifi/hostapd/files/common.uc
+++ b/recipes-wifi/hostapd/files/common.uc
@@ -49,7 +49,7 @@
{
let data = nl80211.request(nl80211.const.NL80211_CMD_GET_WIPHY, 0, { wiphy: phyidx });
- return !data.software_iftypes.ap_vlan;
+ return !data.software_iftypes.monitor;
}
function phy_is_fullmac(phy)
diff --git a/recipes-wifi/hostapd/files/hostapd.uc b/recipes-wifi/hostapd/files/hostapd.uc
index 163d619..72209ea 100644
--- a/recipes-wifi/hostapd/files/hostapd.uc
+++ b/recipes-wifi/hostapd/files/hostapd.uc
@@ -2,9 +2,10 @@
import { open, readfile } from "fs";
import { wdev_create, wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open } from "common";
-let ubus = libubus.connect();
+let ubus = libubus.connect(null, 60);
hostapd.data.config = {};
+hostapd.data.pending_config = {};
hostapd.data.file_fields = {
vlan_file: true,
@@ -132,12 +133,114 @@
let macaddr_list = [];
for (let i = 0; i < length(config.bss); i++)
push(macaddr_list, config.bss[i].bssid);
- ubus.call("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
+ ubus.defer("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
}
+function __iface_pending_next(pending, state, ret, data)
+{
+ let config = pending.config;
+ let phydev = pending.phydev;
+ let phy = pending.phy;
+ let bss = config.bss[0];
+
+ if (pending.defer)
+ pending.defer.abort();
+ delete pending.defer;
+ switch (state) {
+ case "init":
+ let macaddr_list = [];
+ for (let i = 0; i < length(config.bss); i++)
+ push(macaddr_list, config.bss[i].bssid);
+ pending.call("wpa_supplicant", "phy_set_macaddr_list", { phy: phy, macaddr: macaddr_list });
+ return "create_bss";
+ case "create_bss":
+ let err = wdev_create(phy, bss.ifname, { mode: "ap" });
+ if (err) {
+ hostapd.printf(`Failed to create ${bss.ifname} on phy ${phy}: ${err}`);
+ return null;
+ }
+
+ pending.call("wpa_supplicant", "phy_status", { phy: phy });
+ return "check_phy";
+ case "check_phy":
+ let phy_status = data;
+ if (phy_status && phy_status.state == "COMPLETED") {
+ if (iface_add(phy, config, phy_status))
+ return "done";
+
+ hostapd.printf(`Failed to bring up phy ${phy} ifname=${bss.ifname} with supplicant provided frequency`);
+ }
+ pending.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: true });
+ return "wpas_stopped";
+ case "wpas_stopped":
+ if (!iface_add(phy, config))
+ hostapd.printf(`hostapd.add_iface failed for phy ${phy} ifname=${bss.ifname}`);
+ pending.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: false });
+ return null;
+ case "done":
+ default:
+ delete hostapd.data.pending_config[phy];
+ break;
+ }
+}
+
+function iface_pending_next(ret, data)
+{
+ let pending = true;
+ let cfg = this;
+
+ while (pending) {
+ this.next_state = __iface_pending_next(cfg, this.next_state, ret, data);
+ if (!this.next_state) {
+ __iface_pending_next(cfg, "done");
+ return;
+ }
+ pending = !this.defer;
+ }
+}
+
+function iface_pending_abort()
+{
+ this.next_state = "done";
+ this.next();
+}
+
+function iface_pending_ubus_call(obj, method, arg)
+{
+ let ubus = hostapd.data.ubus;
+ let pending = this;
+ this.defer = ubus.defer(obj, method, arg, (ret, data) => { delete pending.defer; pending.next(ret, data) });
+}
+
+const iface_pending_proto = {
+ next: iface_pending_next,
+ call: iface_pending_ubus_call,
+ abort: iface_pending_abort,
+};
+
+function iface_pending_init(phydev, config)
+{
+ let phy = phydev.name;
+
+ let pending = proto({
+ next_state: "init",
+ phydev: phydev,
+ phy: phy,
+ config: config,
+ next: iface_pending_next,
+ }, iface_pending_proto);
+
+ hostapd.data.pending_config[phy] = pending;
+ pending.next();
+}
+
function iface_restart(phydev, config, old_config)
{
let phy = phydev.name;
+ let pending = hostapd.data.pending_config[phy];
+
+ if (pending)
+ pending.abort();
hostapd.remove_iface(phy);
iface_remove(old_config);
@@ -155,26 +258,7 @@
bss.bssid = phydev.macaddr_next();
}
- iface_update_supplicant_macaddr(phy, config);
-
- let bss = config.bss[0];
- let err = wdev_create(phy, bss.ifname, { mode: "ap" });
- if (err)
- hostapd.printf(`Failed to create ${bss.ifname} on phy ${phy}: ${err}`);
-
- let ubus = hostapd.data.ubus;
- let phy_status = ubus.call("wpa_supplicant", "phy_status", { phy: phy });
- if (phy_status && phy_status.state == "COMPLETED") {
- if (iface_add(phy, config, phy_status))
- return;
-
- hostapd.printf(`Failed to bring up phy ${phy} ifname=${bss.ifname} with supplicant provided frequency`);
- }
-
- ubus.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: true });
- if (!iface_add(phy, config))
- hostapd.printf(`hostapd.add_iface failed for phy ${phy} ifname=${bss.ifname}`);
- ubus.call("wpa_supplicant", "phy_set_state", { phy: phy, stop: false });
+ iface_pending_init(phydev, config);
}
function array_to_obj(arr, key, start)
@@ -279,6 +363,9 @@
if (is_equal(old_config.bss, config.bss))
return true;
+ if (hostapd.data.pending_config[phy])
+ return false;
+
if (!old_config.bss || !old_config.bss[0])
return false;
diff --git a/recipes-wifi/hostapd/files/openwrt_script/hostapd.sh b/recipes-wifi/hostapd/files/openwrt_script/hostapd.sh
index 28bd210..763702e 100644
--- a/recipes-wifi/hostapd/files/openwrt_script/hostapd.sh
+++ b/recipes-wifi/hostapd/files/openwrt_script/hostapd.sh
@@ -43,21 +43,21 @@
case "$auth_type" in
psk|eap)
append wpa_key_mgmt "WPA-$auth_type_l"
- [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type_l}"
+ [ "${wpa:-2}" -ge 2 ] && [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type_l}"
[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type_l}-SHA256"
;;
eap192)
append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP-SHA384"
;;
- eap-eap192)
- append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
+ eap-eap2)
append wpa_key_mgmt "WPA-EAP"
- [ "${ieee80211r:-0}" -gt 0 ] && {
- append wpa_key_mgmt "FT-EAP-SHA384"
- append wpa_key_mgmt "FT-EAP"
- }
- [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256"
+ append wpa_key_mgmt "WPA-EAP-SHA256"
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
+ ;;
+ eap2)
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
+ append wpa_key_mgmt "WPA-EAP-SHA256"
;;
sae)
append wpa_key_mgmt "SAE"
@@ -77,6 +77,10 @@
[ "$fils" -gt 0 ] && {
case "$auth_type" in
+ eap192)
+ append wpa_key_mgmt FILS-SHA384
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt FT-FILS-SHA384
+ ;;
eap*)
append wpa_key_mgmt FILS-SHA256
[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt FT-FILS-SHA256
@@ -121,6 +125,7 @@
config_add_array hostapd_options
config_add_int airtime_mode
+ config_add_int mbssid
hostapd_add_log_config
}
@@ -133,7 +138,8 @@
json_get_vars country country3 country_ie beacon_int:100 doth require_mode legacy_rates \
acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
- rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc
+ rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \
+ mbssid:0
hostapd_set_log_options base_cfg
@@ -234,6 +240,7 @@
[ -n "$rts_threshold" ] && append base_cfg "rts_threshold=$rts_threshold" "$N"
[ "$airtime_mode" -gt 0 ] && append base_cfg "airtime_mode=$airtime_mode" "$N"
[ -n "$maxassoc" ] && append base_cfg "iface_max_num_sta=$maxassoc" "$N"
+ [ "$mbssid" -gt 0 ] && [ "$mbssid" -le 2 ] && append base_cfg "mbssid=$mbssid" "$N"
json_get_values opts hostapd_options
for val in $opts; do
@@ -625,8 +632,7 @@
[ -n "$wpa_strict_rekey" ] && append bss_conf "wpa_strict_rekey=$wpa_strict_rekey" "$N"
}
- set_default nasid "${macaddr//\:}"
- append bss_conf "nas_identifier=$nasid" "$N"
+ [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
[ -n "$acct_interval" ] && \
append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
@@ -636,12 +642,12 @@
[ -n "$ocv" ] && append bss_conf "ocv=$ocv" "$N"
case "$auth_type" in
- sae|owe|eap192|eap-eap192)
+ sae|owe|eap2|eap192)
set_default ieee80211w 2
set_default sae_require_mfp 1
set_default sae_pwe 2
;;
- psk-sae)
+ psk-sae|eap-eap2)
set_default ieee80211w 1
set_default sae_require_mfp 1
set_default sae_pwe 2
@@ -692,7 +698,7 @@
vlan_possible=1
wps_possible=1
;;
- eap|eap192|eap-eap192)
+ eap|eap2|eap-eap2|eap192)
json_get_vars \
auth_server auth_secret auth_port \
dae_client dae_secret dae_port \
@@ -864,8 +870,9 @@
[ "$bss_transition" -eq "1" ] && append bss_conf "bss_transition=1" "$N"
[ "$mbo" -eq 1 ] && append bss_conf "mbo=1" "$N"
- json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
+ json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report rnr
set_default ieee80211k 0
+ set_default rnr 0
if [ "$ieee80211k" -eq "1" ]; then
set_default rrm_neighbor_report 1
set_default rrm_beacon_report 1
@@ -876,6 +883,7 @@
[ "$rrm_neighbor_report" -eq "1" ] && append bss_conf "rrm_neighbor_report=1" "$N"
[ "$rrm_beacon_report" -eq "1" ] && append bss_conf "rrm_beacon_report=1" "$N"
+ [ "$rnr" -eq "1" ] && append bss_conf "rnr=1" "$N"
json_get_vars ftm_responder stationary_ap lci civic
set_default ftm_responder 0
@@ -889,10 +897,21 @@
}
fi
+ json_get_vars ieee80211r
+ set_default ieee80211r 0
if [ "$wpa" -ge "1" ]; then
- json_get_vars ieee80211r
- set_default ieee80211r 0
+ if [ "$fils" -gt 0 ]; then
+ json_get_vars fils_realm
+ set_default fils_realm "$(echo "$ssid" | md5sum | head -c 8)"
+ fi
+ append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
+
+ hostapd_append_wpa_key_mgmt
+ [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
+ fi
+
+ if [ "$wpa" -ge "2" ]; then
if [ "$ieee80211r" -gt "0" ]; then
json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
@@ -901,7 +920,7 @@
set_default reassociation_deadline 1000
case "$auth_type" in
- psk|sae|psk-sae)
+ psk)
set_default ft_psk_generate_local 1
;;
*)
@@ -924,6 +943,10 @@
set_default pmk_r1_push 0
[ -n "$r0kh" -a -n "$r1kh" ] || {
+ if [ -z "$auth_secret" -a -z "$key" ]; then
+ wireless_setup_vif_failed FT_KEY_CANT_BE_DERIVED
+ return 1
+ fi
ft_key=`echo -n "$mobility_domain/${auth_secret:-${key}}" | md5sum | awk '{print $1}'`
set_default r0kh "ff:ff:ff:ff:ff:ff,*,$ft_key"
@@ -942,18 +965,7 @@
done
fi
fi
- if [ "$fils" -gt 0 ]; then
- json_get_vars fils_realm
- set_default fils_realm "$(echo "$ssid" | md5sum | head -c 8)"
- fi
-
- append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
-
- hostapd_append_wpa_key_mgmt
- [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
- fi
- if [ "$wpa" -ge "2" ]; then
if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
set_default auth_cache 1
append bss_conf "rsn_preauth=1" "$N"
@@ -1156,9 +1168,6 @@
append bss_conf "$val" "$N"
done
- bss_md5sum="$(echo $bss_conf | md5sum | cut -d" " -f1)"
- append bss_conf "config_id=$bss_md5sum" "$N"
-
append "$var" "$bss_conf" "$N"
return 0
}
@@ -1300,7 +1309,7 @@
default_disabled
case "$auth_type" in
- sae|owe|eap192|eap-eap192)
+ sae|owe|eap2|eap192)
set_default ieee80211w 2
;;
psk-sae)
@@ -1383,7 +1392,7 @@
fi
append network_data "$passphrase" "$N$T"
;;
- eap|eap192|eap-eap192)
+ eap|eap2|eap192)
hostapd_append_wpa_key_mgmt
key_mgmt="$wpa_key_mgmt"
@@ -1587,30 +1596,3 @@
fi
return 0
}
-
-wpa_supplicant_run() {
- local ifname="$1"
- local hostapd_ctrl="$2"
-
- _wpa_supplicant_common "$ifname"
-
- ubus wait_for wpa_supplicant
- local supplicant_res="$(ubus call wpa_supplicant config_add "{ \
- \"driver\": \"${_w_driver:-wext}\", \"ctrl\": \"$_rpath\", \
- \"iface\": \"$ifname\", \"config\": \"$_config\" \
- ${network_bridge:+, \"bridge\": \"$network_bridge\"} \
- ${hostapd_ctrl:+, \"hostapd_ctrl\": \"$hostapd_ctrl\"} \
- }")"
-
- ret="$?"
-
- [ "$ret" != 0 -o -z "$supplicant_res" ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
-
- wireless_add_process "$(jsonfilter -s "$supplicant_res" -l 1 -e @.pid)" "/usr/sbin/wpa_supplicant" 1 1
-
- return $ret
-}
-
-hostapd_common_cleanup() {
- killall meshd-nl80211
-}
diff --git a/recipes-wifi/hostapd/files/openwrt_script/mac80211.sh b/recipes-wifi/hostapd/files/openwrt_script/mac80211.sh
index ed28052..e24a2a6 100644
--- a/recipes-wifi/hostapd/files/openwrt_script/mac80211.sh
+++ b/recipes-wifi/hostapd/files/openwrt_script/mac80211.sh
@@ -1,1321 +1,217 @@
#!/bin/sh
-. /lib/netifd/netifd-wireless.sh
-. /lib/netifd/hostapd.sh
-. /lib/functions/system.sh
-init_wireless_driver "$@"
+append DRIVERS "mac80211"
-MP_CONFIG_INT="mesh_retry_timeout mesh_confirm_timeout mesh_holding_timeout mesh_max_peer_links
- mesh_max_retries mesh_ttl mesh_element_ttl mesh_hwmp_max_preq_retries
- mesh_path_refresh_time mesh_min_discovery_timeout mesh_hwmp_active_path_timeout
- mesh_hwmp_preq_min_interval mesh_hwmp_net_diameter_traversal_time mesh_hwmp_rootmode
- mesh_hwmp_rann_interval mesh_gate_announcements mesh_sync_offset_max_neighor
- mesh_rssi_threshold mesh_hwmp_active_path_to_root_timeout mesh_hwmp_root_interval
- mesh_hwmp_confirmation_interval mesh_awake_window mesh_plink_timeout"
-MP_CONFIG_BOOL="mesh_auto_open_plinks mesh_fwding"
-MP_CONFIG_STRING="mesh_power_mode"
-
-NEWAPLIST=
-OLDAPLIST=
-NEWSPLIST=
-OLDSPLIST=
-NEWUMLIST=
-OLDUMLIST=
-
-drv_mac80211_init_device_config() {
- hostapd_common_add_device_config
-
- config_add_string path phy 'macaddr:macaddr'
- config_add_string tx_burst
- config_add_string distance
- config_add_int beacon_int chanbw frag rts
- config_add_int rxantenna txantenna antenna_gain txpower min_tx_power
- config_add_boolean noscan ht_coex acs_exclude_dfs background_radar
- config_add_array ht_capab
- config_add_array channels
- config_add_array scan_list
- config_add_boolean \
- rxldpc \
- short_gi_80 \
- short_gi_160 \
- tx_stbc_2by1 \
- su_beamformer \
- su_beamformee \
- mu_beamformer \
- mu_beamformee \
- he_su_beamformer \
- he_su_beamformee \
- he_mu_beamformer \
- vht_txop_ps \
- htc_vht \
- rx_antenna_pattern \
- tx_antenna_pattern \
- he_spr_sr_control \
- he_spr_psr_enabled \
- he_bss_color_enabled \
- he_twt_required
- config_add_int \
- beamformer_antennas \
- beamformee_antennas \
- vht_max_a_mpdu_len_exp \
- vht_max_mpdu \
- vht_link_adapt \
- vht160 \
- rx_stbc \
- tx_stbc \
- he_bss_color \
- he_spr_non_srg_obss_pd_max_offset
- config_add_boolean \
- ldpc \
- greenfield \
- short_gi_20 \
- short_gi_40 \
- max_amsdu \
- dsss_cck_40
-}
-
-drv_mac80211_init_iface_config() {
- hostapd_common_add_bss_config
-
- config_add_string 'macaddr:macaddr' ifname
-
- config_add_boolean wds powersave enable
- config_add_string wds_bridge
- config_add_int maxassoc
- config_add_int max_listen_int
- config_add_int dtim_period
- config_add_int start_disabled
-
- # mesh
- config_add_string mesh_id
- config_add_int $MP_CONFIG_INT
- config_add_boolean $MP_CONFIG_BOOL
- config_add_string $MP_CONFIG_STRING
-}
-
-mac80211_add_capabilities() {
- local __var="$1"; shift
- local __mask="$1"; shift
- local __out= oifs
-
- oifs="$IFS"
- IFS=:
- for capab in "$@"; do
- set -- $capab
-
- [ "$(($4))" -gt 0 ] || continue
- [ "$(($__mask & $2))" -eq "$((${3:-$2}))" ] || continue
- __out="$__out[$1]"
- done
- IFS="$oifs"
-
- export -n -- "$__var=$__out"
-}
-
-mac80211_add_he_capabilities() {
- local __out= oifs
-
- oifs="$IFS"
- IFS=:
- for capab in "$@"; do
- set -- $capab
- [ "$(($4))" -gt 0 ] || continue
- [ "$(((0x$2) & $3))" -gt 0 ] || {
- eval "$1=0"
- continue
- }
- append base_cfg "$1=1" "$N"
- done
- IFS="$oifs"
-}
-
-mac80211_hostapd_setup_base() {
- local phy="$1"
-
- json_select config
-
- [ "$auto_channel" -gt 0 ] && channel=acs_survey
-
- [ "$auto_channel" -gt 0 ] && json_get_vars acs_exclude_dfs
- [ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
- append base_cfg "acs_exclude_dfs=1" "$N"
-
- json_get_vars noscan ht_coex min_tx_power:0 tx_burst
- json_get_values ht_capab_list ht_capab
- json_get_values channel_list channels
-
- [ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
- channel_list="$channel"
-
- [ "$min_tx_power" -gt 0 ] && append base_cfg "min_tx_power=$min_tx_power"
-
- set_default noscan 0
-
- [ "$noscan" -gt 0 ] && hostapd_noscan=1
- [ "$tx_burst" = 0 ] && tx_burst=
-
- chan_ofs=0
- [ "$band" = "6g" ] && chan_ofs=1
-
- ieee80211n=1
- ht_capab=
- case "$htmode" in
- VHT20|HT20|HE20) ;;
- HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160)
- case "$hwmode" in
- a)
- case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
- 1) ht_capab="[HT40+]";;
- 0) ht_capab="[HT40-]";;
- esac
- ;;
- *)
- case "$htmode" in
- HT40+) ht_capab="[HT40+]";;
- HT40-) ht_capab="[HT40-]";;
- *)
- if [ "$channel" -lt 7 ]; then
- ht_capab="[HT40+]"
- else
- ht_capab="[HT40-]"
- fi
- ;;
- esac
- ;;
- esac
- [ "$auto_channel" -gt 0 ] && ht_capab="[HT40+]"
- ;;
- *) ieee80211n= ;;
- esac
-
- [ -n "$ieee80211n" ] && {
- append base_cfg "ieee80211n=1" "$N"
-
- set_default ht_coex 0
- append base_cfg "ht_coex=$ht_coex" "$N"
-
- json_get_vars \
- ldpc:1 \
- greenfield:0 \
- short_gi_20:1 \
- short_gi_40:1 \
- tx_stbc:1 \
- rx_stbc:3 \
- max_amsdu:1 \
- dsss_cck_40:1
-
- ht_cap_mask=0
- for cap in $(iw phy "$phy" info | grep 'Capabilities:' | cut -d: -f2); do
- ht_cap_mask="$(($ht_cap_mask | $cap))"
- done
-
- cap_rx_stbc=$((($ht_cap_mask >> 8) & 3))
- [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
- ht_cap_mask="$(( ($ht_cap_mask & ~(0x300)) | ($cap_rx_stbc << 8) ))"
-
- mac80211_add_capabilities ht_capab_flags $ht_cap_mask \
- LDPC:0x1::$ldpc \
- GF:0x10::$greenfield \
- SHORT-GI-20:0x20::$short_gi_20 \
- SHORT-GI-40:0x40::$short_gi_40 \
- TX-STBC:0x80::$tx_stbc \
- RX-STBC1:0x300:0x100:1 \
- RX-STBC12:0x300:0x200:1 \
- RX-STBC123:0x300:0x300:1 \
- MAX-AMSDU-7935:0x800::$max_amsdu \
- DSSS_CCK-40:0x1000::$dsss_cck_40
-
- ht_capab="$ht_capab$ht_capab_flags"
- [ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N"
- }
-
- # 802.11ac
- enable_ac=0
- vht_oper_chwidth=0
- vht_center_seg0=
-
- idx="$channel"
- case "$htmode" in
- VHT20|HE20) enable_ac=1;;
- VHT40|HE40)
- case "$(( (($channel / 4) + $chan_ofs) % 2 ))" in
- 1) idx=$(($channel + 2));;
- 0) idx=$(($channel - 2));;
- esac
- enable_ac=1
- vht_center_seg0=$idx
- ;;
- VHT80|HE80)
- case "$(( (($channel / 4) + $chan_ofs) % 4 ))" in
- 1) idx=$(($channel + 6));;
- 2) idx=$(($channel + 2));;
- 3) idx=$(($channel - 2));;
- 0) idx=$(($channel - 6));;
- esac
- enable_ac=1
- vht_oper_chwidth=1
- vht_center_seg0=$idx
- ;;
- VHT160|HE160)
- if [ "$band" = "6g" ]; then
- case "$channel" in
- 1|5|9|13|17|21|25|29) idx=15;;
- 33|37|41|45|49|53|57|61) idx=47;;
- 65|69|73|77|81|85|89|93) idx=79;;
- 97|101|105|109|113|117|121|125) idx=111;;
- 129|133|137|141|145|149|153|157) idx=143;;
- 161|165|169|173|177|181|185|189) idx=175;;
- 193|197|201|205|209|213|217|221) idx=207;;
- esac
- else
- case "$channel" in
- 36|40|44|48|52|56|60|64) idx=50;;
- 100|104|108|112|116|120|124|128) idx=114;;
- esac
- fi
- enable_ac=1
- vht_oper_chwidth=2
- vht_center_seg0=$idx
- ;;
- esac
- [ "$band" = "5g" ] && {
- json_get_vars background_radar:0
-
- [ "$background_radar" -eq 1 ] && append base_cfg "enable_background_radar=1" "$N"
- }
- [ "$band" = "6g" ] && {
- op_class=
- case "$htmode" in
- HE20) op_class=131;;
- HE*) op_class=$((132 + $vht_oper_chwidth))
- esac
- [ -n "$op_class" ] && append base_cfg "op_class=$op_class" "$N"
- }
- [ "$hwmode" = "a" ] || enable_ac=0
-
- if [ "$enable_ac" != "0" ]; then
- json_get_vars \
- rxldpc:1 \
- short_gi_80:1 \
- short_gi_160:1 \
- tx_stbc_2by1:1 \
- su_beamformer:1 \
- su_beamformee:1 \
- mu_beamformer:1 \
- mu_beamformee:1 \
- vht_txop_ps:1 \
- htc_vht:1 \
- beamformee_antennas:4 \
- beamformer_antennas:4 \
- rx_antenna_pattern:1 \
- tx_antenna_pattern:1 \
- vht_max_a_mpdu_len_exp:7 \
- vht_max_mpdu:11454 \
- rx_stbc:4 \
- vht_link_adapt:3 \
- vht160:2
-
- set_default tx_burst 2.0
- append base_cfg "ieee80211ac=1" "$N"
- vht_cap=0
- for cap in $(iw phy "$phy" info | awk -F "[()]" '/VHT Capabilities/ { print $2 }'); do
- vht_cap="$(($vht_cap | $cap))"
- done
-
- append base_cfg "vht_oper_chwidth=$vht_oper_chwidth" "$N"
- append base_cfg "vht_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
-
- cap_rx_stbc=$((($vht_cap >> 8) & 7))
- [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
- vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
-
- mac80211_add_capabilities vht_capab $vht_cap \
- RXLDPC:0x10::$rxldpc \
- SHORT-GI-80:0x20::$short_gi_80 \
- SHORT-GI-160:0x40::$short_gi_160 \
- TX-STBC-2BY1:0x80::$tx_stbc_2by1 \
- SU-BEAMFORMER:0x800::$su_beamformer \
- SU-BEAMFORMEE:0x1000::$su_beamformee \
- MU-BEAMFORMER:0x80000::$mu_beamformer \
- MU-BEAMFORMEE:0x100000::$mu_beamformee \
- VHT-TXOP-PS:0x200000::$vht_txop_ps \
- HTC-VHT:0x400000::$htc_vht \
- RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \
- TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \
- RX-STBC-1:0x700:0x100:1 \
- RX-STBC-12:0x700:0x200:1 \
- RX-STBC-123:0x700:0x300:1 \
- RX-STBC-1234:0x700:0x400:1 \
-
- [ "$(($vht_cap & 0x800))" -gt 0 -a "$su_beamformer" -gt 0 ] && {
- cap_ant="$(( ( ($vht_cap >> 16) & 3 ) + 1 ))"
- [ "$cap_ant" -gt "$beamformer_antennas" ] && cap_ant="$beamformer_antennas"
- [ "$cap_ant" -gt 1 ] && vht_capab="$vht_capab[SOUNDING-DIMENSION-$cap_ant]"
- }
-
- [ "$(($vht_cap & 0x1000))" -gt 0 -a "$su_beamformee" -gt 0 ] && {
- cap_ant="$(( ( ($vht_cap >> 13) & 3 ) + 1 ))"
- [ "$cap_ant" -gt "$beamformee_antennas" ] && cap_ant="$beamformee_antennas"
- [ "$cap_ant" -gt 1 ] && vht_capab="$vht_capab[BF-ANTENNA-$cap_ant]"
- }
-
- # supported Channel widths
- vht160_hw=0
- [ "$(($vht_cap & 12))" -eq 4 -a 1 -le "$vht160" ] && \
- vht160_hw=1
- [ "$(($vht_cap & 12))" -eq 8 -a 2 -le "$vht160" ] && \
- vht160_hw=2
- [ "$vht160_hw" = 1 ] && vht_capab="$vht_capab[VHT160]"
- [ "$vht160_hw" = 2 ] && vht_capab="$vht_capab[VHT160-80PLUS80]"
-
- # maximum MPDU length
- vht_max_mpdu_hw=3895
- [ "$(($vht_cap & 3))" -ge 1 -a 7991 -le "$vht_max_mpdu" ] && \
- vht_max_mpdu_hw=7991
- [ "$(($vht_cap & 3))" -ge 2 -a 11454 -le "$vht_max_mpdu" ] && \
- vht_max_mpdu_hw=11454
- [ "$vht_max_mpdu_hw" != 3895 ] && \
- vht_capab="$vht_capab[MAX-MPDU-$vht_max_mpdu_hw]"
-
- # maximum A-MPDU length exponent
- vht_max_a_mpdu_len_exp_hw=0
- [ "$(($vht_cap & 58720256))" -ge 8388608 -a 1 -le "$vht_max_a_mpdu_len_exp" ] && \
- vht_max_a_mpdu_len_exp_hw=1
- [ "$(($vht_cap & 58720256))" -ge 16777216 -a 2 -le "$vht_max_a_mpdu_len_exp" ] && \
- vht_max_a_mpdu_len_exp_hw=2
- [ "$(($vht_cap & 58720256))" -ge 25165824 -a 3 -le "$vht_max_a_mpdu_len_exp" ] && \
- vht_max_a_mpdu_len_exp_hw=3
- [ "$(($vht_cap & 58720256))" -ge 33554432 -a 4 -le "$vht_max_a_mpdu_len_exp" ] && \
- vht_max_a_mpdu_len_exp_hw=4
- [ "$(($vht_cap & 58720256))" -ge 41943040 -a 5 -le "$vht_max_a_mpdu_len_exp" ] && \
- vht_max_a_mpdu_len_exp_hw=5
- [ "$(($vht_cap & 58720256))" -ge 50331648 -a 6 -le "$vht_max_a_mpdu_len_exp" ] && \
- vht_max_a_mpdu_len_exp_hw=6
- [ "$(($vht_cap & 58720256))" -ge 58720256 -a 7 -le "$vht_max_a_mpdu_len_exp" ] && \
- vht_max_a_mpdu_len_exp_hw=7
- vht_capab="$vht_capab[MAX-A-MPDU-LEN-EXP$vht_max_a_mpdu_len_exp_hw]"
-
- # whether or not the STA supports link adaptation using VHT variant
- vht_link_adapt_hw=0
- [ "$(($vht_cap & 201326592))" -ge 134217728 -a 2 -le "$vht_link_adapt" ] && \
- vht_link_adapt_hw=2
- [ "$(($vht_cap & 201326592))" -ge 201326592 -a 3 -le "$vht_link_adapt" ] && \
- vht_link_adapt_hw=3
- [ "$vht_link_adapt_hw" != 0 ] && \
- vht_capab="$vht_capab[VHT-LINK-ADAPT-$vht_link_adapt_hw]"
-
- [ -n "$vht_capab" ] && append base_cfg "vht_capab=$vht_capab" "$N"
- fi
-
- # 802.11ax
- enable_ax=0
- case "$htmode" in
- HE*) enable_ax=1 ;;
- esac
-
- if [ "$enable_ax" != "0" ]; then
- json_get_vars \
- he_su_beamformer:1 \
- he_su_beamformee:1 \
- he_mu_beamformer:1 \
- he_twt_required:0 \
- he_spr_sr_control:3 \
- he_spr_psr_enabled:0 \
- he_spr_non_srg_obss_pd_max_offset:0 \
- he_bss_color:128 \
- 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)
- he_phy_cap=${he_phy_cap:2}
- he_mac_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE MAC Capabilities/ { print $2 }' | head -1)
- he_mac_cap=${he_mac_cap:2}
-
- append base_cfg "ieee80211ax=1" "$N"
- [ "$hwmode" = "a" ] && {
- append base_cfg "he_oper_chwidth=$vht_oper_chwidth" "$N"
- append base_cfg "he_oper_centr_freq_seg0_idx=$vht_center_seg0" "$N"
- }
-
- 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 \
- he_mu_beamformer:${he_phy_cap:8:2}:0x2:$he_mu_beamformer \
- 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
-
- if [ "$he_bss_color_enabled" -gt 0 ]; then
- 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"
- he_spr_sr_control=$((he_spr_sr_control | (1 << 2)))
- }
- [ "$he_spr_psr_enabled" -gt 0 ] || he_spr_sr_control=$((he_spr_sr_control | (1 << 0)))
- append base_cfg "he_spr_sr_control=$he_spr_sr_control" "$N"
- else
- append base_cfg "he_bss_color_disabled=1" "$N"
- fi
-
-
- append base_cfg "he_default_pe_duration=4" "$N"
- append base_cfg "he_rts_threshold=1023" "$N"
- append base_cfg "he_mu_edca_qos_info_param_count=0" "$N"
- 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"
- append base_cfg "he_mu_edca_ac_be_aifsn=8" "$N"
- append base_cfg "he_mu_edca_ac_be_aci=0" "$N"
- append base_cfg "he_mu_edca_ac_be_ecwmin=9" "$N"
- append base_cfg "he_mu_edca_ac_be_ecwmax=10" "$N"
- append base_cfg "he_mu_edca_ac_be_timer=255" "$N"
- append base_cfg "he_mu_edca_ac_bk_aifsn=15" "$N"
- append base_cfg "he_mu_edca_ac_bk_aci=1" "$N"
- append base_cfg "he_mu_edca_ac_bk_ecwmin=9" "$N"
- append base_cfg "he_mu_edca_ac_bk_ecwmax=10" "$N"
- append base_cfg "he_mu_edca_ac_bk_timer=255" "$N"
- append base_cfg "he_mu_edca_ac_vi_ecwmin=5" "$N"
- append base_cfg "he_mu_edca_ac_vi_ecwmax=7" "$N"
- append base_cfg "he_mu_edca_ac_vi_aifsn=5" "$N"
- append base_cfg "he_mu_edca_ac_vi_aci=2" "$N"
- append base_cfg "he_mu_edca_ac_vi_timer=255" "$N"
- append base_cfg "he_mu_edca_ac_vo_aifsn=5" "$N"
- append base_cfg "he_mu_edca_ac_vo_aci=3" "$N"
- append base_cfg "he_mu_edca_ac_vo_ecwmin=5" "$N"
- append base_cfg "he_mu_edca_ac_vo_ecwmax=7" "$N"
- append base_cfg "he_mu_edca_ac_vo_timer=255" "$N"
- fi
-
- hostapd_prepare_device_config "$hostapd_conf_file" nl80211
- cat >> "$hostapd_conf_file" <<EOF
-${channel:+channel=$channel}
-${channel_list:+chanlist=$channel_list}
-${hostapd_noscan:+noscan=1}
-${tx_burst:+tx_queue_data2_burst=$tx_burst}
-$base_cfg
-
-EOF
- json_select ..
- radio_md5sum=$(md5sum $hostapd_conf_file | cut -d" " -f1)
- echo "radio_config_id=${radio_md5sum}" >> $hostapd_conf_file
-}
-
-mac80211_hostapd_setup_bss() {
- local phy="$1"
- local ifname="$2"
+check_mac80211_device() {
+ local device="$1"
+ local path="$2"
local macaddr="$3"
- local type="$4"
-
- hostapd_cfg=
- append hostapd_cfg "$type=$ifname" "$N"
-
- hostapd_set_bss_options hostapd_cfg "$phy" "$vif" || return 1
- json_get_vars wds wds_bridge dtim_period max_listen_int start_disabled
-
- set_default wds 0
- set_default start_disabled 0
-
- [ "$wds" -gt 0 ] && {
- append hostapd_cfg "wds_sta=1" "$N"
- [ -n "$wds_bridge" ] && append hostapd_cfg "wds_bridge=$wds_bridge" "$N"
- }
- [ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
-
- cat >> /var/run/hostapd-$phy.conf <<EOF
-$hostapd_cfg
-bssid=$macaddr
-${dtim_period:+dtim_period=$dtim_period}
-${max_listen_int:+max_listen_interval=$max_listen_int}
-EOF
-}
-
-mac80211_get_addr() {
- local phy="$1"
- local idx="$(($2 + 1))"
- head -n $idx /sys/class/ieee80211/${phy}/addresses | tail -n1
-}
-
-mac80211_generate_mac() {
- local phy="$1"
- local id="${macidx:-0}"
-
- local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
- local mask="$(cat /sys/class/ieee80211/${phy}/address_mask)"
-
- [ "$mask" = "00:00:00:00:00:00" ] && {
- mask="ff:ff:ff:ff:ff:ff";
-
- [ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt $id ] && {
- addr="$(mac80211_get_addr "$phy" "$id")"
- [ -n "$addr" ] && {
- echo "$addr"
- return
- }
- }
- }
-
- local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
-
- local mask1=$1
- local mask6=$6
-
- local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
-
- macidx=$(($id + 1))
- [ "$((0x$mask1))" -gt 0 ] && {
- b1="0x$1"
- [ "$id" -gt 0 ] && \
- b1=$(($b1 ^ ((($id - !($b1 & 2)) << 2)) | 0x2))
- printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6
- return
- }
-
- [ "$((0x$mask6))" -lt 255 ] && {
- printf "%s:%s:%s:%s:%s:%02x" $1 $2 $3 $4 $5 $(( 0x$6 ^ $id ))
- return
- }
-
- off2=$(( (0x$6 + $id) / 0x100 ))
- printf "%s:%s:%s:%s:%02x:%02x" \
- $1 $2 $3 $4 \
- $(( (0x$5 + $off2) % 0x100 )) \
- $(( (0x$6 + $id) % 0x100 ))
-}
-
-get_board_phy_name() (
- local path="$1"
- local fallback_phy=""
-
- __check_phy() {
- local val="$1"
- local key="$2"
- local ref_path="$3"
-
- json_select "$key"
- json_get_values path
- json_select ..
+ [ -n "$found" ] && return 0
- [ "${ref_path%+*}" = "$path" ] && fallback_phy=$key
- [ "$ref_path" = "$path" ] || return 0
-
- echo "$key"
- exit
- }
-
- json_load_file /etc/board.json
- json_for_each_item __check_phy wlan "$path"
- [ -n "$fallback_phy" ] && echo "${fallback_phy}.${path##*+}"
-)
-
-rename_board_phy_by_path() {
- local path="$1"
-
- local new_phy="$(get_board_phy_name "$path")"
- [ -z "$new_phy" -o "$new_phy" = "$phy" ] && return
-
- iw "$phy" set name "$new_phy" && phy="$new_phy"
-}
-
-rename_board_phy_by_name() (
- local phy="$1"
- local suffix="${phy##*.}"
- [ "$suffix" = "$phy" ] && suffix=
-
- json_load_file /etc/board.json
+ phy_path=
+ config_get phy "$device" phy
json_select wlan
- json_select "${phy%.*}" || return 0
- json_get_values path
-
- prev_phy="$(iwinfo nl80211 phyname "path=$path${suffix:++$suffix}")"
- [ -n "$prev_phy" ] || return 0
-
- [ "$prev_phy" = "$phy" ] && return 0
-
- iw "$prev_phy" set name "$phy"
-)
-
-find_phy() {
- [ -n "$phy" ] && {
- rename_board_phy_by_name "$phy"
- [ -d /sys/class/ieee80211/$phy ] && return 0
- }
- [ -n "$path" ] && {
- phy="$(iwinfo nl80211 phyname "path=$path")"
- [ -n "$phy" ] && {
- rename_board_phy_by_path "$path"
- return 0
- }
- }
- [ -n "$macaddr" ] && {
- for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
- grep -i -q "$macaddr" "/sys/class/ieee80211/${phy}/macaddress" && {
- path="$(iwinfo nl80211 path "$phy")"
- rename_board_phy_by_path "$path"
- return 0
- }
- done
- }
- return 1
-}
-
-mac80211_check_ap() {
- has_ap=1
-}
-
-mac80211_iw_interface_add() {
- local phy="$1"
- local ifname="$2"
- local type="$3"
- local wdsflag="$4"
- local rc
- local oldifname
-
- iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
- rc="$?"
-
- [ "$rc" = 233 ] && {
- # Device might have just been deleted, give the kernel some time to finish cleaning it up
- sleep 1
-
- iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
- rc="$?"
- }
-
- [ "$rc" = 233 ] && {
- # Keep matching pre-existing interface
- [ -d "/sys/class/ieee80211/${phy}/device/net/${ifname}" ] && \
- case "$(iw dev $ifname info | grep "^\ttype" | cut -d' ' -f2- 2>/dev/null)" in
- "AP")
- [ "$type" = "__ap" ] && rc=0
- ;;
- "IBSS")
- [ "$type" = "adhoc" ] && rc=0
- ;;
- "managed")
- [ "$type" = "managed" ] && rc=0
- ;;
- "mesh point")
- [ "$type" = "mp" ] && rc=0
- ;;
- "monitor")
- [ "$type" = "monitor" ] && rc=0
- ;;
- esac
- }
-
- [ "$rc" = 233 ] && {
- iw dev "$ifname" del >/dev/null 2>&1
- [ "$?" = 0 ] && {
- sleep 1
-
- iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
- rc="$?"
- }
- }
-
- [ "$rc" != 0 ] && {
- # Device might not support virtual interfaces, so the interface never got deleted in the first place.
- # Check if the interface already exists, and avoid failing in this case.
- [ -d "/sys/class/ieee80211/${phy}/device/net/${ifname}" ] && rc=0
- }
-
- [ "$rc" != 0 ] && {
- # Device doesn't support virtual interfaces and may have existing interface other than ifname.
- oldifname="$(basename "/sys/class/ieee80211/${phy}/device/net"/* 2>/dev/null)"
- [ "$oldifname" ] && ip link set "$oldifname" name "$ifname" 1>/dev/null 2>&1
- rc="$?"
- }
-
- [ "$rc" != 0 ] && echo "Failed to create interface $ifname"
- return $rc
-}
-
-mac80211_set_ifname() {
- local phy="$1"
- local prefix="$2"
- eval "ifname=\"$phy-$prefix\${idx_$prefix:-0}\"; idx_$prefix=\$((\${idx_$prefix:-0 } + 1))"
-}
-
-mac80211_prepare_vif() {
- json_select config
-
- json_get_vars ifname mode ssid wds powersave macaddr enable wpa_psk_file vlan_file
-
- [ -n "$ifname" ] || {
- local prefix;
-
- case "$mode" in
- ap|sta|mesh) prefix=$mode;;
- adhoc) prefix=ibss;;
- monitor) prefix=mon;;
- esac
-
- mac80211_set_ifname "$phy" "$prefix"
- }
-
- set_default wds 0
- set_default powersave 0
-
- json_select ..
-
- if [ -z "$macaddr" ]; then
- macaddr="$(mac80211_generate_mac $phy)"
- macidx="$(($macidx + 1))"
- elif [ "$macaddr" = 'random' ]; then
- macaddr="$(macaddr_random)"
- fi
-
- json_add_object data
- json_add_string ifname "$ifname"
- json_close_object
-
- [ "$mode" == "ap" ] && {
- [ -z "$wpa_psk_file" ] && hostapd_set_psk "$ifname"
- [ -z "$vlan_file" ] && hostapd_set_vlan "$ifname"
- }
-
- json_select config
-
- # It is far easier to delete and create the desired interface
- case "$mode" in
- adhoc)
- mac80211_iw_interface_add "$phy" "$ifname" adhoc || return
+ [ -n "$phy" ] && case "$phy" in
+ phy*)
+ [ -d /sys/class/ieee80211/$phy ] && \
+ phy_path="$(iwinfo nl80211 path "$dev")"
;;
- ap)
- # Hostapd will handle recreating the interface and
- # subsequent virtual APs belonging to the same PHY
- if [ -n "$hostapd_ctrl" ]; then
- type=bss
- else
- type=interface
+ *)
+ if json_is_a "$phy" object; then
+ json_select "$phy"
+ json_get_var phy_path path
+ json_select ..
+ elif json_is_a "${phy%.*}" object; then
+ json_select "${phy%.*}"
+ json_get_var phy_path path
+ json_select ..
+ phy_path="$phy_path+${phy##*.}"
fi
-
- mac80211_hostapd_setup_bss "$phy" "$ifname" "$macaddr" "$type" || return
-
- NEWAPLIST="${NEWAPLIST}$ifname "
- [ -n "$hostapd_ctrl" ] || {
- ap_ifname="${ifname}"
- hostapd_ctrl="${hostapd_ctrl:-/var/run/hostapd/$ifname}"
- }
- ;;
- mesh)
- mac80211_iw_interface_add "$phy" "$ifname" mp || return
- ;;
- monitor)
- mac80211_iw_interface_add "$phy" "$ifname" monitor || return
- ;;
- sta)
- local wdsflag=
- [ "$enable" = 0 ] || staidx="$(($staidx + 1))"
- [ "$wds" -gt 0 ] && wdsflag="4addr on"
- mac80211_iw_interface_add "$phy" "$ifname" managed "$wdsflag" || return
- if [ "$wds" -gt 0 ]; then
- iw "$ifname" set 4addr on
- else
- iw "$ifname" set 4addr off
- fi
- [ "$powersave" -gt 0 ] && powersave="on" || powersave="off"
- iw "$ifname" set power_save "$powersave"
;;
esac
-
- case "$mode" in
- monitor|mesh)
- [ "$auto_channel" -gt 0 ] || iw dev "$ifname" set channel "$channel" $iw_htmode
- ;;
- esac
-
- if [ "$mode" != "ap" ]; then
- # ALL ap functionality will be passed to hostapd
- # All interfaces must have unique mac addresses
- # which can either be explicitly set in the device
- # section, or automatically generated
- ip link set dev "$ifname" address "$macaddr"
- fi
-
json_select ..
-}
-
-mac80211_setup_supplicant() {
- local enable=$1
- local add_sp=0
- local spobj="$(ubus -S list | grep wpa_supplicant.${ifname})"
-
- [ "$enable" = 0 ] && {
- ubus call wpa_supplicant.${phy} config_remove "{\"iface\":\"$ifname\"}"
- ip link set dev "$ifname" down
- iw dev "$ifname" del
+ [ -n "$phy_path" ] || config_get phy_path "$device" path
+ [ -n "$path" -a "$phy_path" = "$path" ] && {
+ found=1
return 0
}
- wpa_supplicant_prepare_interface "$ifname" nl80211 || {
- iw dev "$ifname" del
- return 1
- }
- if [ "$mode" = "sta" ]; then
- wpa_supplicant_add_network "$ifname"
- else
- wpa_supplicant_add_network "$ifname" "$freq" "$htmode" "$noscan"
- fi
+ config_get dev_macaddr "$device" macaddr
- NEWSPLIST="${NEWSPLIST}$ifname "
+ [ -n "$macaddr" -a "$dev_macaddr" = "$macaddr" ] && found=1
- if [ "${NEWAPLIST%% *}" != "${OLDAPLIST%% *}" ]; then
- [ "$spobj" ] && ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
- add_sp=1
- fi
- [ -z "$spobj" ] && add_sp=1
-
- NEW_MD5_SP=$(test -e "${_config}" && md5sum ${_config})
- OLD_MD5_SP=$(uci -q -P /var/state get wireless._${phy}.md5_${ifname})
- if [ "$add_sp" = "1" ]; then
- wpa_supplicant_run "$ifname" "$hostapd_ctrl"
- else
- [ "${NEW_MD5_SP}" == "${OLD_MD5_SP}" ] || ubus call $spobj reload
- fi
- uci -q -P /var/state set wireless._${phy}.md5_${ifname}="${NEW_MD5_SP}"
return 0
}
-mac80211_setup_supplicant_noctl() {
- local enable=$1
- local spobj="$(ubus -S list | grep wpa_supplicant.${ifname})"
- wpa_supplicant_prepare_interface "$ifname" nl80211 || {
- iw dev "$ifname" del
- return 1
- }
- wpa_supplicant_add_network "$ifname" "$freq" "$htmode" "$noscan"
+__get_band_defaults() {
+ local phy="$1"
- NEWSPLIST="${NEWSPLIST}$ifname "
- [ "$enable" = 0 ] && {
- ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
- ip link set dev "$ifname" down
- return 0
- }
- if [ -z "$spobj" ]; then
- wpa_supplicant_run "$ifname"
- else
- ubus call $spobj reload
- fi
+ ( iw phy "$phy" info; echo ) | awk '
+BEGIN {
+ bands = ""
}
-mac80211_prepare_iw_htmode() {
- case "$htmode" in
- VHT20|HT20) iw_htmode=HT20;;
- HT40*|VHT40|VHT160)
- case "$band" in
- 2g)
- case "$htmode" in
- HT40+) iw_htmode="HT40+";;
- HT40-) iw_htmode="HT40-";;
- *)
- if [ "$channel" -lt 7 ]; then
- iw_htmode="HT40+"
- else
- iw_htmode="HT40-"
- fi
- ;;
- esac
- ;;
- *)
- case "$(( ($channel / 4) % 2 ))" in
- 1) iw_htmode="HT40+" ;;
- 0) iw_htmode="HT40-";;
- esac
- ;;
- esac
- [ "$auto_channel" -gt 0 ] && iw_htmode="HT40+"
- ;;
- VHT80)
- iw_htmode="80MHZ"
- ;;
- NONE|NOHT)
- iw_htmode="NOHT"
- ;;
- *) iw_htmode="" ;;
- esac
+($1 == "Band" || $1 == "") && band {
+ if (channel) {
+ mode="NOHT"
+ if (ht) mode="HT20"
+ if (vht && band != "1:") mode="VHT80"
+ if (he) mode="HE80"
+ if (he && band == "1:") mode="HE20"
+ sub("\\[", "", channel)
+ sub("\\]", "", channel)
+ bands = bands band channel ":" mode " "
+ }
+ band=""
}
-mac80211_setup_adhoc() {
- local enable=$1
- json_get_vars bssid ssid key mcast_rate
-
- NEWUMLIST="${NEWUMLIST}$ifname "
-
- [ "$enable" = 0 ] && {
- ip link set dev "$ifname" down
- return 0
- }
-
- keyspec=
- [ "$auth_type" = "wep" ] && {
- set_default key 1
- case "$key" in
- [1234])
- local idx
- for idx in 1 2 3 4; do
- json_get_var ikey "key$idx"
-
- [ -n "$ikey" ] && {
- ikey="$(($idx - 1)):$(prepare_key_wep "$ikey")"
- [ $idx -eq $key ] && ikey="d:$ikey"
- append keyspec "$ikey"
- }
- done
- ;;
- *)
- append keyspec "d:0:$(prepare_key_wep "$key")"
- ;;
- esac
- }
-
- brstr=
- for br in $basic_rate_list; do
- wpa_supplicant_add_rate brstr "$br"
- done
-
- mcval=
- [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
-
- iw dev "$ifname" set type ibss
- iw dev "$ifname" ibss join "$ssid" $freq $iw_htmode fixed-freq $bssid \
- beacon-interval $beacon_int \
- ${brstr:+basic-rates $brstr} \
- ${mcval:+mcast-rate $mcval} \
- ${keyspec:+keys $keyspec}
+$1 == "Band" {
+ band = $2
+ channel = ""
+ vht = ""
+ ht = ""
+ he = ""
}
-mac80211_setup_mesh() {
- local enable=$1
- json_get_vars ssid mesh_id mcast_rate
-
- NEWUMLIST="${NEWUMLIST}$ifname "
-
- [ "$enable" = 0 ] && {
- ip link set dev "$ifname" down
- return 0
- }
-
- mcval=
- [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
- [ -n "$mesh_id" ] && ssid="$mesh_id"
-
- iw dev "$ifname" mesh join "$ssid" freq $freq $iw_htmode \
- ${mcval:+mcast-rate $mcval} \
- beacon-interval $beacon_int
+$0 ~ "Capabilities:" {
+ ht=1
}
-mac80211_setup_vif() {
- local name="$1"
- local failed
- local action=up
-
- json_select data
- json_get_vars ifname
- json_select ..
-
- json_select config
- json_get_vars mode
- json_get_var vif_txpower
- json_get_var vif_enable enable 1
-
- [ "$vif_enable" = 1 ] || action=down
- if [ "$mode" != "ap" ] || [ "$ifname" = "$ap_ifname" ]; then
- ip link set dev "$ifname" "$action" || {
- wireless_setup_vif_failed IFUP_ERROR
- json_select ..
- return
- }
- [ -z "$vif_txpower" ] || iw dev "$ifname" set txpower fixed "${vif_txpower%%.*}00"
- fi
-
- case "$mode" in
- mesh)
- wireless_vif_parse_encryption
- [ -z "$htmode" ] && htmode="NOHT";
- if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ] || chan_is_dfs "$phy" "$channel"; then
- mac80211_setup_supplicant $vif_enable || failed=1
- else
- mac80211_setup_mesh $vif_enable
- fi
- for var in $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING; do
- json_get_var mp_val "$var"
- [ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
- done
- ;;
- adhoc)
- wireless_vif_parse_encryption
- if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ]; then
- mac80211_setup_supplicant_noctl $vif_enable || failed=1
- else
- mac80211_setup_adhoc $vif_enable
- fi
- ;;
- sta)
- mac80211_setup_supplicant $vif_enable || failed=1
- ;;
- esac
-
- json_select ..
- [ -n "$failed" ] || wireless_add_vif "$name" "$ifname"
+$0 ~ "VHT Capabilities" {
+ vht=1
}
-get_freq() {
- local phy="$1"
- local channel="$2"
- local band="$3"
-
- case "$band" in
- 2g) band="1:";;
- 5g) band="2:";;
- 60g) band="3:";;
- 6g) band="4:";;
- esac
-
- iw "$phy" info | awk -v band="$band" -v channel="[$channel]" '
-
-$1 ~ /Band/ {
- band_match = band == $2
+$0 ~ "HE Iftypes" {
+ he=1
}
-band_match && $3 == "MHz" && $4 == channel {
- print $2
- exit
-}
-'
+$1 == "*" && $3 == "MHz" && $0 !~ /disabled/ && band && !channel {
+ channel = $4
}
+END {
+ print bands
+}'
+}
-chan_is_dfs() {
+get_band_defaults() {
local phy="$1"
- local chan="$2"
- iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep -q "MHz.*radar detection"
- return $!
-}
-mac80211_vap_cleanup() {
- local service="$1"
- local vaps="$2"
+ for c in $(__get_band_defaults "$phy"); do
+ local band="${c%%:*}"
+ c="${c#*:}"
+ local chan="${c%%:*}"
+ c="${c#*:}"
+ local mode="${c%%:*}"
- for wdev in $vaps; do
- [ "$service" != "none" ] && ubus call ${service} config_remove "{\"iface\":\"$wdev\"}"
- ip link set dev "$wdev" down 2>/dev/null
- iw dev "$wdev" del
- done
-}
+ case "$band" in
+ 1) band=2g;;
+ 2) band=5g;;
+ 3) band=60g;;
+ 4) band=6g;;
+ *) band="";;
+ esac
-mac80211_interface_cleanup() {
- local phy="$1"
- local primary_ap=$(uci -q -P /var/state get wireless._${phy}.aplist)
- primary_ap=${primary_ap%% *}
+ [ -n "$band" ] || continue
+ [ -n "$mode_band" -a "$band" = "6g" ] && return
- mac80211_vap_cleanup hostapd "${primary_ap}"
- mac80211_vap_cleanup wpa_supplicant "$(uci -q -P /var/state get wireless._${phy}.splist)"
- mac80211_vap_cleanup none "$(uci -q -P /var/state get wireless._${phy}.umlist)"
+ mode_band="$band"
+ channel="$chan"
+ htmode="$mode"
+ done
}
-mac80211_set_noscan() {
- hostapd_noscan=1
+check_devidx() {
+ case "$1" in
+ radio[0-9]*)
+ local idx="${1#radio}"
+ [ "$devidx" -ge "${1#radio}" ] && devidx=$((idx + 1))
+ ;;
+ esac
}
-drv_mac80211_cleanup() {
- hostapd_common_cleanup
-}
+check_board_phy() {
+ local name="$2"
-drv_mac80211_setup() {
- json_select config
- json_get_vars \
- phy macaddr path \
- country chanbw distance \
- txpower antenna_gain \
- rxantenna txantenna \
- frag rts beacon_int:100 htmode
- json_get_values basic_rate_list basic_rate
- json_get_values scan_list scan_list
+ json_select "$name"
+ json_get_var phy_path path
json_select ..
- find_phy || {
- echo "Could not find PHY for device '$1'"
- wireless_set_retry 0
- return 1
- }
-
- wireless_set_data phy="$phy"
- [ -z "$(uci -q -P /var/state show wireless._${phy})" ] && uci -q -P /var/state set wireless._${phy}=phy
-
- OLDAPLIST=$(uci -q -P /var/state get wireless._${phy}.aplist)
- OLDSPLIST=$(uci -q -P /var/state get wireless._${phy}.splist)
- OLDUMLIST=$(uci -q -P /var/state get wireless._${phy}.umlist)
-
- local wdev
- local cwdev
- local found
-
- for wdev in $(list_phy_interfaces "$phy"); do
- found=0
- for cwdev in $OLDAPLIST $OLDSPLIST $OLDUMLIST; do
- if [ "$wdev" = "$cwdev" ]; then
- found=1
- break
- fi
- done
- if [ "$found" = "0" ]; then
- ip link set dev "$wdev" down
- iw dev "$wdev" del
- fi
- done
-
- # convert channel to frequency
- [ "$auto_channel" -gt 0 ] || freq="$(get_freq "$phy" "$channel" "$band")"
-
- [ -n "$country" ] && {
- iw reg get | grep -q "^country $country:" || {
- iw reg set "$country"
- sleep 1
- }
- }
-
- hostapd_conf_file="/var/run/hostapd-$phy.conf"
-
- no_ap=1
- macidx=0
- staidx=0
-
- [ -n "$chanbw" ] && {
- for file in /sys/kernel/debug/ieee80211/$phy/ath9k*/chanbw /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode; do
- [ -f "$file" ] && echo "$chanbw" > "$file"
- done
- }
-
- set_default rxantenna 0xffffffff
- set_default txantenna 0xffffffff
- set_default distance 0
- set_default antenna_gain 0
-
- [ "$txantenna" = "all" ] && txantenna=0xffffffff
- [ "$rxantenna" = "all" ] && rxantenna=0xffffffff
-
- iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1
- iw phy "$phy" set antenna_gain $antenna_gain >/dev/null 2>&1
- iw phy "$phy" set distance "$distance" >/dev/null 2>&1
-
- if [ -n "$txpower" ]; then
- iw phy "$phy" set txpower fixed "${txpower%%.*}00"
- else
- iw phy "$phy" set txpower auto
+ if [ "$path" = "$phy_path" ]; then
+ board_dev="$name"
+ elif [ "${path%+*}" = "$phy_path" ]; then
+ fallback_board_dev="$name.${path#*+}"
fi
+}
- [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
- [ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
+detect_mac80211() {
+ devidx=0
+ config_load wireless
+ config_foreach check_devidx wifi-device
- has_ap=
- hostapd_ctrl=
- ap_ifname=
- hostapd_noscan=
- for_each_interface "ap" mac80211_check_ap
+ json_load_file /etc/board.json
- rm -f "$hostapd_conf_file"
+ for _dev in /sys/class/ieee80211/*; do
+ [ -e "$_dev" ] || continue
- for_each_interface "sta adhoc mesh" mac80211_set_noscan
- [ -n "$has_ap" ] && mac80211_hostapd_setup_base "$phy"
+ dev="${_dev##*/}"
- mac80211_prepare_iw_htmode
- for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif
- NEWAPLIST=
- for_each_interface "ap" mac80211_prepare_vif
- NEW_MD5=$(test -e "${hostapd_conf_file}" && md5sum ${hostapd_conf_file})
- OLD_MD5=$(uci -q -P /var/state get wireless._${phy}.md5)
- if [ "${NEWAPLIST}" != "${OLDAPLIST}" ]; then
- mac80211_vap_cleanup hostapd "${OLDAPLIST}"
- fi
- [ -n "${NEWAPLIST}" ] && mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap
- local add_ap=0
- local primary_ap=${NEWAPLIST%% *}
- [ -n "$hostapd_ctrl" ] && {
- local no_reload=1
- if [ -n "$(ubus list | grep hostapd.$primary_ap)" ]; then
- no_reload=0
- [ "${NEW_MD5}" = "${OLD_MD5}" ] || {
- ubus call hostapd.$primary_ap reload
- no_reload=$?
- if [ "$no_reload" != "0" ]; then
- mac80211_vap_cleanup hostapd "${OLDAPLIST}"
- mac80211_vap_cleanup wpa_supplicant "$(uci -q -P /var/state get wireless._${phy}.splist)"
- mac80211_vap_cleanup none "$(uci -q -P /var/state get wireless._${phy}.umlist)"
- sleep 2
- mac80211_iw_interface_add "$phy" "${NEWAPLIST%% *}" __ap
- for_each_interface "sta adhoc mesh monitor" mac80211_prepare_vif
- fi
- }
- fi
- if [ "$no_reload" != "0" ]; then
- add_ap=1
- ubus wait_for hostapd
- local hostapd_res="$(ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}")"
- ret="$?"
- [ "$ret" != 0 -o -z "$hostapd_res" ] && {
- wireless_setup_failed HOSTAPD_START_FAILED
- return
- }
- wireless_add_process "$(jsonfilter -s "$hostapd_res" -l 1 -e @.pid)" "/usr/sbin/hostapd" 1 1
- fi
- }
- uci -q -P /var/state set wireless._${phy}.aplist="${NEWAPLIST}"
- uci -q -P /var/state set wireless._${phy}.md5="${NEW_MD5}"
+ mode_band=""
+ channel=""
+ htmode=""
+ ht_capab=""
- [ "${add_ap}" = 1 ] && sleep 1
- for_each_interface "ap" mac80211_setup_vif
+ get_band_defaults "$dev"
- NEWSPLIST=
- NEWUMLIST=
+ path="$(iwinfo nl80211 path "$dev")"
+ macaddr="$(cat /sys/class/ieee80211/${dev}/macaddress)"
- for_each_interface "sta adhoc mesh monitor" mac80211_setup_vif
+ # work around phy rename related race condition
+ [ -n "$path" -o -n "$macaddr" ] || continue
- uci -q -P /var/state set wireless._${phy}.splist="${NEWSPLIST}"
- uci -q -P /var/state set wireless._${phy}.umlist="${NEWUMLIST}"
+ board_dev=
+ fallback_board_dev=
+ json_for_each_item check_board_phy wlan
+ [ -n "$board_dev" ] || board_dev="$fallback_board_dev"
+ [ -n "$board_dev" ] && dev="$board_dev"
- local foundvap
- local dropvap=""
- for oldvap in $OLDSPLIST; do
- foundvap=0
- for newvap in $NEWSPLIST; do
- [ "$oldvap" = "$newvap" ] && foundvap=1
- done
- [ "$foundvap" = "0" ] && dropvap="$dropvap $oldvap"
- done
- [ -n "$dropvap" ] && mac80211_vap_cleanup wpa_supplicant "$dropvap"
- wireless_set_up
-}
+ found=
+ config_foreach check_mac80211_device wifi-device "$path" "$macaddr"
+ [ -n "$found" ] && continue
-_list_phy_interfaces() {
- local phy="$1"
- if [ -d "/sys/class/ieee80211/${phy}/device/net" ]; then
- ls "/sys/class/ieee80211/${phy}/device/net" 2>/dev/null;
- else
- ls "/sys/class/ieee80211/${phy}/device" 2>/dev/null | grep net: | sed -e 's,net:,,g'
- fi
-}
+ name="radio${devidx}"
+ devidx=$(($devidx + 1))
+ case "$dev" in
+ phy*)
+ if [ -n "$path" ]; then
+ dev_id="set wireless.${name}.path='$path'"
+ else
+ dev_id="set wireless.${name}.macaddr='$macaddr'"
+ fi
+ ;;
+ *)
+ dev_id="set wireless.${name}.phy='$dev'"
+ ;;
+ esac
-list_phy_interfaces() {
- local phy="$1"
+ uci -q batch <<-EOF
+ set wireless.${name}=wifi-device
+ set wireless.${name}.type=mac80211
+ ${dev_id}
+ set wireless.${name}.channel=${channel}
+ set wireless.${name}.band=${mode_band}
+ set wireless.${name}.htmode=$htmode
+ set wireless.${name}.disabled=1
- for dev in $(_list_phy_interfaces "$phy"); do
- readlink "/sys/class/net/${dev}/phy80211" | grep -q "/${phy}\$" || continue
- echo "$dev"
+ set wireless.default_${name}=wifi-iface
+ set wireless.default_${name}.device=${name}
+ set wireless.default_${name}.network=lan
+ set wireless.default_${name}.mode=ap
+ set wireless.default_${name}.ssid=OpenWrt
+ set wireless.default_${name}.encryption=none
+EOF
+ uci -q commit wireless
done
}
-
-drv_mac80211_teardown() {
- json_select data
- json_get_vars phy
- json_select ..
- [ -n "$phy" ] || {
- echo "Bug: PHY is undefined for device '$1'"
- return 1
- }
-
- mac80211_interface_cleanup "$phy"
- uci -q -P /var/state revert wireless._${phy}
-}
-
-add_driver mac80211
diff --git a/recipes-wifi/hostapd/files/patches-2.10.3/993-2023-10-28-ACS-Fix-typo-in-bw_40-frequency-array.patch b/recipes-wifi/hostapd/files/patches-2.10.3/993-2023-10-28-ACS-Fix-typo-in-bw_40-frequency-array.patch
new file mode 100644
index 0000000..948c51b
--- /dev/null
+++ b/recipes-wifi/hostapd/files/patches-2.10.3/993-2023-10-28-ACS-Fix-typo-in-bw_40-frequency-array.patch
@@ -0,0 +1,25 @@
+From 7a733993211ad46cf3032038c1e7e6bdc2322336 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Tue, 5 Sep 2023 09:43:25 +0800
+Subject: [PATCH] ACS: Fix typo in bw_40 frequency array
+
+The range for the 5 GHz channel 118 was encoded with an incorrect
+channel number.
+
+Fixes: ed8e13decc71 (ACS: Extract bw40/80/160 freqs out of acs_usable_bwXXX_chan())
+Signed-off-by: Michael Lee <michael-cy.lee@mediatek.com>
+---
+ src/ap/acs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/ap/acs.c
++++ b/src/ap/acs.c
+@@ -256,7 +256,7 @@ struct bw_item {
+ static const struct bw_item bw_40[] = {
+ { 5180, 5200, 38 }, { 5220, 5240, 46 }, { 5260, 5280, 54 },
+ { 5300, 5320, 62 }, { 5500, 5520, 102 }, { 5540, 5560, 110 },
+- { 5580, 5600, 110 }, { 5620, 5640, 126}, { 5660, 5680, 134 },
++ { 5580, 5600, 118 }, { 5620, 5640, 126 }, { 5660, 5680, 134 },
+ { 5700, 5720, 142 }, { 5745, 5765, 151 }, { 5785, 5805, 159 },
+ { 5825, 5845, 167 }, { 5865, 5885, 175 },
+ { 5955, 5975, 3 }, { 5995, 6015, 11 }, { 6035, 6055, 19 },
diff --git a/recipes-wifi/hostapd/files/patches-2.10.3/patches.inc b/recipes-wifi/hostapd/files/patches-2.10.3/patches.inc
index 8ad0077..325e353 100644
--- a/recipes-wifi/hostapd/files/patches-2.10.3/patches.inc
+++ b/recipes-wifi/hostapd/files/patches-2.10.3/patches.inc
@@ -62,6 +62,7 @@
file://990-ctrl-make-WNM_AP-functions-dependant-on-CONFIG_AP.patch \
file://991-Fix-OpenWrt-13156.patch \
file://992-nl80211-add-extra-ies-only-if-allowed-by-driver.patch \
+ file://993-2023-10-28-ACS-Fix-typo-in-bw_40-frequency-array.patch \
file://mtk-0001-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch \
file://mtk-0002-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch \
file://mtk-0003-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch \
diff --git a/recipes-wifi/hostapd/files/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch b/recipes-wifi/hostapd/files/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch
index 82b66f4..4e24ba6 100644
--- a/recipes-wifi/hostapd/files/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch
+++ b/recipes-wifi/hostapd/files/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch
@@ -1,19 +1,19 @@
-From 018d87d5b9b53b3e630032bf2cb7e6eaeae09d71 Mon Sep 17 00:00:00 2001
+From 22adaf9edb6e4e60dbe5c7cc8366c08b8141571f Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Wed, 15 Nov 2023 15:06:00 +0800
-Subject: [PATCH 47/49] hostapd: mtk: add support for channel switching to dfs
- with csa sent
+Subject: [PATCH] hostapd: mtk: add support for channel switching to dfs with
+ csa sent
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
hostapd/ctrl_iface.c | 26 ++------------------------
src/ap/beacon.c | 5 +++++
- src/ap/dfs.c | 16 ++++++++++++----
+ src/ap/dfs.c | 18 ++++++++++++++----
src/ap/ieee802_11.c | 5 +++++
- 4 files changed, 24 insertions(+), 28 deletions(-)
+ 4 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
-index b521a08..0afa6a2 100644
+index b0117e5..96b593a 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -2747,7 +2747,6 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface,
@@ -73,7 +73,7 @@
if (ieee802_11_build_ap_params(hapd, ¶ms) < 0)
diff --git a/src/ap/dfs.c b/src/ap/dfs.c
-index 80d3605..012050c 100644
+index 80d3605..d490032 100644
--- a/src/ap/dfs.c
+++ b/src/ap/dfs.c
@@ -1255,10 +1255,10 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
@@ -90,21 +90,23 @@
/*
* When background radar is enabled but the CAC completion
-@@ -1272,6 +1272,13 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
+@@ -1272,6 +1272,15 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq,
} else if (hostapd_dfs_is_background_event(iface, freq)) {
iface->radar_background.cac_started = 0;
hostpad_dfs_update_background_chain(iface);
+ } else {
+ int i;
+
-+ iface->cac_started = 0;
++ /* If interface is already setup, clear cac_started flag to avoid re-setup */
++ if (iface->state == HAPD_IFACE_ENABLED)
++ iface->cac_started = 0;
+ /* Clear all CSA flags once channel switch to DFS channel fails */
+ for (i = 0; i < iface->num_bss; i++)
+ iface->bss[i]->csa_in_progress = 0;
}
return 0;
-@@ -1646,7 +1653,8 @@ int hostapd_dfs_start_cac(struct hostapd_iface *iface, int freq,
+@@ -1646,7 +1655,8 @@ int hostapd_dfs_start_cac(struct hostapd_iface *iface, int freq,
} else {
/* This is called when the driver indicates that an offloaded
* DFS has started CAC. */
diff --git a/recipes-wifi/hostapd/files/patches/mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch b/recipes-wifi/hostapd/files/patches/mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch
new file mode 100644
index 0000000..d6f13f1
--- /dev/null
+++ b/recipes-wifi/hostapd/files/patches/mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch
@@ -0,0 +1,284 @@
+From cc04411d78f2569cc235e0f5620b3476091a1af1 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Thu, 14 Dec 2023 14:42:58 +0800
+Subject: [PATCH 1/2] hostapd: mtk: add support for removeing the main BSS
+
+The first hostapd_data/i802_bss are important to hostapd since many
+operations/events are directly operated on the first BSS.
+(such as iface->bss[0], drv->first_bss, etc)
+
+To remove the main BSS, the 1st and 2nd hostapd_data/i802_bss are
+switched, then the new 2nd hostapd_data/i802_bss are removed as it is
+done to remove BSS other than the first one.
+
+This patch add the new command to remove the BSS (including the first
+one):
+$ hostapd_cli -i global raw REMOVE_BSS <ifname>
+
+Note that if the command is used in OpenWrt, an additional step is
+needed:
+update the "aplist" in /var/state/wireless according to the removed ifname
+Therefore the "wifi" command can work normally.
+
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 14 ++++++
+ src/ap/ap_drv_ops.h | 10 +++++
+ src/ap/hostapd.c | 85 +++++++++++++++++++++++++++++++++++-
+ src/ap/hostapd.h | 1 +
+ src/drivers/driver.h | 2 +
+ src/drivers/driver_nl80211.c | 43 ++++++++++++++++++
+ 6 files changed, 153 insertions(+), 2 deletions(-)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 6552bc4..650af3b 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -5028,6 +5028,17 @@ static int hostapd_ctrl_iface_add(struct hapd_interfaces *interfaces,
+ }
+
+
++static int hostapd_ctrl_bss_remove(struct hapd_interfaces *interfaces,
++ char *buf)
++{
++ if (hostapd_remove_bss(interfaces, buf) < 0) {
++ wpa_printf(MSG_ERROR, "Removing interface %s failed", buf);
++ return -1;
++ }
++ return 0;
++}
++
++
+ static int hostapd_ctrl_iface_remove(struct hapd_interfaces *interfaces,
+ char *buf)
+ {
+@@ -5444,6 +5455,9 @@ static void hostapd_global_ctrl_iface_receive(int sock, void *eloop_ctx,
+ } else if (os_strncmp(buf, "REMOVE ", 7) == 0) {
+ if (hostapd_ctrl_iface_remove(interfaces, buf + 7) < 0)
+ reply_len = -1;
++ } else if (os_strncmp(buf, "REMOVE_BSS ", 11) == 0) {
++ if (hostapd_ctrl_bss_remove(interfaces, buf + 11) < 0)
++ reply_len = -1;
+ } else if (os_strcmp(buf, "ATTACH") == 0) {
+ if (hostapd_global_ctrl_iface_attach(interfaces, &from,
+ fromlen, NULL))
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 2a89b99..95db664 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -310,6 +310,16 @@ static inline const char * hostapd_drv_get_radio_name(struct hostapd_data *hapd)
+ return hapd->driver->get_radio_name(hapd->drv_priv);
+ }
+
++static inline int hostapd_drv_move_bss_to_first(struct hostapd_data *hapd,
++ const char *ifname)
++{
++ if (hapd->driver == NULL || hapd->driver->move_bss_to_first == NULL ||
++ hapd->drv_priv == NULL)
++ return -1;
++
++ return hapd->driver->move_bss_to_first(hapd->drv_priv, ifname);
++}
++
+ static inline int hostapd_drv_switch_channel(struct hostapd_data *hapd,
+ struct csa_settings *settings)
+ {
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 250c168..7f58354 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -3297,7 +3297,35 @@ fail:
+ }
+
+
+-static int hostapd_remove_bss(struct hostapd_iface *iface, unsigned int idx)
++int hostapd_move_bss_to_first(struct hostapd_iface *iface, int idx)
++{
++ struct hostapd_data *target_hapd, *first_hapd;
++
++ if (idx == 0 || idx >= iface->num_bss)
++ return -1;
++
++ target_hapd = iface->bss[idx];
++ first_hapd = iface->bss[0];
++ if (hostapd_drv_move_bss_to_first(first_hapd, target_hapd->conf->iface))
++ return -1;
++
++ iface->bss[0] = target_hapd;
++ iface->bss[idx] = first_hapd;
++ iface->conf->bss[0] = iface->bss[0]->conf;
++ iface->conf->bss[idx] = iface->bss[idx]->conf;
++
++ first_hapd->interface_added = 1;
++ target_hapd->interface_added = 0;
++
++ if (idx == iface->num_bss - 1)
++ iface->conf->last_bss = iface->bss[idx]->conf;
++
++ return 0;
++}
++
++
++static int hostapd_remove_bss_by_idx(struct hostapd_iface *iface,
++ unsigned int idx)
+ {
+ size_t i;
+
+@@ -3331,6 +3359,59 @@ static int hostapd_remove_bss(struct hostapd_iface *iface, unsigned int idx)
+ }
+
+
++int hostapd_remove_bss(struct hapd_interfaces *interfaces, char *buf)
++{
++ struct hostapd_iface *hapd_iface;
++ size_t i, j, k = 0;
++ int ret;
++
++ for (i = 0; i < interfaces->count; i++) {
++ hapd_iface = interfaces->iface[i];
++ if (hapd_iface == NULL)
++ return -1;
++
++ if (!os_strcmp(hapd_iface->conf->bss[0]->iface, buf)) {
++ if (hapd_iface->conf->num_bss == 1) {
++ wpa_printf(MSG_INFO, "Remove interface '%s'", buf);
++ hapd_iface->driver_ap_teardown =
++ !!(hapd_iface->drv_flags &
++ WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
++
++ hostapd_interface_deinit_free(hapd_iface);
++ k = i;
++ while (k < (interfaces->count - 1)) {
++ interfaces->iface[k] =
++ interfaces->iface[k + 1];
++ k++;
++ }
++ interfaces->count--;
++ return 0;
++ } else {
++ wpa_printf(MSG_INFO, "Switch interface to %s",
++ hapd_iface->bss[1]->conf->iface);
++
++ ret = hostapd_move_bss_to_first(hapd_iface, 1);
++ if (ret < 0) {
++ wpa_printf(MSG_ERROR,
++ "Interface switch failed");
++ return ret;
++ }
++ }
++ }
++
++ for (j = 0; j < hapd_iface->conf->num_bss; j++) {
++ if (!os_strcmp(hapd_iface->conf->bss[j]->iface, buf)) {
++ hapd_iface->driver_ap_teardown =
++ !(hapd_iface->drv_flags &
++ WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
++ return hostapd_remove_bss_by_idx(hapd_iface, j);
++ }
++ }
++ }
++ return -1;
++}
++
++
+ int hostapd_remove_iface(struct hapd_interfaces *interfaces, char *buf)
+ {
+ struct hostapd_iface *hapd_iface;
+@@ -3362,7 +3443,7 @@ int hostapd_remove_iface(struct hapd_interfaces *interfaces, char *buf)
+ hapd_iface->driver_ap_teardown =
+ !(hapd_iface->drv_flags &
+ WPA_DRIVER_FLAGS_AP_TEARDOWN_SUPPORT);
+- return hostapd_remove_bss(hapd_iface, j);
++ return hostapd_remove_bss_by_idx(hapd_iface, j);
+ }
+ }
+ }
+diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
+index 3b51050..824a24a 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -701,6 +701,7 @@ void hostapd_bss_deinit_no_free(struct hostapd_data *hapd);
+ void hostapd_free_hapd_data(struct hostapd_data *hapd);
+ void hostapd_cleanup_iface_partial(struct hostapd_iface *iface);
+ int hostapd_add_iface(struct hapd_interfaces *ifaces, char *buf);
++int hostapd_remove_bss(struct hapd_interfaces *ifaces, char *buf);
+ int hostapd_remove_iface(struct hapd_interfaces *ifaces, char *buf);
+ void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator);
+ void hostapd_set_state(struct hostapd_iface *iface, enum hostapd_iface_state s);
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 01281a1..ab19794 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -3185,6 +3185,8 @@ struct wpa_driver_ops {
+ */
+ void (*hapd_deinit)(void *priv);
+
++ int (*move_bss_to_first)(void *priv, const char *ifname);
++
+ /**
+ * set_ieee8021x - Enable/disable IEEE 802.1X support (AP only)
+ * @priv: Private driver interface data
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index e744a18..cef502f 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -7986,6 +7986,48 @@ static void i802_deinit(void *priv)
+ wpa_driver_nl80211_deinit(bss);
+ }
+
++static int i802_move_bss_to_first(void *priv, const char *ifname)
++{
++ struct i802_bss *bss = priv;
++ struct i802_bss *first_bss, *target_bss, *prev_bss, *tmp_bss;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++
++ if (!os_strcmp(bss->ifname, ifname)) {
++ wpa_printf(MSG_ERROR, "nl80211: BSS is already the first one");
++ return -1;
++ }
++
++ prev_bss = drv->first_bss;
++ target_bss = drv->first_bss->next;
++ while (target_bss) {
++ if (!os_strcmp(target_bss->ifname, ifname))
++ break;
++
++ prev_bss = target_bss;
++ target_bss = target_bss->next;
++ }
++
++ if (!target_bss) {
++ wpa_printf(MSG_ERROR, "nl80211: Failed to find the target BSS");
++ return -1;
++ }
++
++ first_bss = drv->first_bss;
++ drv->first_bss = target_bss;
++ prev_bss->next = first_bss;
++
++ tmp_bss = first_bss->next;
++ first_bss->next = target_bss->next;
++ target_bss->next = tmp_bss;
++
++ memcpy(drv->perm_addr, drv->first_bss->addr, ETH_ALEN);
++ drv->ifindex = if_nametoindex(drv->first_bss->ifname);
++ drv->ctx = drv->first_bss->ctx;
++
++ first_bss->added_if = 1;
++ target_bss->added_if = 0;
++ return 0;
++}
+
+ static enum nl80211_iftype wpa_driver_nl80211_if_type(
+ enum wpa_driver_if_type type)
+@@ -13433,6 +13475,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .sta_set_airtime_weight = driver_nl80211_sta_set_airtime_weight,
+ .hapd_init = i802_init,
+ .hapd_deinit = i802_deinit,
++ .move_bss_to_first = i802_move_bss_to_first,
+ .set_wds_sta = i802_set_wds_sta,
+ .get_seqnum = i802_get_seqnum,
+ .flush = i802_flush,
+--
+2.25.1
+
diff --git a/recipes-wifi/hostapd/files/patches/mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch b/recipes-wifi/hostapd/files/patches/mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch
new file mode 100644
index 0000000..dd9795a
--- /dev/null
+++ b/recipes-wifi/hostapd/files/patches/mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch
@@ -0,0 +1,248 @@
+From be968a6aeea80dca7661e59e0ab5db32341cadb8 Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Mon, 18 Dec 2023 11:35:34 +0800
+Subject: [PATCH 2/2] hostapd: mtk: add support for enable/disable single BSS
+
+Enabling or disabling single BSS mean that the beacon of the BSS is
+enabled or disabled.
+
+When the BSS is disabled, the following statements are true:
+1. the events or packets from the driver are all ignored.
+2. Per radio functions (ex. channel switch, color change) will not
+ execute for the BSS, but are finished by other enabling BSS(es).
+ The changed parameters take effect when the BSS is enabled again.
+3. Enabling the BSS will not reload the configuration. In other word,
+ if the configuration changes during the BSS disabling, the BSS needs
+ to be removed and added again, not just be enabled.
+
+This patch add new commands to enable/disable single BSS:
+$ hostapd_cli -i <ifname> enable_bss
+$ hostapd_cli -i <ifname> disable_bss
+
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+---
+ hostapd/ctrl_iface.c | 26 ++++++++++++++++++++
+ hostapd/hostapd_cli.c | 18 ++++++++++++++
+ src/ap/hostapd.c | 39 ++++++++++++++++++++++++++++++
+ src/ap/hostapd.h | 2 ++
+ src/drivers/driver_nl80211.c | 11 +++++++++
+ src/drivers/driver_nl80211_event.c | 6 +++++
+ 6 files changed, 102 insertions(+)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index 650af3b..a980c0b 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -1590,6 +1590,16 @@ static int hostapd_ctrl_iface_get(struct hostapd_data *hapd, char *cmd,
+ }
+
+
++static int hostapd_ctrl_iface_enable_bss(struct hostapd_data *hapd)
++{
++ if (hostapd_enable_bss(hapd) < 0) {
++ wpa_printf(MSG_ERROR, "Enabling of BSS failed");
++ return -1;
++ }
++ return 0;
++}
++
++
+ static int hostapd_ctrl_iface_enable(struct hostapd_iface *iface)
+ {
+ if (hostapd_enable_iface(iface) < 0) {
+@@ -1610,6 +1620,16 @@ static int hostapd_ctrl_iface_reload(struct hostapd_iface *iface)
+ }
+
+
++static int hostapd_ctrl_iface_disable_bss(struct hostapd_data *hapd)
++{
++ if (hostapd_disable_bss(hapd) < 0) {
++ wpa_printf(MSG_ERROR, "Disabling of BSS failed");
++ return -1;
++ }
++ return 0;
++}
++
++
+ static int hostapd_ctrl_iface_disable(struct hostapd_iface *iface)
+ {
+ if (hostapd_disable_iface(iface) < 0) {
+@@ -4196,6 +4216,9 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "GET ", 4) == 0) {
+ reply_len = hostapd_ctrl_iface_get(hapd, buf + 4, reply,
+ reply_size);
++ } else if (os_strncmp(buf, "ENABLE_BSS", 10) == 0) {
++ if (hostapd_ctrl_iface_enable_bss(hapd))
++ reply_len = -1;
+ } else if (os_strncmp(buf, "ENABLE", 6) == 0) {
+ if (hostapd_ctrl_iface_enable(hapd->iface))
+ reply_len = -1;
+@@ -4205,6 +4228,9 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ } else if (os_strncmp(buf, "RELOAD", 6) == 0) {
+ if (hostapd_ctrl_iface_reload(hapd->iface))
+ reply_len = -1;
++ } else if (os_strncmp(buf, "DISABLE_BSS", 11) == 0) {
++ if (hostapd_ctrl_iface_disable_bss(hapd))
++ reply_len = -1;
+ } else if (os_strncmp(buf, "DISABLE", 7) == 0) {
+ if (hostapd_ctrl_iface_disable(hapd->iface))
+ reply_len = -1;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 0c4a176..c8f0566 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1215,6 +1215,13 @@ static int hostapd_cli_cmd_enable(struct wpa_ctrl *ctrl, int argc,
+ }
+
+
++static int hostapd_cli_cmd_enable_bss(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return wpa_ctrl_command(ctrl, "ENABLE_BSS");
++}
++
++
+ static int hostapd_cli_cmd_reload(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+ {
+@@ -1229,6 +1236,13 @@ static int hostapd_cli_cmd_disable(struct wpa_ctrl *ctrl, int argc,
+ }
+
+
++static int hostapd_cli_cmd_disable_bss(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return wpa_ctrl_command(ctrl, "DISABLE_BSS");
++}
++
++
+ static int hostapd_cli_cmd_update_beacon(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+ {
+@@ -1731,10 +1745,14 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ " = send vendor driver command" },
+ { "enable", hostapd_cli_cmd_enable, NULL,
+ "= enable hostapd on current interface" },
++ { "enable_bss", hostapd_cli_cmd_enable_bss, NULL,
++ "= enable hostapd on current BSS" },
+ { "reload", hostapd_cli_cmd_reload, NULL,
+ "= reload configuration for current interface" },
+ { "disable", hostapd_cli_cmd_disable, NULL,
+ "= disable hostapd on current interface" },
++ { "disable_bss", hostapd_cli_cmd_disable_bss, NULL,
++ "= disable hostapd on current BSS" },
+ { "update_beacon", hostapd_cli_cmd_update_beacon, NULL,
+ "= update Beacon frame contents\n"},
+ { "erp_flush", hostapd_cli_cmd_erp_flush, NULL,
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index 7f58354..8b4fc4e 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -3297,6 +3297,42 @@ fail:
+ }
+
+
++int hostapd_enable_bss(struct hostapd_data *hapd)
++{
++ if (hapd->beacon_set_done)
++ return 0;
++
++ if (hapd->conf->bss_load_update_period && bss_load_update_init(hapd)) {
++ wpa_printf(MSG_ERROR, "BSS Load initialization failed");
++ return -1;
++ }
++ return ieee802_11_set_beacon(hapd);
++}
++
++
++int hostapd_disable_bss(struct hostapd_data *hapd)
++{
++ struct hostapd_iface *iface = hapd->iface;
++ int i, remain_bss = 0;
++
++ if (!hapd->beacon_set_done)
++ return 0;
++
++ for (i = 0; i < iface->num_bss; i++)
++ remain_bss += iface->bss[i]->beacon_set_done ? 1 : 0;
++
++ if (remain_bss == 1) {
++ wpa_printf(MSG_ERROR, "Cannot disable last BSS");
++ return -1;
++ }
++
++ hapd->beacon_set_done = 0;
++ bss_load_update_deinit(hapd);
++ hostapd_bss_deinit_no_free(hapd);
++ return hostapd_drv_stop_ap(hapd);
++}
++
++
+ int hostapd_move_bss_to_first(struct hostapd_iface *iface, int idx)
+ {
+ struct hostapd_data *target_hapd, *first_hapd;
+@@ -3905,6 +3941,9 @@ int hostapd_switch_channel(struct hostapd_data *hapd,
+ {
+ int ret;
+
++ if (!hapd->beacon_set_done)
++ return 0;
++
+ if (!(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_AP_CSA)) {
+ wpa_printf(MSG_INFO, "CSA is not supported");
+ return -1;
+diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
+index 824a24a..88ff1ca 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -701,6 +701,8 @@ void hostapd_bss_deinit_no_free(struct hostapd_data *hapd);
+ void hostapd_free_hapd_data(struct hostapd_data *hapd);
+ void hostapd_cleanup_iface_partial(struct hostapd_iface *iface);
+ int hostapd_add_iface(struct hapd_interfaces *ifaces, char *buf);
++int hostapd_enable_bss(struct hostapd_data *hapd);
++int hostapd_disable_bss(struct hostapd_data *hapd);
+ int hostapd_remove_bss(struct hapd_interfaces *ifaces, char *buf);
+ int hostapd_remove_iface(struct hapd_interfaces *ifaces, char *buf);
+ void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator);
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index cef502f..8e8e194 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -4693,6 +4693,17 @@ static int wpa_driver_nl80211_set_ap(void *priv,
+ wpa_printf(MSG_DEBUG, "nl80211: dtim_period=%d", params->dtim_period);
+ wpa_printf(MSG_DEBUG, "nl80211: ssid=%s",
+ wpa_ssid_txt(params->ssid, params->ssid_len));
++
++ if (!beacon_set) {
++ /* update wdev->preset_chandef in MAC80211 */
++ ret = nl80211_set_channel(bss, params->freq, 1);
++ if (ret) {
++ wpa_printf(MSG_ERROR,
++ "nl80211: Frequency set failed: %d (%s)",
++ ret, strerror(-ret));
++ }
++ }
++
+ if (!(msg = nl80211_bss_msg(bss, 0, cmd)) ||
+ nla_put(msg, NL80211_ATTR_BEACON_HEAD, params->head_len,
+ params->head) ||
+diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
+index 585d207..6600c9c 100644
+--- a/src/drivers/driver_nl80211_event.c
++++ b/src/drivers/driver_nl80211_event.c
+@@ -1094,6 +1094,12 @@ static void mlme_event(struct i802_bss *bss,
+ return;
+ }
+
++ if (is_ap_interface(drv->nlmode) && !bss->beacon_set) {
++ wpa_printf(MSG_DEBUG,
++ "nl80211: drop BSS Event due to disabled BSS");
++ return;
++ }
++
+ if (frame == NULL) {
+ wpa_printf(MSG_DEBUG,
+ "nl80211: MLME event %d (%s) without frame data",
+--
+2.25.1
+
diff --git a/recipes-wifi/hostapd/files/patches/mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch b/recipes-wifi/hostapd/files/patches/mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
new file mode 100644
index 0000000..1099ef2
--- /dev/null
+++ b/recipes-wifi/hostapd/files/patches/mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
@@ -0,0 +1,44 @@
+From 7f442586bbff0c7b6aca157237b442291b90116b Mon Sep 17 00:00:00 2001
+From: Michael-CY Lee <michael-cy.lee@mediatek.com>
+Date: Tue, 23 Jan 2024 10:52:57 +0800
+Subject: [PATCH] hostapd: mtk: ACS: remove chan/freq list check when scan
+ request and factor calculation
+
+Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
+---
+ src/ap/acs.c | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/src/ap/acs.c b/src/ap/acs.c
+index e4871921f..089d9c5f4 100644
+--- a/src/ap/acs.c
++++ b/src/ap/acs.c
+@@ -590,12 +590,6 @@ static void acs_survey_mode_interference_factor(
+ iface->conf->acs_exclude_dfs)
+ continue;
+
+- if (!is_in_chanlist(iface, chan))
+- continue;
+-
+- if (!is_in_freqlist(iface, chan))
+- continue;
+-
+ if (chan->max_tx_power < iface->conf->min_tx_power)
+ continue;
+
+@@ -1327,12 +1321,6 @@ static int * acs_request_scan_add_freqs(struct hostapd_iface *iface,
+ iface->conf->acs_exclude_dfs))
+ continue;
+
+- if (!is_in_chanlist(iface, chan))
+- continue;
+-
+- if (!is_in_freqlist(iface, chan))
+- continue;
+-
+ if (chan->max_tx_power < iface->conf->min_tx_power)
+ continue;
+
+--
+2.25.1
+
diff --git a/recipes-wifi/hostapd/files/patches/mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch b/recipes-wifi/hostapd/files/patches/mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch
new file mode 100644
index 0000000..e99e2a3
--- /dev/null
+++ b/recipes-wifi/hostapd/files/patches/mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch
@@ -0,0 +1,240 @@
+From e621aacd1eb69668a8e9176b4cd09125394d2fb8 Mon Sep 17 00:00:00 2001
+From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
+Date: Wed, 24 Jan 2024 15:15:26 +0800
+Subject: [PATCH] hostapd: mtk: add no_beacon vendor command for cert
+
+Add the vendor command to disable/enable beacon
+
+[Usage]
+hostapd_cli -i <interface> no_beacon <value>
+ <value>
+ 0: enable beacon
+ 1: disable beacon
+---
+ hostapd/ctrl_iface.c | 18 +++++++++++++++++
+ hostapd/hostapd_cli.c | 7 +++++++
+ src/ap/ap_drv_ops.c | 7 +++++++
+ src/ap/ap_drv_ops.h | 1 +
+ src/common/mtk_vendor.h | 12 +++++++++++
+ src/drivers/driver.h | 7 +++++++
+ src/drivers/driver_nl80211.c | 33 +++++++++++++++++++++++++++++++
+ src/drivers/driver_nl80211.h | 1 +
+ src/drivers/driver_nl80211_capa.c | 3 +++
+ 9 files changed, 89 insertions(+)
+
+diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
+index bacf14c..c662417 100644
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -4034,6 +4034,22 @@ hostapd_ctrl_iface_set_offchan_ctrl(struct hostapd_data *hapd, char *cmd,
+ return os_snprintf(buf, buflen, "OK\n");
+ }
+
++static int
++hostapd_ctrl_iface_disable_beacon(struct hostapd_data *hapd, char *value,
++ char *buf, size_t buflen)
++{
++ int disable_beacon = atoi(value);
++
++ if (disable_beacon < 0) {
++ wpa_printf(MSG_ERROR, "Invalid value for beacon ctrl");
++ return -1;
++ }
++
++ if (hostapd_drv_beacon_ctrl(hapd, !disable_beacon) == 0)
++ return os_snprintf(buf, buflen, "OK\n");
++ else
++ return -1;
++}
+
+ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ char *buf, char *reply,
+@@ -4615,6 +4631,8 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
+ reply, reply_size);
+ } else if (os_strncmp(buf, "SET_OFFCHAN_CTRL", 16) == 0) {
+ reply_len = hostapd_ctrl_iface_set_offchan_ctrl(hapd, buf + 16, reply, reply_size);
++ } else if (os_strncmp(buf, "NO_BEACON ", 10) == 0) {
++ reply_len = hostapd_ctrl_iface_disable_beacon(hapd, buf + 10, reply, reply_size);
+ } else {
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ reply_len = 16;
+diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
+index 0c4a176..60e963a 100644
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -1393,6 +1393,11 @@ static int hostapd_cli_cmd_get_mu(struct wpa_ctrl *ctrl, int argc,
+ return hostapd_cli_cmd(ctrl, "GET_MU", 0, NULL, NULL);
+ }
+
++static int hostapd_cli_cmd_disable_beacon(struct wpa_ctrl *ctrl, int argc,
++ char *argv[])
++{
++ return hostapd_cli_cmd(ctrl, "NO_BEACON", 1, argc, argv);
++}
+
+ #ifdef CONFIG_DPP
+
+@@ -1762,6 +1767,8 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
+ "<value> [0-15] bitmap- UL MU-MIMO(bit3), DL MU-MIMO(bit2), UL OFDMA(bit1), DL OFDMA(bit0)"},
+ { "get_mu", hostapd_cli_cmd_get_mu, NULL,
+ " = show mu onoff value in 0-15 bitmap"},
++ { "no_beacon", hostapd_cli_cmd_disable_beacon, NULL,
++ "<value> 0: Enable beacon, 1: Disable beacon"},
+ #ifdef CONFIG_DPP
+ { "dpp_qr_code", hostapd_cli_cmd_dpp_qr_code, NULL,
+ "report a scanned DPP URI from a QR Code" },
+diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
+index a060f5c..b1f7c92 100644
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -1143,3 +1143,10 @@ int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_
+ return 0;
+ return hapd->driver->amnt_dump(hapd->drv_priv, amnt_idx, amnt_dump_buf);
+ }
++
++int hostapd_drv_beacon_ctrl(struct hostapd_data *hapd, u8 beacon_mode)
++{
++ if (!hapd->driver || !hapd->driver->beacon_ctrl)
++ return 0;
++ return hapd->driver->beacon_ctrl(hapd->drv_priv, beacon_mode);
++}
+diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
+index 5f11a57..c5fdb00 100644
+--- a/src/ap/ap_drv_ops.h
++++ b/src/ap/ap_drv_ops.h
+@@ -158,6 +158,7 @@ int hostapd_drv_ap_trig_type(struct hostapd_data *hapd, u8 enable, u8 type);
+
+ int hostapd_drv_amnt_set(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_sta_mac);
+ int hostapd_drv_amnt_dump(struct hostapd_data *hapd, u8 amnt_idx, u8 *amnt_dump_buf);
++int hostapd_drv_beacon_ctrl(struct hostapd_data *hapd, u8 beacon_mode);
+
+ #include "drivers/driver.h"
+
+diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
+index 21e735f..c7ed8e8 100644
+--- a/src/common/mtk_vendor.h
++++ b/src/common/mtk_vendor.h
+@@ -16,6 +16,7 @@ enum mtk_nl80211_vendor_subcmds {
+ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8,
+ MTK_NL80211_VENDOR_SUBCMD_IBF_CTRL = 0xc9,
+ MTK_NL80211_VENDOR_SUBCMD_BSS_COLOR_CTRL = 0xca,
++ MTK_NL80211_VENDOR_SUBCMD_BEACON_CTRL = 0xcd,
+ MTK_NL80211_VENDOR_SUBCMD_TXPOWER_CTRL = 0xce,
+ };
+
+@@ -253,6 +254,17 @@ enum mtk_vendor_attr_txpower_ctrl {
+ NUM_MTK_VENDOR_ATTRS_TXPOWER_CTRL - 1
+ };
+
++enum mtk_vendor_attr_beacon_ctrl {
++ MTK_VENDOR_ATTR_BEACON_CTRL_UNSPEC,
++
++ MTK_VENDOR_ATTR_BEACON_CTRL_MODE,
++
++ /* keep last */
++ NUM_MTK_VENDOR_ATTRS_BEACON_CTRL,
++ MTK_VENDOR_ATTR_BEACON_CTRL_MAX =
++ NUM_MTK_VENDOR_ATTRS_BEACON_CTRL - 1
++};
++
+ #define CSI_MAX_COUNT 256
+ #define ETH_ALEN 6
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index 0e3934e..f420464 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -4749,6 +4749,13 @@ struct wpa_driver_ops {
+ int (*mu_ctrl)(void *priv, u8 mode, u8 val);
+ int (*mu_dump)(void *priv, u8 *mu_onoff);
+
++ /**
++ * beacon_ctrl - ctrl on off for beacon
++ * @priv: Private driver interface data
++ *
++ */
++ int (*beacon_ctrl)(void *priv, u8 beacon_mode);
++
+ /**
+ * three_wire_ctrl - set three_wire_ctrl mode
+ * @priv: Private driver interface data
+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
+index c8720bb..a1ce671 100644
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -12565,6 +12565,38 @@ static int nl80211_mu_dump(void *priv, u8 *mu_onoff)
+ }
+ #endif /* CONFIG_IEEE80211AX */
+
++static int nl80211_beacon_ctrl(void *priv, u8 beacon_mode)
++{
++ struct i802_bss *bss = priv;
++ struct wpa_driver_nl80211_data *drv = bss->drv;
++ struct nl_msg *msg;
++ struct nlattr *data;
++ int ret;
++
++ if (!drv->mtk_beacon_ctrl_vendor_cmd_avail) {
++ wpa_printf(MSG_ERROR,
++ "nl80211: Driver does not support setting beacon control");
++ return 0;
++ }
++
++ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
++ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_BEACON_CTRL) ||
++ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
++ nla_put_u8(msg, MTK_VENDOR_ATTR_BEACON_CTRL_MODE, beacon_mode)) {
++ nlmsg_free(msg);
++ return -ENOBUFS;
++ }
++
++ nla_nest_end(msg, data);
++
++ ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
++
++ if (ret)
++ wpa_printf(MSG_ERROR, "Failed to set beacon_ctrl. ret=%d (%s)", ret, strerror(-ret));
++
++ return ret;
++}
+
+ #ifdef CONFIG_DPP
+ static int nl80211_dpp_listen(void *priv, bool enable)
+@@ -13586,6 +13618,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+ .set_4addr_mode = nl80211_set_4addr_mode,
+ .mu_ctrl = nl80211_mu_ctrl,
+ .mu_dump = nl80211_mu_dump,
++ .beacon_ctrl = nl80211_beacon_ctrl,
+ #ifdef CONFIG_DPP
+ .dpp_listen = nl80211_dpp_listen,
+ #endif /* CONFIG_DPP */
+diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
+index 640fdc5..53cf2be 100644
+--- a/src/drivers/driver_nl80211.h
++++ b/src/drivers/driver_nl80211.h
+@@ -190,6 +190,7 @@ struct wpa_driver_nl80211_data {
+ unsigned int mtk_rfeatures_vendor_cmd_avail:1;
+ unsigned int mtk_amnt_vendor_cmd_avail:1;
+ unsigned int mtk_txpower_vendor_cmd_avail:1;
++ unsigned int mtk_beacon_ctrl_vendor_cmd_avail:1;
+
+ u64 vendor_scan_cookie;
+ u64 remain_on_chan_cookie;
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 004c452..d13a64c 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -1103,6 +1103,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ case MTK_NL80211_VENDOR_SUBCMD_TXPOWER_CTRL:
+ drv->mtk_txpower_vendor_cmd_avail = 1;
+ break;
++ case MTK_NL80211_VENDOR_SUBCMD_BEACON_CTRL :
++ drv->mtk_beacon_ctrl_vendor_cmd_avail = 1;
++ break;
+ }
+ }
+
+--
+2.18.0
+
diff --git a/recipes-wifi/hostapd/files/patches/patches.inc b/recipes-wifi/hostapd/files/patches/patches.inc
index 5268b34..73393d2 100644
--- a/recipes-wifi/hostapd/files/patches/patches.inc
+++ b/recipes-wifi/hostapd/files/patches/patches.inc
@@ -116,5 +116,9 @@
file://mtk-0048-hostapd-mtk-add-support-for-channel-switching-with-c.patch \
file://mtk-0049-hostapd-mtk-Add-DFS-offchan-channel-switch.patch \
file://mtk-0050-hostapd-mtk-Add-txpower-vendor-command.patch \
+ file://mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch \
file://mtk-0051-hostapd-mtk-Update-Wide-Bandwidth-Channel-Switch-element.patch \
+ file://mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch \
+ file://mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch \
+ file://mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch \
"
diff --git a/recipes-wifi/hostapd/files/wifi-detect.uc b/recipes-wifi/hostapd/files/wifi-detect.uc
new file mode 100644
index 0000000..5f37588
--- /dev/null
+++ b/recipes-wifi/hostapd/files/wifi-detect.uc
@@ -0,0 +1,155 @@
+#!/usr/bin/env ucode
+'use strict';
+import { readfile, writefile, realpath, glob, basename, unlink, open, rename } from "fs";
+import { is_equal } from "/usr/share/hostap/common.uc";
+let nl = require("nl80211");
+
+let board_file = "/etc/board.json";
+let prev_board_data = json(readfile(board_file));
+let board_data = json(readfile(board_file));
+
+function phy_idx(name) {
+ return +rtrim(readfile(`/sys/class/ieee80211/${name}/index`));
+}
+
+function phy_path(name) {
+ let devpath = realpath(`/sys/class/ieee80211/${name}/device`);
+
+ devpath = replace(devpath, /^\/sys\/devices\//, "");
+ if (match(devpath, /^platform\/.*\/pci/))
+ devpath = replace(devpath, /^platform\//, "");
+ let dev_phys = map(glob(`/sys/class/ieee80211/${name}/device/ieee80211/*`), basename);
+ sort(dev_phys, (a, b) => phy_idx(a) - phy_idx(b));
+
+ let ofs = index(dev_phys, name);
+ if (ofs > 0)
+ devpath += `+${ofs}`;
+
+ return devpath;
+}
+
+function cleanup() {
+ let wlan = board_data.wlan;
+
+ for (let name in wlan)
+ if (substr(name, 0, 3) == "phy")
+ delete wlan[name];
+ else
+ delete wlan[name].info;
+}
+
+function wiphy_get_entry(phy, path) {
+ board_data.wlan ??= {};
+
+ let wlan = board_data.wlan;
+ for (let name in wlan)
+ if (wlan[name].path == path)
+ return wlan[name];
+
+ wlan[phy] = {
+ path: path
+ };
+
+ return wlan[phy];
+}
+
+function wiphy_detect() {
+ let phys = nl.request(nl.const.NL80211_CMD_GET_WIPHY, nl.const.NLM_F_DUMP, { split_wiphy_dump: true });
+ if (!phys)
+ return;
+
+ for (let phy in phys) {
+ let name = phy.wiphy_name;
+ let path = phy_path(name);
+ let info = {
+ antenna_rx: phy.wiphy_antenna_avail_rx,
+ antenna_tx: phy.wiphy_antenna_avail_tx,
+ bands: {},
+ };
+
+ let bands = info.bands;
+ for (let band in phy.wiphy_bands) {
+ if (!band || !band.freqs)
+ continue;
+ let freq = band.freqs[0].freq;
+ let band_info = {};
+ let band_name;
+ if (freq > 50000)
+ band_name = "60G";
+ else if (freq > 5900)
+ band_name = "6G";
+ else if (freq > 4000)
+ band_name = "5G";
+ else
+ band_name = "2G";
+ bands[band_name] = band_info;
+ if (band.ht_capa > 0)
+ band_info.ht = true;
+ if (band.vht_capa > 0)
+ band_info.vht = true;
+ let he_phy_cap = 0;
+
+ for (let ift in band.iftype_data) {
+ if (!ift.he_cap_phy)
+ continue;
+
+ band_info.he = true;
+ he_phy_cap |= ift.he_cap_phy[0];
+ /* TODO: EHT */
+ }
+
+ if (band_name != "2G" &&
+ (he_phy_cap & 0x18) || ((band.vht_capa >> 2) & 0x3))
+ band_info.max_width = 160;
+ else if (band_name != "2G" &&
+ (he_phy_cap & 4) || band.vht_capa > 0)
+ band_info.max_width = 80;
+ else if ((band.ht_capa & 0x2) || (he_phy_cap & 0x2))
+ band_info.max_width = 40;
+ else
+ band_info.max_width = 20;
+
+ let modes = band_info.modes = [ "NOHT" ];
+ if (band_info.ht)
+ push(modes, "HT20");
+ if (band_info.vht)
+ push(modes, "VHT20");
+ if (band_info.he)
+ push(modes, "HE20");
+ if (band.ht_capa & 0x2) {
+ push(modes, "HT40");
+ if (band_info.vht)
+ push(modes, "VHT40")
+ }
+ if (he_phy_cap & 0x2)
+ push(modes, "HE40");
+
+ if (band_name == "2G")
+ continue;
+ if (band_info.vht)
+ push(modes, "VHT80");
+ if (he_phy_cap & 4)
+ push(modes, "HE80");
+ if ((band.vht_capa >> 2) & 0x3)
+ push(modes, "VHT160");
+ if (he_phy_cap & 0x18)
+ push(modes, "HE160");
+ }
+
+ let entry = wiphy_get_entry(name, path);
+ entry.info = info;
+ }
+}
+
+cleanup();
+wiphy_detect();
+if (!is_equal(prev_board_data, board_data)) {
+ let new_file = board_file + ".new";
+ unlink(new_file);
+ let f = open(new_file, "wx");
+ if (!f)
+ exit(1);
+ f.write(sprintf("%.J\n", board_data));
+ f.close();
+ rename(new_file, board_file);
+}