luci-0.8: merge missing parts of r4293

[oweals/luci.git] / modules / admin-mini / luasrc / model / cbi / mini / wifi.lua

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 6cf087432f59f03683b3fd4f5a6f54571f5f8036..4f1926b7b74f64a9cab3270c59d18c52e41d79c6 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -230,6 +230,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
        elseif hostapd and not supplicant then
                encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
                encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})
+               encr:value("mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
                encr:value("wpa", "WPA-Radius", {mode="ap"})
                encr:value("wpa2", "WPA2-Radius", {mode="ap"})
                encr.description = translate("wifi_wpareq")
@@ -246,6 +247,7 @@ if hwtype == "atheros" or hwtype == "mac80211" then
 elseif hwtype == "broadcom" then
        encr:value("psk", "WPA-PSK")
        encr:value("psk2", "WPA2-PSK")
+       encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 
 key = s:option(Value, "key", translate("key"))