aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-05-09 08:58:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-05-09 08:58:12 +0000
commit29f8f90de46236f498e0c7dc799bb5a30055d0a4 (patch)
tree6c333ce15bc202caf79dcf2a5fbd73cee43ee7e0 /package/kernel
parentdbb99e937a7a32a7f9df94b51e6bd5b7766b0825 (diff)
downloadupstream-29f8f90de46236f498e0c7dc799bb5a30055d0a4.tar.gz
upstream-29f8f90de46236f498e0c7dc799bb5a30055d0a4.tar.bz2
upstream-29f8f90de46236f498e0c7dc799bb5a30055d0a4.zip
mac80211: apply mesh parameters after starting authsae/wpa_supplicant (#16697)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45651
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh10
1 files changed, 5 insertions, 5 deletions
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