diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-01-28 15:47:28 +0000 | 
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-01-28 15:47:28 +0000 | 
| commit | 2d62fc6dd537fe6c0b7856f239b0294b71c3e970 (patch) | |
| tree | 6fedc0be4ced35f12e3b9ead7d24737a78733822 /package/mac80211/files/lib/wifi | |
| parent | 02dd2cfea1ab41e5f7ecb7d48c03d7540928ce80 (diff) | |
[package] mac80211: cleanup mac80211.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14246 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/files/lib/wifi')
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 74105c666..6144ce40a 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -4,13 +4,13 @@ append DRIVERS "mac80211"  scan_mac80211() {  	local device="$1"  	local adhoc sta ap -	 +  	config_get vifs "$device" vifs  	for vif in $vifs; do -	 +  		config_get ifname "$vif" ifname  		config_set "$vif" ifname "${ifname:-$device}" -		 +  		config_get mode "$vif" mode  		case "$mode" in  			adhoc|sta|ap|monitor) @@ -29,17 +29,17 @@ disable_mac80211() (  	set_wifi_down "$device"  	# 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  		grep wlan /proc/$pid/cmdline >/dev/null && \  			kill $pid  	done -	 +  	include /lib/network  	cd /proc/sys/net  	for dev in *; do  		grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && { -			ifconfig "$dev" down  +			ifconfig "$dev" down  			unbridge "$dev"  		}  	done @@ -50,7 +50,7 @@ enable_mac80211() {  	local device="$1"  	config_get channel "$device" channel  	config_get vifs "$device" vifs -	 +  	local first=1  	for vif in $vifs; do  		ifconfig "$ifname" down 2>/dev/null @@ -58,7 +58,7 @@ enable_mac80211() {  		config_get enc "$vif" encryption  		config_get eap_type "$vif" eap_type  		config_get mode "$vif" mode -		 +  		config_get ifname "$vif" ifname  		[ $? -ne 0 ] && {  			echo "enable_mac80211($device): Failed to set up $mode vif $ifname" >&2 @@ -82,7 +82,7 @@ enable_mac80211() {  		else  			iwconfig "$ifname" mode $mode >/dev/null 2>/dev/null  		fi -	 +  		wpa=  		case "$enc" in  			WEP|wep) @@ -105,7 +105,7 @@ enable_mac80211() {  		case "$mode" in  			adhoc)  				config_get addr "$vif" bssid -				[ -z "$addr" ] || {  +				[ -z "$addr" ] || {  					iwconfig "$ifname" ap "$addr"  				}  			;; @@ -128,7 +128,7 @@ enable_mac80211() {  		fi  		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  		net_cfg="$(find_net_config "$vif")"  | 
