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

mac80211: cleanup mac80211.sh

Browse source 
SVN-Revision: 14246
This commit is contained in:
Gabor Juhos 2009-01-28 15:47:28 +00:00
parent 5ccfeb3ef1
commit 04bf46b82b
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
package/mac80211/files/lib/wifi/mac80211.sh
View file

@ -4,13 +4,13 @@ append DRIVERS "mac80211"
scan_mac80211() { scan_mac80211() {
local device="$1" local device="$1"
local adhoc sta ap local adhoc sta ap
config_get vifs "$device" vifs config_get vifs "$device" vifs
for vif in $vifs; do for vif in $vifs; do
config_get ifname "$vif" ifname config_get ifname "$vif" ifname
config_set "$vif" ifname "${ifname:-$device}" config_set "$vif" ifname "${ifname:-$device}"
config_get mode "$vif" mode config_get mode "$vif" mode
case "$mode" in case "$mode" in
adhoc|sta|ap|monitor) adhoc|sta|ap|monitor)
@ -29,17 +29,17 @@ disable_mac80211() (
set_wifi_down "$device" set_wifi_down "$device"
# kill all running hostapd and wpa_supplicant processes that # kill all running hostapd and wpa_supplicant processes that
# are running on atheros/mac80211 vifs # are running on atheros/mac80211 vifs
for pid in `pidof hostapd wpa_supplicant`; do for pid in `pidof hostapd wpa_supplicant`; do
grep wlan /proc/$pid/cmdline >/dev/null && \ grep wlan /proc/$pid/cmdline >/dev/null && \
kill $pid kill $pid
done done
include /lib/network include /lib/network
cd /proc/sys/net cd /proc/sys/net
for dev in *; do for dev in *; do
grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && { grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {
ifconfig "$dev" down ifconfig "$dev" down
unbridge "$dev" unbridge "$dev"
} }
done done
@ -50,7 +50,7 @@ enable_mac80211() {
local device="$1" local device="$1"
config_get channel "$device" channel config_get channel "$device" channel
config_get vifs "$device" vifs config_get vifs "$device" vifs
local first=1 local first=1
for vif in $vifs; do for vif in $vifs; do
ifconfig "$ifname" down 2>/dev/null ifconfig "$ifname" down 2>/dev/null
@ -58,7 +58,7 @@ enable_mac80211() {
config_get enc "$vif" encryption config_get enc "$vif" encryption
config_get eap_type "$vif" eap_type config_get eap_type "$vif" eap_type
config_get mode "$vif" mode config_get mode "$vif" mode
config_get ifname "$vif" ifname config_get ifname "$vif" ifname
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
echo "enable_mac80211($device): Failed to set up $mode vif $ifname" >&2 echo "enable_mac80211($device): Failed to set up $mode vif $ifname" >&2
@ -82,7 +82,7 @@ enable_mac80211() {
else else
iwconfig "$ifname" mode $mode >/dev/null 2>/dev/null iwconfig "$ifname" mode $mode >/dev/null 2>/dev/null
fi fi
wpa= wpa=
case "$enc" in case "$enc" in
WEP|wep) WEP|wep)
@ -105,7 +105,7 @@ enable_mac80211() {
case "$mode" in case "$mode" in
adhoc) adhoc)
config_get addr "$vif" bssid config_get addr "$vif" bssid
[ -z "$addr" ] || { [ -z "$addr" ] || {
iwconfig "$ifname" ap "$addr" iwconfig "$ifname" ap "$addr"
} }
;; ;;
@ -128,7 +128,7 @@ enable_mac80211() {
fi fi
ifconfig "$ifname" up ifconfig "$ifname" up
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
local net_cfg bridge local net_cfg bridge
net_cfg="$(find_net_config "$vif")" net_cfg="$(find_net_config "$vif")"