Fixes for WPA notifications

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index a35e73f7f2ee94efa397f48314a6329f756f3987..0e5d85dbe12d7fe684765b2d5367230b8741a38d 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -237,6 +237,7 @@ encr:depends({mode="ap"})
 encr:depends({mode="sta"})
 encr:depends({mode="adhoc"})
 encr:depends({mode="ahdemo"})
+encr:depends({mode="wds"})
 
 encr:value("none", "No Encryption")
 encr:value("wep", "WEP")

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 1aa01d1d76b15d075e5fed7a7bf35adc239c9f05..cbf3d6a254f60169cea7c50be207750c67246a06 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -216,8 +216,8 @@ if hwtype == "atheros" or hwtype == "mac80211" then
        if hostapd and supplicant then
                encr:value("psk", "WPA-PSK")
                encr:value("psk2", "WPA2-PSK")
-               encr:value("wpa", "WPA-EAP", {mode="ap"})
-               encr:value("wpa2i", "WPA2-EAP", {mode="ap"})
+               encr:value("wpa", "WPA-Radius", {mode="ap"})
+               encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
        elseif hostapd and not supplicant then
                encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
                encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})