hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac80211: fix interface startup order for AP+STA (patch by yann lopez) 

SVN-Revision: 19912
owl
Felix Fietkau 2010-02-28 17:06:53 +00:00
parent eeb982177d
commit 1c8fbfbaa6
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
package/mac80211/files/lib/wifi/mac80211.sh
View File

@ -318,29 +318,6 @@ enable_mac80211() {
if [ -n "$rts" ]; then if [ -n "$rts" ]; then
iw phy "$phy" set rts "${rts%%.*}" iw phy "$phy" set rts "${rts%%.*}"
fi 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 done
local start_hostapd= local start_hostapd=
@ -366,6 +343,36 @@ enable_mac80211() {
[ "$mode" = "ap" ] || continue [ "$mode" = "ap" ] || continue
mac80211_start_vif "$vif" "$ifname" mac80211_start_vif "$vif" "$ifname"
done 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
} }