X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-core%2Froot%2Flib%2Fuci%2Fschema%2Fdefault%2Fwireless;h=25260f473ae78ad2c16e60919e30c06f42d76cb0;hp=823ee2fa4faf200bdd097a95c2bf991e0031fb1e;hb=7cf9ed27e0898acd11757bb88e44c8ff0187a548;hpb=29052f08df65ee0f2a14572f16c9c4309d233232 diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless index 823ee2fa4..25260f473 100644 --- a/modules/admin-core/root/lib/uci/schema/default/wireless +++ b/modules/admin-core/root/lib/uci/schema/default/wireless @@ -60,13 +60,13 @@ config enum config enum option variable 'wireless.wifi-device.mode' - option value '11gdt' - option title '802.11adt' + option value '11ast' + option title '802.11a + Turbo' config enum option variable 'wireless.wifi-device.mode' - option value '11adt' - option title '802.11adt' + option value '11gst' + option title '802.11g + Turbo' config enum option variable 'wireless.wifi-device.mode' @@ -81,18 +81,29 @@ 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 (atheros)' + option title 'Transmitter Antenna' option datatype uint list depends type=atheros + list depends type=broadcom + list depends type=prism2 config variable option name 'rxantenna' option section 'wireless.wifi-device' - option title 'Receiver Antenna (atheros)' + option title 'Receiver Antenna' option datatype uint list depends type=atheros + list depends type=broadcom + list depends type=prism2 config variable option name 'distance' @@ -130,31 +141,31 @@ config variable option datatype macaddr config variable - option name 'txant' + option name 'frameburst' option section 'wireless.wifi-device' - option title 'Transmitter Antenna (broadcom)' - option datatype uint + option title 'Frame Bursting (broadcom)' + option datatype boolean list depends 'type=broadcom' config variable - option name 'rxant' + option name 'regdomain' option section 'wireless.wifi-device' - option title 'Receiver Antenna (broadcom)' - option datatype uint - list depends 'type=broadcom' + option title 'Regulatory Domain' + list depends 'type=atheros' config variable - option name 'frameburst' + option name 'country' option section 'wireless.wifi-device' - option title 'Frame Bursting (broadcom)' - option datatype boolean + option title 'Country Code' list depends 'type=broadcom' + list depends 'type=atheros' config variable - option name 'country' + option name 'outdoor' option section 'wireless.wifi-device' - option title 'Country Code (broadcom)' - list depends 'type=broadcom' + option title 'Outdoor Channels' + option datatype boolean + list depends 'type=atheros' config variable option name 'maxassoc' @@ -228,25 +239,25 @@ config enum config variable option name 'bssid' option section 'wireless.wifi-iface' - option title BSSID + option title 'BSSID' config variable option name 'txpower' option section 'wireless.wifi-iface' - option title 'Transmit Power (mac80211, atheros)' + option title 'Transmit Power' option description 'dbm' option datatype uint 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 @@ -267,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' @@ -293,9 +304,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 @@ -311,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 @@ -320,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' @@ -359,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 @@ -407,12 +437,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 @@ -420,7 +460,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 @@ -428,25 +468,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' @@ -454,7 +498,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' @@ -463,20 +507,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 @@ -485,26 +533,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'