projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update linux 3.2 to 3.2.12
[openwrt.git]
/
package
/
base-files
/
files
/
sbin
/
wifi
diff --git
a/package/base-files/files/sbin/wifi
b/package/base-files/files/sbin/wifi
index
7c77c0b
..
5cbf50b
100755
(executable)
--- a/
package/base-files/files/sbin/wifi
+++ b/
package/base-files/files/sbin/wifi
@@
-3,6
+3,14
@@
. /etc/functions.sh
. /etc/functions.sh
+usage() {
+ cat <<EOF
+Usage: $0 [down|detect]
+enables (default), disables or detects a wifi configuration.
+EOF
+ exit 1
+}
+
find_net_config() {(
local vif="$1"
local cfg
find_net_config() {(
local vif="$1"
local cfg
@@
-32,6
+40,7
@@
bridge_interface() {(
config_get iftype "$cfg" type
[ "$iftype" = bridge ] && config_get "$cfg" ifname
config_get iftype "$cfg" type
[ "$iftype" = bridge ] && config_get "$cfg" ifname
+ prepare_interface_bridge "$cfg"
)}
prepare_key_wep() {
)}
prepare_key_wep() {
@@
-84,7
+93,10
@@
wifi_fixup_hwmode() {
}
wifi_updown() {
}
wifi_updown() {
- [ enable = "$1" ] && wifi_updown disable "$2"
+ [ enable = "$1" ] && {
+ wifi_updown disable "$2"
+ scan_wifi
+ }
for device in ${2:-$DEVICES}; do (
config_get disabled "$device" disabled
[ 1 == "$disabled" ] && {
for device in ${2:-$DEVICES}; do (
config_get disabled "$device" disabled
[ 1 == "$disabled" ] && {
@@
-117,9
+129,11
@@
start_net() {(
local vifmac="$3"
[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
local vifmac="$3"
[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
- include /lib/network
- scan_interfaces
- setup_interface "$iface" "$config" "" "$vifmac"
+ [ -z "$config" ] || {
+ include /lib/network
+ scan_interfaces
+ setup_interface "$iface" "$config" "" "$vifmac"
+ }
)}
set_wifi_up() {
)}
set_wifi_up() {
@@
-134,7
+148,7
@@
set_wifi_down() {
local vifs vif vifstr
[ -f "/var/run/wifi-${cfg}.pid" ] &&
local vifs vif vifstr
[ -f "/var/run/wifi-${cfg}.pid" ] &&
- kill "$(cat "/var/run/wifi-${cfg}.pid")"
+ kill "$(cat "/var/run/wifi-${cfg}.pid")"
2>/dev/null
uci_revert_state wireless "$cfg"
config_get vifs "$cfg" vifs
for vif in $vifs; do
uci_revert_state wireless "$cfg"
config_get vifs "$cfg" vifs
for vif in $vifs; do
@@
-144,12
+158,23
@@
set_wifi_down() {
scan_wifi() {
local cfgfile="$1"
scan_wifi() {
local cfgfile="$1"
+ DEVICES=
config_cb() {
config_cb() {
- config_get TYPE "$CONFIG_SECTION" TYPE
- case "$TYPE" in
+ local type="$1"
+ local section="$2"
+
+ # section start
+ case "$type" in
wifi-device)
wifi-device)
- append DEVICES "$CONFIG_SECTION"
+ append DEVICES "$section"
+ config_set "$section" vifs ""
+ config_set "$section" ht_capab ""
;;
;;
+ esac
+
+ # section end
+ config_get TYPE "$CONFIG_SECTION" TYPE
+ case "$TYPE" in
wifi-iface)
config_get device "$CONFIG_SECTION" device
config_get vifs "$device" vifs
wifi-iface)
config_get device "$CONFIG_SECTION" device
config_get vifs "$device" vifs
@@
-169,5
+194,6
@@
scan_wifi
case "$1" in
down) wifi_updown "disable" "$2";;
detect) wifi_detect "$2";;
case "$1" in
down) wifi_updown "disable" "$2";;
detect) wifi_detect "$2";;
+ --help|help) usage;;
*) wifi_updown "enable" "$2";;
esac
*) wifi_updown "enable" "$2";;
esac
This page took
0.022934 seconds
and
4
git commands to generate.