summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOldřich Jedlička2025-09-01 21:57:33 +0000
committerFelix Fietkau2025-09-02 07:33:19 +0000
commit1756dddb9f849dabc025197780d9b72db0dbb6b1 (patch)
tree5ab25c117dc4010e1b2c8445dbaf0dfac0942cbb
parent2146f5c31fcdd414620e8b4c6db05d8368019d90 (diff)
downloadopenwrt-1756dddb9f849dabc025197780d9b72db0dbb6b1.tar.gz
wifi-scripts: ucode: fix dynamic_vlan value handling
The dynamic_vlan has values 0 (disabled), 1 (optional) and 2 (required). Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
-rw-r--r--package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json6
-rw-r--r--package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc1
2 files changed, 4 insertions, 3 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 de1962c14e..d7efe47516 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
@@ -293,8 +293,10 @@
"type": "boolean"
},
"dynamic_vlan": {
- "description": "Allow RADIUS authentication server to decide which VLAN is used for the stations",
- "type": "boolean"
+ "description": "Allow RADIUS authentication server to decide which VLAN is used for the stations (0 = disabled, 1 = optional, 2 = required)",
+ "type": "number",
+ "enum": [ 0, 1, 2 ],
+ "default": 0
},
"eap_reauth_period": {
"description": "EAP reauthentication period in seconds",
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 bbd907c234..6ae53df377 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
@@ -131,7 +131,6 @@ function iface_auth_type(config) {
set_default(config, 'wpa_psk_file', `/var/run/hostapd-${config.ifname}.psk`);
touch_file(config.wpa_psk_file);
- set_default(config, 'dynamic_vlan', 0);
break;
case 'eap':