From 37770c503ba764e632a149d92de0d1af1292c6eb Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 28 Sep 2025 16:20:43 +0200 Subject: [PATCH] wifi-scripts: force wmm_enabled to 1 in AP mode, remove option 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 --- .../usr/share/schema/wireless.wifi-iface.json | 9 --------- .../wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc | 5 +++-- .../config/wifi-scripts/files/lib/netifd/hostapd.sh | 7 +++---- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json index bb651052da..b2e7181489 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json @@ -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" diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc index c959adcdd0..7cbd70c39e 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc @@ -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', ]); } diff --git a/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh b/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh index 32987edfe5..c41efd4f60 100644 --- a/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh +++ b/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh @@ -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" -- 2.30.2