From: Steven Barth <steven@midlink.org>
Date: Sun, 7 Sep 2008 14:33:42 +0000 (+0000)
Subject: Fixes for WPA notifications
X-Git-Tag: 0.9.0~1392
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=21a7e9bc65da04588f2a9ff507427ba6bd7aeb39

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 a35e73f7f..0e5d85dbe 100644
--- 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 1aa01d1d7..cbf3d6a25 100644
--- 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"})