luci-0.10: merge r6976 and r6977

This commit is contained in:
Jo-Philipp Wich 2011-03-30 11:44:14 +00:00
parent 89812afda3
commit 62b8fe1515

View file

@ -142,8 +142,9 @@ function newnet.parse(self, section)
}
if m.hidden.wep == "1" then
wconf.encryption = "wep"
wconf.key = key and key:formvalue(section) or ""
wconf.encryption = "wep-open"
wconf.key = "1"
wconf.key1 = key and key:formvalue(section) or ""
elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
wconf.encryption = (tonumber(m.hidden.wpa_version) or 0) >= 2 and "psk2" or "psk"
wconf.key = key and key:formvalue(section) or ""