hostapd: fix 11r defaults when using SAE

When using WPA3-SAE or WPA2/WPA3 Personal Mixed, we can not use
ft_psk_generate_local because it will break FT for SAE. Instead
use the r0kh and r1kh configuration approach.

Signed-off-by: Jesus Fernandez Manzano <[email protected]>
(cherry picked from commit e2f6bfb833a1ba099e1dcf0e569e4ef11c31c391)
Fixes: https://github.com/openwrt/luci/issues/6930
Signed-off-by: Jo-Philipp Wich <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/15899
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 2fcc46248dc3d268baeac6e34e8929ecc3e9f2fe..03f34f8b218cdee7f7dbfb76e16128bfbefd6fcb 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -858,7 +858,7 @@ hostapd_set_bss_options() {
                        set_default reassociation_deadline 1000
 
                        case "$auth_type" in
-                               psk|sae|psk-sae)
+                               psk)
                                        set_default ft_psk_generate_local 1
                                ;;
                                *)