From: Daniel Golle Date: Wed, 18 Apr 2018 15:52:51 +0000 (+0200) Subject: Revert "mac80211: pass hostapd control socket to mesh-mode supplicant" X-Git-Tag: v18.06.0-rc1~385 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e633b21c14f8892657bade85681fc40bcf9cbffd;p=openwrt%2Fstaging%2Fpepe2k.git Revert "mac80211: pass hostapd control socket to mesh-mode supplicant" This reverts commit 1356a66f94f31e636fafec514a1c658356ef51b3. The change breaks wpa_supplicant.conf generation, more work is needed to fix mesh+AP. 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 3a1d475a5c..bf9d52ae42 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 || failed=1 + mac80211_setup_supplicant_noctl || failed=1 else json_get_vars mesh_id mcast_rate