@ -522,6 +522,12 @@ mac80211_setup_supplicant() {
wpa_supplicant_run " $ifname " ${ hostapd_ctrl : +-H $hostapd_ctrl }
wpa_supplicant_run " $ifname " ${ hostapd_ctrl : +-H $hostapd_ctrl }
}
}
mac80211_setup_supplicant_noctl( ) {
wpa_supplicant_prepare_interface " $ifname " nl80211 || return 1
wpa_supplicant_add_network " $ifname "
wpa_supplicant_run " $ifname "
}
mac80211_setup_adhoc_htmode( ) {
mac80211_setup_adhoc_htmode( ) {
case " $htmode " in
case " $htmode " in
VHT20| HT20) ibss_htmode = HT20; ;
VHT20| HT20) ibss_htmode = HT20; ;
@ -631,7 +637,7 @@ mac80211_setup_vif() {
authsae_start_interface || failed = 1
authsae_start_interface || failed = 1
else
else
wireless_vif_parse_encryption
wireless_vif_parse_encryption
mac80211_setup_supplicant || failed = 1
mac80211_setup_supplicant_noctl || failed = 1
fi
fi
else
else
json_get_vars mesh_id mcast_rate
json_get_vars mesh_id mcast_rate
@ -688,7 +694,7 @@ mac80211_setup_vif() {
wireless_vif_parse_encryption
wireless_vif_parse_encryption
mac80211_setup_adhoc_htmode
mac80211_setup_adhoc_htmode
if [ " $wpa " -gt 0 -o " $auto_channel " -gt 0 ] ; then
if [ " $wpa " -gt 0 -o " $auto_channel " -gt 0 ] ; then
mac80211_setup_supplicant || failed = 1
mac80211_setup_supplicant_noctl || failed = 1
else
else
mac80211_setup_adhoc
mac80211_setup_adhoc
fi
fi