From 601deffafc9e2388f6bf4e78de090d076416e96f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 29 May 2009 19:54:18 +0000 Subject: modules/admin-{mini,full}: fixup wpa-mixed dependencies, make key a password field, fix bssid dependency for broadcom ad-hoc mode in admin-mini --- modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/admin-full/luasrc/model') 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 fe28995ca1..a08adc58b3 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -369,10 +369,13 @@ port.rmempty = true key = s:option(Value, "key", translate("key")) key:depends("encryption", "wep") key:depends("encryption", "psk") -key:depends({mode="ap", encryption="wpa"}) key:depends("encryption", "psk2") +key:depends("encryption", "psk+psk2") +key:depends("encryption", "mixed") +key:depends({mode="ap", encryption="wpa"}) key:depends({mode="ap", encryption="wpa2"}) key.rmempty = true +key.password = true if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then nasid = s:option(Value, "nasid", translate("a_w_nasid")) -- cgit v1.2.3