KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: don't pass the hostapd ctrl iface in adhoc

Browse source 
Passing the ctrl iface to wpa_supplicant will automatically cause wpa_supplicant
to send "STOP_AP" messages to the hostapd. This breaks the AP interfaces.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
This commit is contained in:
Antonio Quartulli 2012-11-09 15:23:34 +01:00 committed by Felix Fietkau
parent 772afef61d
commit 0da54fa642
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View file

@ -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