From d2c188278629fa51f894a836947dbac5d691a6dd Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 4 Oct 2014 09:38:10 +0000 Subject: [PATCH 1/1] luci: initial 802.11ac support While working with 802.11ac (ath10k) I've noticed the web interface configuration missing basic support for 11ac devices - unable to set VHT (htmode) and 11ac (hwmode). This patch adds initial support for luci admin-full page and 802.11ac MAC80211 devices. v2: * replace obsolete 11nac mode with 11a + vhtmode (jow in ticket: #17323) Signed-off-by: Bartosz Markowski [jow: fix typo in get_i18n()] Signed-off-by: Jo-Philipp Wich --- modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 11 ++++++++++- .../admin-full/luasrc/view/admin_network/wifi_overview.htm | 1 + modules/base/luasrc/model/network.lua | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) 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 5a5efa925..7cdfb7060 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -192,7 +192,16 @@ if hwtype == "mac80211" then mode = s:taboption("advanced", ListValue, "hwmode", translate("Band")) - if hw_modes.n then + if hw_modes.ac then + if hw_modes.ac then mode:value("11a", "5GHz (802.11n+ac)") end + + htmode = s:taboption("advanced", ListValue, "htmode", translate("VHT mode (802.11ac)")) + htmode:value("", translate("disabled")) + htmode:value("VHT20", "20MHz") + htmode:value("VHT40", "40MHz") + htmode:value("VHT80", "80MHz") + + elseif 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 diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm index 91d2ff4d9..8fb648377 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -36,6 +36,7 @@ You may obtain a copy of the License at if bl.b then bands = bands .. "b" end if bl.g then bands = bands .. "g" end if bl.n then bands = bands .. "n" end + if bl.ac then bands = bands .. "ac" end end local hw = dev.iwinfo.hardware_name diff --git a/modules/base/luasrc/model/network.lua b/modules/base/luasrc/model/network.lua index a409621f8..0aac416ac 100644 --- a/modules/base/luasrc/model/network.lua +++ b/modules/base/luasrc/model/network.lua @@ -1274,6 +1274,7 @@ function wifidev.get_i18n(self) if l.b then m = m .. "b" end if l.g then m = m .. "g" end if l.n then m = m .. "n" end + if l.ac then m = "ac" end return "%s 802.11%s Wireless Controller (%s)" %{ t, m, self:name() } end -- 2.11.0