move two functions from broadcom.sh to /sbin/wifi

SVN-Revision: 5496
master
Felix Fietkau 18 years ago
parent bc779dc435
commit cbe21ae5f5
  1. 32
      package/base-files/default/sbin/wifi
  2. 32
      package/broadcom-wl/files/lib/wifi/broadcom.sh

@ -3,6 +3,38 @@
. /etc/functions.sh
find_net_config() {(
local vif="$1"
local cfg
local ifname
config_get cfg "$vif" network
[ -z "$cfg" ] && {
include /lib/network
scan_interfaces
config_get ifname "$vif" ifnamea
cfg="$(find_config "$ifname")"
}
[ -z "$cfg" ] && return 0
echo "$cfg"
)}
bridge_interface() {(
local cfg="$1"
[ -z "$cfg" ] && return 0
include /lib/network
scan_interfaces
config_get iftype "$cfg" type
[ "$iftype" = bridge ] && config_get "$iftype" ifname
)}
wifi_up() {
for device in ${2:-$DEVICES}; do (
config_get iftype "$device" type

@ -1,35 +1,5 @@
append DRIVERS "broadcom"
find_vif_config() {(
local vif="$1"
local cfg
local ifname
config_get cfg "$vif" network
[ -z "$cfg" ] && {
include /lib/network
scan_interfaces
config_get ifname "$vif" ifnamea
cfg="$(find_config "$ifname")"
}
[ -z "$cfg" ] && return 0
echo "$cfg"
)}
bridge_interface() {(
local cfg="$1"
[ -z "$cfg" ] && return 0
include /lib/network
scan_interfaces
config_get iftype "$cfg" type
[ "$iftype" = bridge ] && config_get "$iftype" ifname
)}
scan_broadcom() {
local device="$1"
local wds=
@ -180,7 +150,7 @@ enable_broadcom() {
config_get ifname "$vif" ifname
append if_up "ifconfig $ifname up" ";$N"
net_cfg="$(find_vif_config "$vif")"
net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || {
bridge="$(bridge_interface "$net_cfg")"
append if_up "start_net '$ifname' '$net_cfg'" ";$N"

Loading…
Cancel
Save