luci-0.8: update 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 e8a4d30..25260f4 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -94,6 +94,7 @@ config variable
        option datatype uint
        list depends type=atheros
        list depends type=broadcom
+       list depends type=prism2
 
 config variable
        option name 'rxantenna'
@@ -102,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'
@@ -146,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'
@@ -235,13 +251,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
@@ -262,13 +278,13 @@ config variable
 config variable
        option name 'doth'
        option section 'wireless.wifi-iface'
-       option title '802.11h (atheros)'
+       option title '802.11h (atheros, broadcom)'
        option datatype boolean
 
 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'
@@ -308,7 +324,7 @@ config variable
 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
@@ -324,7 +340,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
@@ -333,7 +349,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'
@@ -372,11 +388,12 @@ config variable
        option name 'ff'
        option section 'wireless.wifi-iface'
        option title 'Fast Frames (atheros)'
+       option datatype boolean
 
 config variable
        option name 'wmm'
        option section 'wireless.wifi-iface'
-       option title 'WMM Mode (atheros)'
+       option title 'WMM Mode (atheros, broadcom)'
        option datatype boolean
 
 config variable
@@ -420,6 +437,16 @@ 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'
 
@@ -448,6 +475,8 @@ 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'