nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-core: fix mesh radios not being created

Browse Source 
This commit fixes a bug where on first setup, mesh interfaces won't be
created for 2.4GHz radios.
This commit is contained in:
David Bauer 2019-05-20 21:29:08 +02:00 committed by Andreas Ziegler
parent 1aa4ffc514
commit 5f19706756
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
View File

@ -200,6 +200,29 @@ local function fixup_wan(radio, index)
uci:set('wireless', name, 'macaddr', macaddr) uci:set('wireless', name, 'macaddr', macaddr)
end end
local function configure_mesh_wireless(radio, index, config)
local radio_name = radio['.name']
local suffix = radio_name:match('^radio(%d+)$')
local ibss_disabled = is_disabled('ibss_' .. radio_name)
local mesh_disabled = is_disabled('mesh_' .. radio_name)
configure_ibss(config.ibss(), radio, index, suffix,
first_non_nil(
ibss_disabled,
mesh_disabled,
config.ibss.disabled(false)
)
)
configure_mesh(config.mesh(), radio, index, suffix,
first_non_nil(
mesh_disabled,
ibss_disabled,
config.mesh.disabled(false)
)
)
end
util.foreach_radio(uci, function(radio, index, config) util.foreach_radio(uci, function(radio, index, config)
local radio_name = radio['.name'] local radio_name = radio['.name']
@ -228,6 +251,7 @@ util.foreach_radio(uci, function(radio, index, config)
local hwmode = radio.hwmode local hwmode = radio.hwmode
if hwmode == '11g' or hwmode == '11ng' then if hwmode == '11g' or hwmode == '11ng' then
uci:set('wireless', radio_name, 'legacy_rates', false) uci:set('wireless', radio_name, 'legacy_rates', false)
configure_mesh_wireless(radio, index, config)
elseif (hwmode == '11a' or hwmode == '11na') then elseif (hwmode == '11a' or hwmode == '11na') then
if is_outdoor() then if is_outdoor() then
uci:set('wireless', radio_name, 'channels', config.outdoor_chanlist()) uci:set('wireless', radio_name, 'channels', config.outdoor_chanlist())
@ -246,23 +270,7 @@ util.foreach_radio(uci, function(radio, index, config)
util.remove_from_set(hostapd_options, 'country3=0x4f') util.remove_from_set(hostapd_options, 'country3=0x4f')
uci:set_list('wireless', radio_name, 'hostapd_options', hostapd_options) uci:set_list('wireless', radio_name, 'hostapd_options', hostapd_options)
local ibss_disabled = is_disabled('ibss_' .. radio_name) configure_mesh_wireless(radio, index, config)
local mesh_disabled = is_disabled('mesh_' .. radio_name)
configure_ibss(config.ibss(), radio, index, suffix,
first_non_nil(
ibss_disabled,
mesh_disabled,
config.ibss.disabled(false)
)
)
configure_mesh(config.mesh(), radio, index, suffix,
first_non_nil(
mesh_disabled,
ibss_disabled,
config.mesh.disabled(false)
)
)
end end
end end