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
commitd123ad1b881e92e4f66ec3226a63744ad1b0e736 (patch)
tree551c3ff5202fc92440dc380238d7fe462e024d6b /package/kernel
parent0b4fff15b92ea1f7d76c2e9e3766e3207f816837 (diff)
downloadupstream-d123ad1b881e92e4f66ec3226a63744ad1b0e736.tar.gz
upstream-d123ad1b881e92e4f66ec3226a63744ad1b0e736.tar.bz2
upstream-d123ad1b881e92e4f66ec3226a63744ad1b0e736.zip
mac80211: apply mesh parameters after starting authsae/wpa_supplicant (#16697)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45651 3c298f89-4303-0410-b956-a3cf2f4a3e73
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