luci: initial 802.11ac support

[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 60e475a..7cdfb70 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -22,7 +22,7 @@ arg[1] = arg[1] or ""
 
 m = Map("wireless", "",
        translate("The <em>Device Configuration</em> section covers physical settings of the radio " ..
-               "hardware such as channel, transmit power or antenna selection which is shared among all " ..
+               "hardware such as channel, transmit power or antenna selection which are shared among all " ..
                "defined wireless networks (if the radio hardware is multi-SSID capable). Per network settings " ..
                "like encryption or operation mode are grouped in the <em>Interface Configuration</em>."))
 
@@ -190,15 +190,22 @@ if hwtype == "mac80211" then
                end
        end
 
-       mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
-       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
+       mode = s:taboption("advanced", ListValue, "hwmode", translate("Band"))
+
+       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
 
-       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", "40MHz")
@@ -217,10 +224,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!"))
                noscan:depends("htmode", "HT40")
                noscan.default = noscan.disabled
-
-               --htcapab = s:taboption("advanced", DynamicList, "ht_capab", translate("HT capabilities"))
-               --htcapab:depends("hwmode", "11na")
-               --htcapab:depends("hwmode", "11ng")
+       else
+               if hw_modes.g then mode:value("11g", "2.4GHz (802.11g)") end
+               if hw_modes.a then mode:value("11a", "5GHz (802.11a)") end
        end
 
        local cl = iw and iw.countrylist