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 <daniel@makrotopia.org>

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index bf9d52ae4203c294e25487f1678cfcd25e7a1dce..3a1d475a5cd336c6e4f88db27d677c60c47d6824 100644 (file)
--- 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