projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa
[openwrt-10.03/.git]
/
package
/
base-files
/
files
/
sbin
/
wifi
diff --git
a/package/base-files/files/sbin/wifi
b/package/base-files/files/sbin/wifi
index 51e10af103639dc0ed29c95b9f89003ef84ef61c..30ecb1b77c748d141b79105662a776a2fb916cc7 100755
(executable)
--- a/
package/base-files/files/sbin/wifi
+++ b/
package/base-files/files/sbin/wifi
@@
-38,11
+38,11
@@
bridge_interface() {(
wifi_updown() {
[ enable = "$1" ] && wifi_updown disable "$2"
for device in ${2:-$DEVICES}; do (
wifi_updown() {
[ enable = "$1" ] && wifi_updown disable "$2"
for device in ${2:-$DEVICES}; do (
- config_get disabled "$device" disabled
- [ 1 == "$disabled" ] && {
- echo "'$device' is disabled"
- set disable
- }
+ config_get disabled "$device" disabled
+ [ 1 == "$disabled" ] && {
+ echo "'$device' is disabled"
+ set disable
+ }
config_get iftype "$device" type
if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
eval "scan_$iftype '$device'"
config_get iftype "$device" type
if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
eval "scan_$iftype '$device'"
@@
-67,30
+67,30
@@
start_net() {(
local iface="$1"
local config="$2"
local iface="$1"
local config="$2"
+ [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
include /lib/network
scan_interfaces
include /lib/network
scan_interfaces
- setup_interface "$1" "$2"
+ setup_interface "$1" "$2"
"$3"
)}
set_wifi_up() {
local cfg="$1"
local ifname="$2"
)}
set_wifi_up() {
local cfg="$1"
local ifname="$2"
- uci
set "/var/state/wireless.${cfg}.up=1"
- uci
set "/var/state/wireless.${cfg}.ifname=
$ifname"
+ uci
_set_state wireless "$cfg" up 1
+ uci
_set_state wireless "$cfg" ifname "
$ifname"
}
set_wifi_down() {
local cfg="$1"
local vifs vif vifstr
}
set_wifi_down() {
local cfg="$1"
local vifs vif vifstr
- [ -f /var/state/wireless ] || return
+ [ -f "/var/run/wifi-${cfg}.pid" ] &&
+ kill "$(cat "/var/run/wifi-${cfg}.pid")"
+ uci_revert_state wireless "$cfg"
config_get vifs "$cfg" vifs
for vif in $vifs; do
config_get vifs "$cfg" vifs
for vif in $vifs; do
-
append vifstr "$vif" "|
"
+
uci_revert_state wireless "$vif
"
done
done
- FILE="/var/state/wireless.$$"
- grep -vE "^config_set '($vifstr)' " /var/state/wireless > "$FILE"
- mv "$FILE" /var/state/wireless
}
scan_wifi() {
}
scan_wifi() {