summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-07 14:33:42 +0000
committerSteven Barth <steven@midlink.org>2008-09-07 14:33:42 +0000
commit21a7e9bc65da04588f2a9ff507427ba6bd7aeb39 (patch)
tree2a86b1ef60a6b6a6d827608d0d8c5f9798a77911
parent43ff3a40925cf87634d96d89e7ee7c5e0071c661 (diff)
Fixes for WPA notifications
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua1
-rw-r--r--modules/admin-mini/luasrc/model/cbi/mini/wifi.lua4
2 files changed, 3 insertions, 2 deletions
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 a35e73f7f2..0e5d85dbe1 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 1aa01d1d76..cbf3d6a254 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"})