summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua23
-rw-r--r--modules/base/luasrc/sys.lua1
2 files changed, 20 insertions, 4 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 f6becf0f47..7d84d29614 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -353,10 +353,25 @@ if hwtype == "broadcom" then
end
mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
- mode:value("11bg", "802.11b+g")
- mode:value("11b", "802.11b")
- mode:value("11g", "802.11g")
- mode:value("11gst", "802.11g + Turbo")
+ if hw_modes.n then
+ if hw_modes.g then mode:value("11ng", "802.11g+n") end
+ if hw_modes.a then mode:value("11na", "802.11a+n") end
+ mode:value("11n", "802.11n")
+
+ htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode (802.11n)"))
+ htmode:depends("hwmode", "11n")
+ htmode:depends("hwmode", "11ng")
+ htmode:depends("hwmode", "11na")
+ htmode:value("HT20", "20MHz")
+ htmode:value("HT40-", translate("40MHz 2nd channel below"))
+ htmode:value("HT40+", translate("40MHz 2nd channel above"))
+ end
+ if hw_modes.a then mode:value("11a", "802.11a") end
+ if hw_modes.b and hw_modes.g then mode:value("11bg", "802.11b+g") end
+ 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.g then mode:value("11gst", "802.11g Turbo") end
+ if hw_modes.g then mode:value("11lrs", "802.11g Limited Rate Support") end
ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
ant1.widget = "radio"
diff --git a/modules/base/luasrc/sys.lua b/modules/base/luasrc/sys.lua
index df6280dda0..3a04f6bada 100644
--- a/modules/base/luasrc/sys.lua
+++ b/modules/base/luasrc/sys.lua
@@ -186,6 +186,7 @@ function sysinfo()
cpuinfo:match("model name\t+: ([^\n]+)")
local model =
+ fs.readfile("/proc/device-tree/model") or
luci.util.pcdata(fs.readfile("/tmp/sysinfo/model")) or
cpuinfo:match("machine\t+: ([^\n]+)") or
cpuinfo:match("Hardware\t+: ([^\n]+)") or