projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modules/admin-full: prevent crash in wifi model if no tx power list is available
[project/luci.git]
/
modules
/
admin-full
/
luasrc
/
model
/
cbi
/
admin_network
/
wifi.lua
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
bf7f5b2
..
63c2344
100644
(file)
--- a/
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@
-25,8
+25,8
@@
local tx_powers = nil
m.uci:foreach("wireless", "wifi-iface",
function(s)
m.uci:foreach("wireless", "wifi-iface",
function(s)
- if s.device == arg[1] and
s.ifname and
not iw then
- iw = luci.sys.wifi.getiwinfo(s.ifname)
+ if s.device == arg[1] and not iw then
+ iw = luci.sys.wifi.getiwinfo(s.ifname
or s.device
)
tx_powers = iw.txpwrlist or { }
end
end)
tx_powers = iw.txpwrlist or { }
end
end)
@@
-359,6
+359,9
@@
if hwtype == "broadcom" then
translate("wifi_isolate_desc"))
isolate:depends({mode="ap"})
translate("wifi_isolate_desc"))
isolate:depends({mode="ap"})
+ s:taboption("advanced", Flag, "doth", "802.11h")
+ s:taboption("advanced", Flag, "wmm", translate("wifi_wmm"))
+
bssid:depends({mode="wds"})
bssid:depends({mode="adhoc"})
end
bssid:depends({mode="wds"})
bssid:depends({mode="adhoc"})
end
@@
-460,7
+463,7
@@
key:depends("encryption", "wep")
key:depends("encryption", "psk")
key:depends("encryption", "psk2")
key:depends("encryption", "psk+psk2")
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
key:depends({mode="ap", encryption="wpa"})
key:depends({mode="ap", encryption="wpa2"})
key.rmempty = true