From 857c3ba76745fdd716e8821094b8ae0ea344ffdd Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 12 Jun 2024 17:33:15 +0200 Subject: [PATCH] OWE: reorder config sections to ensure that the vendor IE gets populated with the correct SSID Signed-off-by: John Crispin --- renderer/templates/interface.uc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/renderer/templates/interface.uc b/renderer/templates/interface.uc index d4b4cca..7cda01d 100644 --- a/renderer/templates/interface.uc +++ b/renderer/templates/interface.uc @@ -185,13 +185,6 @@ let modes = (ssid.bss_mode == "wds-repeater") ? [ "wds-sta", "wds-ap" ] : [ ssid.bss_mode ]; for (let mode in modes) { - include('interface/ssid.uc', { - location: location + '/ssids/' + i, - ssid: { ...ssid, bss_mode: mode }, - count, - name, - network, - }); if (ssid?.encryption?.proto == 'owe-transition') { ssid.encryption.proto = 'none'; include('interface/ssid.uc', { @@ -201,9 +194,17 @@ name, network, owe: true, - }); - + }); + ssid.encryption.proto = 'owe-transition'; } + + include('interface/ssid.uc', { + location: location + '/ssids/' + i, + ssid: { ...ssid, bss_mode: mode }, + count, + name, + network, + }); count++; } }