diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-05-09 13:26:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-09 13:26:10 +0200 |
| commit | 444f06b1b05ca0a0f45be7883892630f49ebe9bd (patch) | |
| tree | 56816786b33a64fe9bb1af19a2d3706ba8365cce | |
| parent | 62d8a4fdd71540dba56fa4c982df2b753a49996d (diff) | |
| parent | 4518c0629089eccfc7d2e88a79409cb2df226306 (diff) | |
Merge pull request #2687 from HenryGiraldo/master
luci-mod-admin-full: add dependency for channel auto
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm | 5 | ||||
| -rw-r--r-- | modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm index ebb02e489b..eeb1d5c5cb 100644 --- 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 acs = <%= luci.http.write_json(self.hostapd_acs or 0) %>; 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, 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 7b7fc0ffcf..6cf4bdd244 100644 --- 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 + ch.hostapd_acs = (os.execute("hostapd -vacs >/dev/null 2>/dev/null") == 0) ch.template = "cbi/wireless_modefreq" function ch.cfgvalue(self, section) |