modules/admin-core: define size constraints for psk in wireless schema

[project/luci.git] / modules / admin-core / root / lib / uci / schema / default / wireless

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index c449850..845706a 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -27,49 +27,49 @@ config variable
        option title 'Channel'
 
 config variable
-       option name 'mode'
+       option name 'hwmode'
        option section 'wireless.wifi-device'
        option title 'Mode (atheros)'
        option type enum
        list depends type=atheros
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value ''
        option title 'auto'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11b'
        option title '802.11b'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11g'
        option title '802.11g'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11a'
        option title '802.11a'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11bg'
        option title '802.11b+g'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11gdt'
        option title '802.11adt'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value '11adt'
        option title '802.11adt'
 
 config enum
-       option variable 'wireless.wifi-device.mode'
+       option variable 'wireless.wifi-device.hwmode'
        option value 'fh'
        option title 'Frequency Hopping'
 
@@ -81,6 +81,13 @@ config variable
        list depends type=atheros
 
 config variable
+       option name 'txpower'
+       option section 'wireless.wifi-device'
+       option title 'Transmit Power'
+       option description 'dbm'
+       option datatype uint
+
+config variable
        option name 'txantenna'
        option section 'wireless.wifi-device'
        option title 'Transmitter Antenna'
@@ -97,14 +104,6 @@ config variable
        list depends type=broadcom
 
 config variable
-       option name 'txpower'
-       option section 'wireless.wifi-device'
-       option title 'Transmit Power (broadcom)'
-       option description 'dbm'
-       option datatype uint
-       list depends type=broadcom
-
-config variable
        option name 'distance'
        option section 'wireless.wifi-device'
        option title 'Distance Optimization (atheros, broadcom)'
@@ -221,15 +220,20 @@ config enum
        option value 'wds'
        option title 'WDS'
 
+config enum
+       option variable 'wireless.wifi-iface.mode'
+       option value 'mesh'
+       option title 'Mesh (802.11s)'
+
 config variable
        option name 'bssid'
        option section 'wireless.wifi-iface'
-       option title BSSID
+       option title 'BSSID'
 
 config variable
        option name 'txpower'
        option section 'wireless.wifi-iface'
-       option title 'Transmit Power (mac80211, atheros)'
+       option title 'Transmit Power'
        option description 'dbm'
        option datatype uint
 
@@ -289,6 +293,24 @@ config variable
        option datatype boolean
 
 config variable
+       option name 'sw_merge'
+       option section 'wireless.wifi-iface'
+       option title 'Disable Ad-Hoc HW beacon timer (atheros)'
+       option datatype boolean
+
+config variable
+       option name 'nosbeacon'
+       option section 'wireless.wifi-iface'
+       option title 'Disable station HW beacon timer (atheros)'
+       option datatype boolean
+
+config variable
+       option name 'probereq'
+       option section 'wireless.wifi-iface'
+       option title 'Disable probe responses (atheros)'
+       option datatype boolean
+
+config variable
        option name 'macpolicy'
        option section 'wireless.wifi-iface'
        option title 'MAC-Address Filter (atheros)'
@@ -431,11 +453,15 @@ config variable
        option name 'key'
        option section 'wireless.wifi-iface'
        option title 'Key'
+       option minlength 8
+       option maxlength 63
        list depends 'encryption=wep'
        list depends 'encryption=psk'
        list depends 'encryption=wpa,mode=ap'
        list depends 'encryption=psk2'
        list depends 'encryption=wpa2i,mode=ap'
+       list depends 'encryption=psk+psk2'
+       list depends 'encryption=mixed'
 
 config variable
        option name 'nasid'