mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-17 21:57:10 +02:00
[package] broadcom-wl: detect all radios when generating config, do wireless setup per-interface (#5308)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19273 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6dab486ee1
commit
5682b73fd7
@ -42,7 +42,7 @@ scan_broadcom() {
|
|||||||
|
|
||||||
local _c=
|
local _c=
|
||||||
for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
|
for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
|
||||||
config_set "$vif" ifname "wl0${_c:+.$_c}"
|
config_set "$vif" ifname "${device}${_c:+.$_c}"
|
||||||
_c=$((${_c:-0} + 1))
|
_c=$((${_c:-0} + 1))
|
||||||
done
|
done
|
||||||
config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
|
config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
|
||||||
@ -93,13 +93,14 @@ scan_broadcom() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
disable_broadcom() {
|
disable_broadcom() {
|
||||||
set_wifi_down "$1"
|
local device="$1"
|
||||||
wlc down
|
set_wifi_down "$device"
|
||||||
|
wlc ifname "$device" down
|
||||||
(
|
(
|
||||||
include /lib/network
|
include /lib/network
|
||||||
|
|
||||||
# make sure the interfaces are down and removed from all bridges
|
# make sure the interfaces are down and removed from all bridges
|
||||||
for dev in wl0 wl0.1 wl0.2 wl0.3; do
|
for dev in $device ${device}.1 ${device}.2 ${device}.3; do
|
||||||
ifconfig "$dev" down 2>/dev/null >/dev/null && {
|
ifconfig "$dev" down 2>/dev/null >/dev/null && {
|
||||||
unbridge "$dev"
|
unbridge "$dev"
|
||||||
}
|
}
|
||||||
@ -109,6 +110,7 @@ disable_broadcom() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
enable_broadcom() {
|
enable_broadcom() {
|
||||||
|
local device="$1"
|
||||||
local _c
|
local _c
|
||||||
config_get channel "$device" channel
|
config_get channel "$device" channel
|
||||||
config_get country "$device" country
|
config_get country "$device" country
|
||||||
@ -285,7 +287,7 @@ enable_broadcom() {
|
|||||||
_c=$(($_c + 1))
|
_c=$(($_c + 1))
|
||||||
done
|
done
|
||||||
killall -KILL nas >&- 2>&-
|
killall -KILL nas >&- 2>&-
|
||||||
wlc stdin <<EOF
|
wlc ifname "$device" stdin <<EOF
|
||||||
$ifdown
|
$ifdown
|
||||||
|
|
||||||
apsta $apsta
|
apsta $apsta
|
||||||
@ -319,7 +321,7 @@ up
|
|||||||
$vif_post_up
|
$vif_post_up
|
||||||
EOF
|
EOF
|
||||||
eval "$if_up"
|
eval "$if_up"
|
||||||
wlc stdin <<EOF
|
wlc ifname "$device" stdin <<EOF
|
||||||
$vif_do_up
|
$vif_do_up
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
@ -333,11 +335,13 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
detect_broadcom() {
|
detect_broadcom() {
|
||||||
[ -f /proc/net/wl0 ] || return
|
local i=0
|
||||||
config_get type wl0 type
|
|
||||||
[ "$type" = broadcom ] && return
|
while [ -f /proc/net/wl$((i++)) ]; do
|
||||||
cat <<EOF
|
config_get type wl${i} type
|
||||||
config wifi-device wl0
|
[ "$type" = broadcom ] && continue
|
||||||
|
cat <<EOF
|
||||||
|
config wifi-device wl${i}
|
||||||
option type broadcom
|
option type broadcom
|
||||||
option channel 5
|
option channel 5
|
||||||
|
|
||||||
@ -345,10 +349,12 @@ config wifi-device wl0
|
|||||||
option disabled 1
|
option disabled 1
|
||||||
|
|
||||||
config wifi-iface
|
config wifi-iface
|
||||||
option device wl0
|
option device wl${i}
|
||||||
option network lan
|
option network lan
|
||||||
option mode ap
|
option mode ap
|
||||||
option ssid OpenWrt
|
option ssid OpenWrt${i#0}
|
||||||
option encryption none
|
option encryption none
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user