[PATCH] Add regdomain, country and outdoor options for madwifi

[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 d3256bcebb1c7f514db5b45b9bf3aa7782d89e44..bd466d1f2e0944ed6c1c6d5856e2bf79e836b4fb 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'
 
@@ -80,6 +80,13 @@ config variable
        option datatype boolean
        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'
@@ -138,11 +145,25 @@ config variable
        option datatype boolean
        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 +234,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'
@@ -280,6 +306,24 @@ config variable
        option title 'Background Scan (atheros)'
        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'
@@ -347,6 +391,7 @@ config variable
        option name 'ff'
        option section 'wireless.wifi-iface'
        option title 'Fast Frames (atheros)'
+       option datatype boolean
 
 config variable
        option name 'wmm'
@@ -400,7 +445,7 @@ config enum
 
 config enum
        option variable 'wireless.wifi-iface.encryption'
-       option value 'wpa2i'
+       option value 'wpa2'
        option title 'WPA2-EAP'
 
 config variable
@@ -408,7 +453,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 +461,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 +491,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 +500,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 +526,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'