catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

wifi-scripts: force wmm_enabled to 1 in AP mode, remove option

Browse Source 
There are no supported drivers where it even makes sense to disable WMM
anymore, since so much depends on it.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2025-09-28 16:20:43 +02:00
parent 9b7d0c0d16
commit 37770c503b
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
View File

@ -1077,15 +1077,6 @@
"description": "If bridge parameter is set, the WDS STA interface will be added to the same bridge by default",
"type": "boolean"
},
"wmm": {
"type": "alias",
"default": "wmm_enabled"
},
"wmm_enabled": {
"description": "Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e)",
"type": "boolean",
"default": true
},
"wnm_sleep_mode": {
"description": "WNM-Sleep Mode (extended sleep mode for stations)",
"type": "boolean"

5
package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
View File

@ -45,6 +45,7 @@ function iface_setup(config) {
append('bssid', config.macaddr);
config.ssid2 = config.ssid;
config.wmm_enabled = 1;
append_string_vars(config, [ 'ssid2' ]);
append_vars(config, [
@ -53,9 +54,9 @@ function iface_setup(config) {
'disassoc_low_ack', 'skip_inactivity_poll', 'ignore_broadcast_ssid', 'uapsd_advertisement_enabled',
'utf8_ssid', 'multi_ap', 'tdls_prohibit', 'bridge', 'wds_sta', 'wds_bridge',
'snoop_iface', 'vendor_elements', 'nas_identifier', 'radius_acct_interim_interval',
'ocv', 'multicast_to_unicast', 'preamble', 'wmm_enabled', 'proxy_arp', 'per_sta_vif', 'mbo',
'ocv', 'multicast_to_unicast', 'preamble', 'proxy_arp', 'per_sta_vif', 'mbo',
'bss_transition', 'wnm_sleep_mode', 'wnm_sleep_mode_no_keys', 'qos_map_set', 'max_listen_int',
'dtim_period',
'dtim_period', 'wmm_enabled',
]);
}

7
package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
View File

@ -273,7 +273,7 @@ EOF
hostapd_common_add_bss_config() {
config_add_string 'bssid:macaddr' 'ssid:string'
config_add_boolean wds wmm uapsd hidden utf8_ssid ppsk
config_add_boolean wds uapsd hidden utf8_ssid ppsk
config_add_int maxassoc max_inactivity
config_add_boolean disassoc_low_ack isolate short_preamble skip_inactivity_poll
@ -546,7 +546,7 @@ hostapd_set_bss_options() {
maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \
wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
macfilter ssid utf8_ssid wmm uapsd hidden short_preamble rsn_preauth \
macfilter ssid utf8_ssid uapsd hidden short_preamble rsn_preauth \
iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
acct_secret acct_port acct_interval \
bss_load_update_period chan_util_avg_period sae_require_mfp sae_pwe \
@ -565,7 +565,6 @@ hostapd_set_bss_options() {
set_default disassoc_low_ack 1
set_default skip_inactivity_poll 0
set_default hidden 0
set_default wmm 1
set_default uapsd 1
set_default wpa_disable_eapol_key_retries 0
set_default tdls_prohibit 0
@ -603,7 +602,7 @@ hostapd_set_bss_options() {
append bss_conf "disassoc_low_ack=$disassoc_low_ack" "$N"
append bss_conf "skip_inactivity_poll=$skip_inactivity_poll" "$N"
append bss_conf "preamble=$short_preamble" "$N"
append bss_conf "wmm_enabled=$wmm" "$N"
append bss_conf "wmm_enabled=1" "$N"
append bss_conf "ignore_broadcast_ssid=$hidden" "$N"
append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
append bss_conf "utf8_ssid=$utf8_ssid" "$N"