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 6a701e6..61a2ac1 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -437,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'