Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-full: further simplify wifi config

Browse source 
Drop 11b support since its not properly supported by mac80211 anyway.
Rename 'hwmode' option to 'Band' and remove dependencies from 'htmode' field.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2014-05-24 12:40:11 +00:00
parent c0b538d4d8
commit c9f7282d98
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -190,15 +190,13 @@ if hwtype == "mac80211" then
end end
end end
mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode")) mode = s:taboption("advanced", ListValue, "hwmode", translate("Band"))
if hw_modes.b then mode:value("11b", "802.11b") end
if hw_modes.g then mode:value("11g", "802.11g") end
if hw_modes.a then mode:value("11a", "802.11a") end
if hw_modes.n then if hw_modes.n then
if hw_modes.g then mode:value("11g", "2.4GHz (802.11g+n)") end
if hw_modes.a then mode:value("11a", "5GHz (802.11a+n)") end
htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode (802.11n)")) htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode (802.11n)"))
htmode:depends("hwmode", "11a")
htmode:depends("hwmode", "11g")
htmode:value("", translate("disabled")) htmode:value("", translate("disabled"))
htmode:value("HT20", "20MHz") htmode:value("HT20", "20MHz")
htmode:value("HT40", "40MHz") htmode:value("HT40", "40MHz")
@ -217,10 +215,9 @@ if hwtype == "mac80211" then
translate("Always use 40MHz channels even if the secondary channel overlaps. Using this option does not comply with IEEE 802.11n-2009!")) translate("Always use 40MHz channels even if the secondary channel overlaps. Using this option does not comply with IEEE 802.11n-2009!"))
noscan:depends("htmode", "HT40") noscan:depends("htmode", "HT40")
noscan.default = noscan.disabled noscan.default = noscan.disabled
else
--htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities")) if hw_modes.g then mode:value("11g", "2.4GHz (802.11g)") end
--htcapab:depends("hwmode", "11na") if hw_modes.a then mode:value("11a", "5GHz (802.11a)") end
--htcapab:depends("hwmode", "11ng")
end end
local cl = iw and iw.countrylist local cl = iw and iw.countrylist