scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-02 03:17:48 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

wifi-ax: enable fils_discovery and multiple_ssid by default on 6g band

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2022-05-12 11:51:06 +02:00
parent 770a2bdd36
commit b35232ab4a
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
feeds/wifi-ax/hostapd/files/hostapd.sh
View File

@@ -154,6 +154,8 @@ hostapd_prepare_device_config() {
set_default ema 0 set_default ema 0
set_default acs_exclude_dfs 0 set_default acs_exclude_dfs 0
[ "$band" = "6g" ] && multiple_bssid=1
[ -n "$country" ] && { [ -n "$country" ] && {
append base_cfg "country_code=$country" "$N" append base_cfg "country_code=$country" "$N"
[ -n "$country3" ] && append base_cfg "country3=$country3" "$N" [ -n "$country3" ] && append base_cfg "country3=$country3" "$N"

14
feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@@ -84,6 +84,8 @@ drv_mac80211_init_iface_config() {
config_add_int dtim_period config_add_int dtim_period
config_add_int start_disabled config_add_int start_disabled
config_add_int fils_discovery_max_interval
# mesh # mesh
config_add_string mesh_id config_add_string mesh_id
config_add_int $MP_CONFIG_INT config_add_int $MP_CONFIG_INT
@@ -488,9 +490,11 @@ mac80211_hostapd_setup_bss() {
hostapd_set_bss_options hostapd_cfg "$phy" "$vif" || return 1 hostapd_set_bss_options hostapd_cfg "$phy" "$vif" || return 1
json_get_vars wds wds_bridge dtim_period max_listen_int start_disabled json_get_vars wds wds_bridge dtim_period max_listen_int start_disabled
json_get_vars fils_discovery_max_interval
set_default wds 0 set_default wds 0
set_default start_disabled 0 set_default start_disabled 0
set_default fils_discovery_max_interval 0
[ "$wds" -gt 0 ] && { [ "$wds" -gt 0 ] && {
append hostapd_cfg "wds_sta=1" "$N" append hostapd_cfg "wds_sta=1" "$N"
@@ -498,6 +502,14 @@ mac80211_hostapd_setup_bss() {
} }
[ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N" [ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
[ "$band" = "6g" ] && {
if [ "$fils_discovery_max_interval" -gt 0 ] && [ "$fils_discovery_max_interval" -le 20 ]; then
append hostapd_cfg "fils_discovery_max_interval=$fils_discovery_max_interval" "$N"
else
append hostapd_cfg "fils_discovery_max_interval=20" "$N"
fi
}
cat >> /var/run/hostapd-$phy.conf <<EOF cat >> /var/run/hostapd-$phy.conf <<EOF
$hostapd_cfg $hostapd_cfg
bssid=$macaddr bssid=$macaddr
@@ -1049,6 +1061,8 @@ drv_mac80211_setup() {
wireless_set_retry 0 wireless_set_retry 0
return 1 return 1
} }
[ "$band" = "6g" ] && multiple_bssid=1
wireless_set_data phy="$phy" wireless_set_data phy="$phy"
[ -z "$(uci -q -P /var/state show wireless._${phy})" ] && uci -q -P /var/state set wireless._${phy}=phy [ -z "$(uci -q -P /var/state show wireless._${phy})" ] && uci -q -P /var/state set wireless._${phy}=phy