Browse Source

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

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 45651
Felix Fietkau 11 năm trước cách đây
mục cha
commit
29f8f90de4

+ 5 - 5
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh

@@ -590,11 +590,6 @@ mac80211_setup_vif() {
 
 
 	case "$mode" in
 	case "$mode" in
 		mesh)
 		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
 			# authsae or wpa_supplicant
 			json_get_vars key
 			json_get_vars key
 			if [ -n "$key" ]; then
 			if [ -n "$key" ]; then
@@ -606,6 +601,11 @@ mac80211_setup_vif() {
 					mac80211_setup_supplicant || failed=1
 					mac80211_setup_supplicant || failed=1
 				fi
 				fi
 			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)
 		adhoc)
 			wireless_vif_parse_encryption
 			wireless_vif_parse_encryption