From 4eeddc486c9cb317c0e1babd45f493a94b32cf7b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 6 Sep 2009 10:30:42 +0000 Subject: [PATCH] luci-0.9: merge r5318 --- modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 2 +- modules/admin-mini/luasrc/model/cbi/mini/wifi.lua | 2 +- 2 files changed, 2 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 dfa71b194..bd4f73b91 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -376,7 +376,7 @@ key:depends("encryption", "wep") key:depends("encryption", "psk") key:depends("encryption", "psk2") key:depends("encryption", "psk+psk2") -key:depends("encryption", "mixed") +key:depends("encryption", "psk-mixed") key:depends({mode="ap", encryption="wpa"}) key:depends({mode="ap", encryption="wpa2"}) key.rmempty = true diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua index d59ede368..765011a1f 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua @@ -258,7 +258,7 @@ key:depends("encryption", "wep") key:depends("encryption", "psk") key:depends("encryption", "psk2") key:depends("encryption", "psk+psk2") -key:depends("encryption", "mixed") +key:depends("encryption", "psk-mixed") key:depends({mode="ap", encryption="wpa"}) key:depends({mode="ap", encryption="wpa2"}) key.rmempty = true -- 2.11.0