diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-02-28 17:06:53 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2010-02-28 17:06:53 +0000 |
commit | 14376d2461d3a7dc42f6175e320f234227398073 (patch) | |
tree | 37862f0e86d8c86c683d5b7357915c33bf28eda3 /package/mac80211/files/lib/wifi | |
parent | 617c3036e0d70985091ff67a94b9d518379781a5 (diff) | |
download | master-187ad058-14376d2461d3a7dc42f6175e320f234227398073.tar.gz master-187ad058-14376d2461d3a7dc42f6175e320f234227398073.tar.bz2 master-187ad058-14376d2461d3a7dc42f6175e320f234227398073.zip |
mac80211: fix interface startup order for AP+STA (patch by yann lopez)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19912 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/files/lib/wifi')
-rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 257277a280..f127b28566 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -318,29 +318,6 @@ enable_mac80211() { if [ -n "$rts" ]; then iw phy "$phy" set rts "${rts%%.*}" fi - - ifconfig "$ifname" up - - if [ ! "$mode" = "ap" ]; then - mac80211_start_vif "$vif" "$ifname" - - case "$mode" in - adhoc) - config_get bssid "$vif" bssid - iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid - ;; - sta) - if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then - wpa_supplicant_setup_vif "$vif" wext || { - echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2 - # make sure this wifi interface won't accidentally stay open without encryption - ifconfig "$ifname" down - continue - } - fi - ;; - esac - fi done local start_hostapd= @@ -366,6 +343,36 @@ enable_mac80211() { [ "$mode" = "ap" ] || continue mac80211_start_vif "$vif" "$ifname" done + + for vif in $vifs; do + config_get mode "$vif" mode + config_get ifname "$vif" ifname + [ ! "$mode" = "ap" ] || continue + ifconfig "$ifname" up + + if [ ! "$mode" = "ap" ]; then + mac80211_start_vif "$vif" "$ifname" + + case "$mode" in + adhoc) + config_get bssid "$vif" bssid + config_get bssid "$vif" ssid + iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid + ;; + sta) + if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then + wpa_supplicant_setup_vif "$vif" wext || { + echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2 + # make sure this wifi interface won't accidentally stay open without encryption + ifconfig "$ifname" down + continue + } + fi + ;; + esac + fi + done + } |