From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 9 May 2015 08:58:12 +0000 (+0000)
Subject: mac80211: apply mesh parameters after starting authsae/wpa_supplicant (#16697)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=29f8f90de46236f498e0c7dc799bb5a30055d0a4;p=librecmc%2Flibrecmc.git

mac80211: apply mesh parameters after starting authsae/wpa_supplicant (#16697)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45651
---

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index d2641a49c4..824c87ac15 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -590,11 +590,6 @@ mac80211_setup_vif() {
 
 	case "$mode" in
 		mesh)
-			for var in $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING; do
-				json_get_var mp_val "$var"
-				[ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
-			done
-
 			# authsae or wpa_supplicant
 			json_get_vars key
 			if [ -n "$key" ]; then
@@ -606,6 +601,11 @@ mac80211_setup_vif() {
 					mac80211_setup_supplicant || failed=1
 				fi
 			fi
+
+			for var in $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING; do
+				json_get_var mp_val "$var"
+				[ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
+			done
 		;;
 		adhoc)
 			wireless_vif_parse_encryption