use radio.band instead of hwmode

ffac · Oct 14, 2024 · acab455 · acab455
1 parent b827984
commit acab455
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
@@ -125,7 +125,8 @@ if not sysconfig.gluon_version and has_client_radio then
 
 		local name = 'client_' .. radio_name
 
-		if wireless.supports_channel(radio, config.channel()) and (radio.hwmode == '11a' or radio.hwmode == '11na') then
+		-- disable client radio on the 5GHz band which supports the mesh channel
+		if wireless.supports_channel(radio, config.channel()) and radio.band == '5g' then
 			uci:set('wireless', name, 'disabled', true)
 		end
 	end)

diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/wireless.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/wireless.lua
@@ -1,3 +1,4 @@
+local iwinfo = require 'iwinfo'
 local sysconfig = require 'gluon.sysconfig'
 local site = require 'gluon.site'
 local util = require 'gluon.util'
@@ -92,9 +93,9 @@ local function get_wlan_mac_from_driver(radio, vif)
 	end
 end
 
-local function supports_channel(radio, channel)
+function M.supports_channel(radio, channel)
 	local phy = M.find_phy(radio)
-	for i, chan in ipairs(iwinfo.nl80211.freqlist(phy)) do
+	for _, chan in ipairs(iwinfo.nl80211.freqlist(phy)) do
 		if channel == chan.channel then
 			return true
 		end