diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-05-19 18:54:06 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-05-19 18:54:06 +0000 |
| commit | 4496419e1d007812a925d66801073fbfc1a07adb (patch) | |
| tree | c0fd6274643f38df916b2d8818363dec1a9c3c04 /modules | |
| parent | 74a091d7fd812fef086105355d2e95fb293cae8c (diff) | |
modules/admin-full: fix wifi config compatibility with current trunk
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 30 |
1 files changed, 17 insertions, 13 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 67ccdb4c1..60e475a58 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -143,7 +143,6 @@ end local hwtype = wdev:get("type") -local htcaps = wdev:get("ht_capab") and true or false -- NanoFoo local nsantenna = wdev:get("antenna") @@ -192,26 +191,31 @@ if hwtype == "mac80211" then end mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode")) - mode:value("", translate("auto")) 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 htcaps then - if hw_modes.g and hw_modes.n then mode:value("11ng", "802.11g+n") end - if hw_modes.a and hw_modes.n then mode:value("11na", "802.11a+n") end - - htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode")) - htmode:depends("hwmode", "11na") - htmode:depends("hwmode", "11ng") + if hw_modes.n then + 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("HT20", "20MHz") - htmode:value("HT40-", translate("40MHz 2nd channel below")) - htmode:value("HT40+", translate("40MHz 2nd channel above")) + htmode:value("HT40", "40MHz") + + function mode.cfgvalue(...) + local v = Value.cfgvalue(...) + if v == "11na" then + return "11a" + elseif v == "11ng" then + return "11g" + end + return v + end noscan = s:taboption("advanced", Flag, "noscan", translate("Force 40MHz mode"), 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:depends("htmode", "HT40") noscan.default = noscan.disabled --htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities")) |