X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-core%2Froot%2Flib%2Fuci%2Fschema%2Fdefault%2Fwireless;h=7e720490c36a67c5dfc5f7603aa9575959c922ce;hp=d3256bcebb1c7f514db5b45b9bf3aa7782d89e44;hb=00f1c31b8bd70585b9954aaa41ce6f6b46e543bd;hpb=a3d603df27571ae4fa67cbc11b0ed04f1de0723e;ds=sidebyside

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index d3256bceb..7e720490c 100644
--- 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'
 
@@ -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'
@@ -213,10 +220,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'
@@ -281,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)'
@@ -347,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'
@@ -400,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
@@ -408,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
@@ -416,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'
@@ -442,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'
@@ -451,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
 
@@ -473,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'