From 6abfd98c4ea3d23fb9a395f1bf696fb1947005fa Mon Sep 17 00:00:00 2001 From: Richard Huynh Date: Sat, 28 Mar 2026 20:10:33 +1100 Subject: [PATCH] wifi-scripts: add EHT rates to set_fixed_freq Without this, max_oper_chwidth is set incorrectly, thus ibss_mesh_select_80_160mhz fails to set the correct channel width Signed-off-by: Richard Huynh Link: https://github.com/openwrt/openwrt/pull/22644 Signed-off-by: Hauke Mehrtens --- .../files-ucode/usr/share/ucode/wifi/supplicant.uc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc index 1104f10a126..c5183c14431 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc @@ -16,20 +16,22 @@ function set_fixed_freq(data, config) { set_default(config, 'fixed_freq', 1); set_default(config, 'frequency', data.frequency); - if (data.htmode in [ 'VHT80', 'HE80' ]) + if (data.htmode in [ 'VHT80', 'HE80', 'EHT80' ]) set_default(config, 'max_oper_chwidth', 1); - else if (data.htmode in [ 'VHT160', 'HE160' ]) + else if (data.htmode in [ 'VHT160', 'HE160', 'EHT160' ]) set_default(config, 'max_oper_chwidth', 2); - else if (data.htmode in [ 'VHT20', 'VHT40', 'HE20', 'HE40' ]) + else if (data.htmode in [ 'EHT320' ]) + set_default(config, 'max_oper_chwidth', 9); + else if (data.htmode in [ 'VHT20', 'VHT40', 'HE20', 'HE40', 'EHT20', 'EHT40' ]) set_default(config, 'max_oper_chwidth', 0); else set_default(config, 'disable_vht', true); if (data.htmode in [ 'NOHT' ]) set_default(config, 'disable_ht', true); - else if (data.htmode in [ 'HT20', 'VHT20', 'HE20' ]) + else if (data.htmode in [ 'HT20', 'VHT20', 'HE20', 'EHT20' ]) set_default(config, 'disable_ht40', true); - else if (data.htmode in [ 'VHT40', 'VHT80', 'VHT160', 'HE40', 'HE80', 'HE160' ]) + else if (data.htmode in [ 'VHT40', 'VHT80', 'VHT160', 'HE40', 'HE80', 'HE160', 'EHT40', 'EHT80', 'EHT160', 'EHT320' ]) set_default(config, 'ht40', true); if (wildcard(data.htmode, 'VHT*')) -- 2.47.3