mac80211: fallback to wpa_supplicant to setup encrypted mesh

instead of failing when authsae is not installed, also try using
wpa_supplicant as the newly added -mesh variants support mesh mode
and SAE encryption.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 45520

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index ec0966ea8d85dc9d960dbe432ac0e6dfe22a6179..d2641a49c49c7facf2868f8e3902a058f58a62fa 100644 (file)
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -595,16 +595,15 @@ mac80211_setup_vif() {
                                [ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
                        done
 
-                       # authsae
+                       # authsae or wpa_supplicant
                        json_get_vars key
                        if [ -n "$key" ]; then
                                if [ -e "/lib/wifi/authsae.sh" ]; then
                                        . /lib/wifi/authsae.sh
                                        authsae_start_interface || failed=1
                                else
-                                       wireless_setup_vif_failed AUTHSAE_NOT_INSTALLED
-                                       json_select ..
-                                       return
+                                       wireless_vif_parse_encryption
+                                       mac80211_setup_supplicant || failed=1
                                fi
                        fi
                ;;