projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fd2bb1e
)
[package] mac80211: cleanup mac80211.sh
author
Gabor Juhos
<juhosg@openwrt.org>
Wed, 28 Jan 2009 15:47:28 +0000
(15:47 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Wed, 28 Jan 2009 15:47:28 +0000
(15:47 +0000)
SVN-Revision: 14246
package/mac80211/files/lib/wifi/mac80211.sh
patch
|
blob
|
history
diff --git
a/package/mac80211/files/lib/wifi/mac80211.sh
b/package/mac80211/files/lib/wifi/mac80211.sh
index 74105c666228d734cffd308b7973dfae6b62f637..6144ce40ae775f05453f0b9e5994f51d7ad1b897 100644
(file)
--- 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
scan_mac80211() {
local device="$1"
local adhoc sta ap
-
+
config_get vifs "$device" vifs
for vif in $vifs; do
config_get vifs "$device" vifs
for vif in $vifs; do
-
+
config_get ifname "$vif" ifname
config_set "$vif" ifname "${ifname:-$device}"
config_get ifname "$vif" ifname
config_set "$vif" ifname "${ifname:-$device}"
-
+
config_get mode "$vif" mode
case "$mode" in
adhoc|sta|ap|monitor)
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
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
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 && {
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
unbridge "$dev"
}
done
@@
-50,7
+50,7
@@
enable_mac80211() {
local device="$1"
config_get channel "$device" channel
config_get vifs "$device" vifs
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
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 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
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
else
iwconfig "$ifname" mode $mode >/dev/null 2>/dev/null
fi
-
+
wpa=
case "$enc" in
WEP|wep)
wpa=
case "$enc" in
WEP|wep)
@@
-105,7
+105,7
@@
enable_mac80211() {
case "$mode" in
adhoc)
config_get addr "$vif" bssid
case "$mode" in
adhoc)
config_get addr "$vif" bssid
- [ -z "$addr" ] || {
+ [ -z "$addr" ] || {
iwconfig "$ifname" ap "$addr"
}
;;
iwconfig "$ifname" ap "$addr"
}
;;
@@
-128,7
+128,7
@@
enable_mac80211() {
fi
ifconfig "$ifname" up
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")"
local net_cfg bridge
net_cfg="$(find_net_config "$vif")"