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

madwifi: only start hostapd when necessary

Browse source 
SVN-Revision: 12420
This commit is contained in:
Felix Fietkau 2008-08-28 12:13:36 +00:00
parent 5f30b3de44
commit a2e70fed22
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/madwifi/files/lib/wifi/madwifi.sh
View file

@ -78,6 +78,7 @@ enable_atheros() {
local first=1 local first=1
for vif in $vifs; do for vif in $vifs; do
local start_hostapd
nosbeacon= nosbeacon=
config_get ifname "$vif" ifname config_get ifname "$vif" ifname
config_get enc "$vif" encryption config_get enc "$vif" encryption
@ -137,7 +138,6 @@ enable_atheros() {
[ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep" [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
} }
wpa=
case "$enc" in case "$enc" in
WEP|wep) WEP|wep)
for idx in 1 2 3 4; do for idx in 1 2 3 4; do
@ -152,6 +152,7 @@ enable_atheros() {
esac esac
;; ;;
PSK|psk|PSK2|psk2) PSK|psk|PSK2|psk2)
start_hostapd=1
config_get key "$vif" key config_get key "$vif" key
;; ;;
esac esac
@ -261,7 +262,7 @@ enable_atheros() {
config_get_bool isolate "$vif" isolate 0 config_get_bool isolate "$vif" isolate 0
iwpriv "$ifname" ap_bridge "$((isolate^1))" iwpriv "$ifname" ap_bridge "$((isolate^1))"
if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then if [ -n "$start_hostapd" ] && eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
hostapd_setup_vif "$vif" madwifi || { hostapd_setup_vif "$vif" madwifi || {
echo "enable_atheros($device): Failed to set up hostapd for interface $ifname" >&2 echo "enable_atheros($device): Failed to set up hostapd for interface $ifname" >&2
# make sure this wifi interface won't accidentally stay open without encryption # make sure this wifi interface won't accidentally stay open without encryption