modules/admin-core: extend wireless schema to cover psk mixed mode in encryption...

[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 d3256bc..2636f24 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 value '11gdt'
-       option title '802.11adt'
+       option variable 'wireless.wifi-device.mode'
+       option value '11ast'
+       option title '802.11a + Turbo'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
-       option value '11adt'
-       option title '802.11adt'
+       option variable 'wireless.wifi-device.mode'
+       option value '11gst'
+       option title '802.11g + Turbo'
 
 config enum
-       option variable 'wireless.wifi-device.hwmode'
+       option variable 'wireless.wifi-device.mode'
        option value 'fh'
        option title 'Frequency Hopping'
 
@@ -81,12 +81,20 @@ 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'
        option datatype uint
        list depends type=atheros
        list depends type=broadcom
+       list depends type=prism2
 
 config variable
        option name 'rxantenna'
@@ -95,6 +103,7 @@ config variable
        option datatype uint
        list depends type=atheros
        list depends type=broadcom
+       list depends type=prism2
 
 config variable
        option name 'distance'
@@ -139,10 +148,24 @@ config variable
        list depends 'type=broadcom'
 
 config variable
+       option name 'regdomain'
+       option section 'wireless.wifi-device'
+       option title 'Regulatory Domain'
+       list depends 'type=atheros'
+
+config variable
        option name 'country'
        option section 'wireless.wifi-device'
-       option title 'Country Code (broadcom)'
+       option title 'Country Code'
        list depends 'type=broadcom'
+       list depends 'type=atheros'
+
+config variable
+       option name 'outdoor'
+       option section 'wireless.wifi-device'
+       option title 'Outdoor Channels'
+       option datatype boolean
+       list depends 'type=atheros'
 
 config variable
        option name 'maxassoc'
@@ -213,10 +236,15 @@ 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'
@@ -228,13 +256,13 @@ config variable
 config variable
        option name 'frag'
        option section 'wireless.wifi-iface'
-       option title 'Fragmentation Threshold (mac80211, atheros)'
+       option title 'Fragmentation Threshold (mac80211, atheros, prism2)'
        option datatype uint
 
 config variable
        option name 'rts'
        option section 'wireless.wifi-iface'
-       option title 'RTS/CTS Threshold (mac80211, atheros)'
+       option title 'RTS/CTS Threshold (mac80211, atheros, prism2)'
        option datatype uint
 
 config variable
@@ -261,7 +289,7 @@ config variable
 config variable
        option name 'hidden'
        option section 'wireless.wifi-iface'
-       option title 'Hide ESSID (atheros, broadcom)'
+       option title 'Hide ESSID (atheros, broadcom, prism2)'
        option datatype boolean
        list depends 'mode=ap'
        list depends 'mode=adhoc'
@@ -281,9 +309,27 @@ 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)'
+       option title 'MAC-Address Filter (atheros, prism2)'
        option type enum
 
 config enum
@@ -299,7 +345,7 @@ config enum
 config variable
        option name 'maclist'
        option section 'wireless.wifi-iface'
-       option title 'MAC-List (atheros)'
+       option title 'MAC-List (atheros, prism2)'
        list depends 'macpolicy=allow'
        list depends 'macpolicy=deny'
        option type lazylist
@@ -308,7 +354,7 @@ config variable
 config variable
        option name 'rate'
        option section 'wireless.wifi-iface'
-       option title 'Transmission Rate (atheros)'
+       option title 'Transmission Rate (atheros, prism2)'
 
 config variable
        option name 'mcast_rate'
@@ -347,6 +393,7 @@ config variable
        option name 'ff'
        option section 'wireless.wifi-iface'
        option title 'Fast Frames (atheros)'
+       option datatype boolean
 
 config variable
        option name 'wmm'
@@ -395,12 +442,22 @@ config enum
 
 config enum
        option variable 'wireless.wifi-iface.encryption'
+       option value 'psk+psk2'
+       option title 'WPA-PSK/WPA2-PSK Mixed Mode (nas)'
+
+config enum
+       option variable 'wireless.wifi-iface.encryption'
+       option value 'mixed'
+       option title 'WPA-PSK/WPA2-PSK Mixed Mode (hostapd)'
+
+config enum
+       option variable 'wireless.wifi-iface.encryption'
        option value 'wpa'
        option title 'WPA-EAP'
 
 config enum
        option variable 'wireless.wifi-iface.encryption'
-       option value 'wpa2i'
+       option value 'wpa2'
        option title 'WPA2-EAP'
 
 config variable
@@ -408,7 +465,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
@@ -416,25 +473,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'
@@ -442,7 +503,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'
@@ -451,20 +512,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
 
@@ -473,26 +538,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'