luci-mod-admin-full: only offer VHT rates which are actually supported by the driver

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 022d4c4277ab3e56feb72f456a651e63e8ea79d6..e227b0874695037b4d094bec2a15d6047cd77bfd 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -161,6 +161,7 @@ if found_sta then
 else
        ch = s:taboption("general", Value, "_mode_freq", '<br />'..translate("Operating frequency"))
        ch.hwmodes = hw_modes
+       ch.htmodes = iw.htmodelist
        ch.freqlist = iw.freqlist
        ch.template = "cbi/wireless_modefreq"
 

diff --git a/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
index ac14593e79cde50875eb3d2e8caa7febbe3fb9fd..2fb64b3c420254ccded1487a8e41419a2a8f8bcc 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
@@ -3,6 +3,7 @@
 <script type="text/javascript">//<![CDATA[
        var freqlist = <%= luci.http.write_json(self.freqlist) %>;
        var hwmodes  = <%= luci.http.write_json(self.hwmodes) %>;
+       var htmodes  = <%= luci.http.write_json(self.htmodes) %>;
 
        var channels = {
                '11g': [
@@ -31,14 +32,14 @@
                        '', '-', true
                ],
                'n':  [
-                       'HT20', '20 MHz', true,
-                       'HT40', '40 MHz', true
+                       'HT20', '20 MHz', htmodes.HT20,
+                       'HT40', '40 MHz', htmodes.HT40
                ],
                'ac': [
-                       'VHT20', '20 MHz', true,
-                       'VHT40', '40 MHz', true,
-                       'VHT80', '80 MHz', true,
-                       'VHT160', '160 MHz', true
+                       'VHT20', '20 MHz', htmodes.VHT20,
+                       'VHT40', '40 MHz', htmodes.VHT40,
+                       'VHT80', '80 MHz', htmodes.VHT80,
+                       'VHT160', '160 MHz', htmodes.VHT160
                ]
        };