From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 29 May 2009 21:23:07 +0000 (+0000)
Subject: luci-0.8: merge r4712
X-Git-Tag: 0.8.7~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c629629c164ebd7e95f3e679e50eb20a1e501960;p=oweals%2Fluci.git

luci-0.8: merge r4712
---

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index 6a701e6af..61a2ac164 100644
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -435,6 +435,16 @@ config enum
 	option value 'psk2'
 	option title 'WPA2-PSK'
 
+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'