From: Daniel Golle Date: Thu, 12 Apr 2018 23:37:06 +0000 (+0200) Subject: mac80211: pass hostapd control socket to mesh-mode supplicant X-Git-Tag: v18.06.0-rc1~417 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1356a66f94f31e636fafec514a1c658356ef51b3;p=openwrt%2Fstaging%2Fchunkeey.git mac80211: pass hostapd control socket to mesh-mode supplicant Unlike when operating in Ad-Hoc mode, we apparently need to pass the hostapd control socket interface to wpa_supplicant when using 802.11s mesh mode. There also seems to still be something wrong with the logic setting channel and (v)htmode parameters... Signed-off-by: Daniel Golle --- diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index bf9d52ae42..3a1d475a5c 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -633,7 +633,7 @@ mac80211_setup_vif() { if [ -n "$key" ]; then wireless_vif_parse_encryption freq="$(get_freq "$phy" "$channel")" - mac80211_setup_supplicant_noctl || failed=1 + mac80211_setup_supplicant || failed=1 else json_get_vars mesh_id mcast_rate