luci-0.8: merge r4708
This commit is contained in:
parent
5e481381d5
commit
318c7831ba
2 changed files with 9 additions and 2 deletions
|
@ -365,10 +365,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"))
|
||||
|
|
|
@ -253,10 +253,13 @@ end
|
|||
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
|
||||
|
||||
server = s:option(Value, "server", translate("a_w_radiussrv"))
|
||||
server:depends({mode="ap", encryption="wpa"})
|
||||
|
@ -336,6 +339,7 @@ end
|
|||
|
||||
if hwtype == "broadcom" then
|
||||
bssid:depends({mode="wds"})
|
||||
bssid:depends({mode="adhoc"})
|
||||
end
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue