Author: nbd
Date: 2015-04-20 17:00:13 +0200 (Mon, 20 Apr 2015)
New Revision: 45520

Modified:
   trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
Log:
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 <[email protected]>

Modified: trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
===================================================================
--- trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh 
2015-04-20 15:00:07 UTC (rev 45519)
+++ trunk/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh 
2015-04-20 15:00:13 UTC (rev 45520)
@@ -595,16 +595,15 @@
                                [ -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
                ;;
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to