luci-mod-admin-full: add dependency for channel auto

Do not show 'auto' channel option if hostapd is
not compiled with CONFIG_ACS

Signed-off-by: Enrique Giraldo <hgiraldos@gmail.com>

diff --git a/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
index ebb02e489b6d6403be89263eca09f889870f1d1d..eeb1d5c5cbc7d1e137866fa3d84cf7542a5993c5 100644 (file)
--- a/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
+++ b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
@@ -4,6 +4,7 @@
        var freqlist = <%= luci.http.write_json(self.iwinfo.freqlist) %>;
        var hwmodes  = <%= luci.http.write_json(self.iwinfo.hwmodelist or {}) %>;
        var htmodes  = <%= luci.http.write_json(self.iwinfo.htmodelist) %>;
        var freqlist = <%= luci.http.write_json(self.iwinfo.freqlist) %>;
        var hwmodes  = <%= luci.http.write_json(self.iwinfo.hwmodelist or {}) %>;
        var htmodes  = <%= luci.http.write_json(self.iwinfo.htmodelist) %>;

+       var acs =  <%= luci.http.write_json(self.hostapd_acs or 0) %>;

 
        var channels = {
                '11g': [
 
        var channels = {
                '11g': [


@@ -14,6 +15,10 @@
                ]
        };
 
                ]
        };
 

+       if (acs < 1) {
+               channels[(freqlist[freqlist.length - 1].mhz > 2484) ? '11a' : '11g'].length = 0;
+       }
+

        for (var i = 0; i < freqlist.length; i++)
                channels[(freqlist[i].mhz > 2484) ? '11a' : '11g'].push(
                        freqlist[i].channel,
        for (var i = 0; i < freqlist.length; i++)
                channels[(freqlist[i].mhz > 2484) ? '11a' : '11g'].push(
                        freqlist[i].channel,

diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
index 7b7fc0ffcf64992cfdb05df818f5f9cca1f2688b..6cf4bdd24488fd2d4f34aae485a7d34a8c04b50e 100644 (file)
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
@@ -177,6 +177,7 @@ if found_sta then
 else
        ch = s:taboption("general", Value, "_mode_freq", '<br />'..translate("Operating frequency"))
        ch.iwinfo = iw
 else
        ch = s:taboption("general", Value, "_mode_freq", '<br />'..translate("Operating frequency"))
        ch.iwinfo = iw

+       ch.hostapd_acs = (os.execute("hostapd -vacs >/dev/null 2>/dev/null") == 0)

        ch.template = "cbi/wireless_modefreq"
 
        function ch.cfgvalue(self, section)
        ch.template = "cbi/wireless_modefreq"
 
        function ch.cfgvalue(self, section)