[PATCH] Change fast frames option from value to flag type

[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 85532a1..7e72049 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 'hwmode'
+       option name 'mode'
        option section 'wireless.wifi-device'
        option title 'Mode (atheros)'
        option type enum
        list depends type=atheros
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value ''
        option title 'auto'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value '11b'
        option title '802.11b'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value '11g'
        option title '802.11g'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value '11a'
        option title '802.11a'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value '11bg'
        option title '802.11b+g'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value '11gdt'
        option title '802.11adt'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value '11adt'
        option title '802.11adt'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value 'fh'
        option title 'Frequency Hopping'
 
@@ -220,6 +220,11 @@ 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'
@@ -372,6 +377,7 @@ config variable
        option name 'ff'
        option section 'wireless.wifi-iface'
        option title 'Fast Frames (atheros)'
+       option datatype boolean
 
 config variable
        option name 'wmm'
@@ -425,7 +431,7 @@ config enum
 
 config enum
        option variable 'wireless.wifi-iface.encryption'
-       option value 'wpa2i'
+       option value 'wpa2'
        option title 'WPA2-EAP'
 
 config variable
@@ -433,7 +439,7 @@ config variable
        option section 'wireless.wifi-iface'
        option title 'RadiusServer'
        list depends 'encryption=wpa,mode=ap'
-       list depends 'encryption=wpa2i,mode=ap'
+       list depends 'encryption=wpa2,mode=ap'
        option datatype host
 
 config variable
@@ -441,25 +447,29 @@ config variable
        option section 'wireless.wifi-iface'
        option title 'Radius-Port'
        list depends 'encryption=wpa,mode=ap'
-       list depends 'encryption=wpa2i,mode=ap'
+       list depends 'encryption=wpa2,mode=ap'
        option datatype port
 
 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=wpa2,mode=ap'
+       list depends 'encryption=psk+psk2'
+       list depends 'encryption=mixed'
 
 config variable
        option name 'nasid'
        option section 'wireless.wifi-iface'
        option title 'NAS ID'
        list depends 'encryption=wpa,mode=ap'
-       list depends 'encryption=wpa2i,mode=ap'
+       list depends 'encryption=wpa2,mode=ap'
 
 config variable
        option name 'eap_type'
@@ -467,7 +477,7 @@ config variable
        option title 'EAP-Method'
        option type enum
        list depends 'encryption=wpa,mode=sta'
-       list depends 'encryption=wpa2i,mode=sta'
+       list depends 'encryption=wpa2,mode=sta'
 
 config enum
        option variable 'wireless.wifi-iface.eap_type'
@@ -476,20 +486,24 @@ config enum
 config enum
        option variable 'wireless.wifi-iface.eap_type'
        option value 'PEAP'
+       
+config enum
+       option variable 'wireless.wifi-iface.eap_type'
+       option value 'TTLS'
 
 config variable
        option name 'ca_cert'
        option section 'wireless.wifi-iface'
        option title 'Path to CA-Certificate'
        list depends 'encryption=wpa,mode=sta'
-       list depends 'encryption=wpa2i,mode=sta'
+       list depends 'encryption=wpa2,mode=sta'
        option datatype file
 
 config variable
        option name 'priv_key'
        option section 'wireless.wifi-iface'
        option title 'Path to Private Key'
-       list depends 'mode=sta,encryption=wpa2i,eap_type=TLS'
+       list depends 'mode=sta,encryption=wpa2,eap_type=TLS'
        list depends 'mode=sta,encryption=wpa,eap_type=TLS'
        option datatype file
 
@@ -498,26 +512,32 @@ config variable
        option name 'priv_key_pwd'
        option section 'wireless.wifi-iface'
        option title 'Password of Private Key'
-       list depends 'mode=sta,encryption=wpa2i,eap_type=TLS'
+       list depends 'mode=sta,encryption=wpa2,eap_type=TLS'
        list depends 'mode=sta,encryption=wpa,eap_type=TLS'
 
 config variable
        option name 'auth'
        option section 'wireless.wifi-iface'
-       option title 'PEAP-Authentication'
-       list depends 'mode=sta,encryption=wpa2i,eap_type=PEAP'
+       option title 'Authentication'
+       list depends 'mode=sta,encryption=wpa2,eap_type=PEAP'
        list depends 'mode=sta,encryption=wpa,eap_type=PEAP'
+       list depends 'mode=sta,encryption=wpa2,eap_type=TTLS'
+       list depends 'mode=sta,encryption=wpa,eap_type=TTLS'
 
 config variable
        option name 'identity'
        option section 'wireless.wifi-iface'
-       option title 'PEAP-Identity'
-       list depends 'mode=sta,encryption=wpa2i,eap_type=PEAP'
+       option title 'Identity'
+       list depends 'mode=sta,encryption=wpa2,eap_type=PEAP'
        list depends 'mode=sta,encryption=wpa,eap_type=PEAP'
+       list depends 'mode=sta,encryption=wpa2,eap_type=TTLS'
+       list depends 'mode=sta,encryption=wpa,eap_type=TTLS'
 
 config variable
        option name 'password'
        option section 'wireless.wifi-iface'
-       option title 'PEAP-Password'
-       list depends 'mode=sta,encryption=wpa2i,eap_type=PEAP'
+       option title 'Password'
+       list depends 'mode=sta,encryption=wpa2,eap_type=PEAP'
        list depends 'mode=sta,encryption=wpa,eap_type=PEAP'
+       list depends 'mode=sta,encryption=wpa2,eap_type=TTLS'
+       list depends 'mode=sta,encryption=wpa,eap_type=TTLS'