projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more mssid fixes
[openwrt.git]
/
package
/
broadcom-wl
/
files
/
lib
/
wifi
/
broadcom.sh
diff --git
a/package/broadcom-wl/files/lib/wifi/broadcom.sh
b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index
6cac60c
..
9fed98f
100644
(file)
--- a/
package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/
package/broadcom-wl/files/lib/wifi/broadcom.sh
@@
-1,5
+1,10
@@
+append DRIVERS "broadcom"
+
scan_broadcom() {
local device="$1"
scan_broadcom() {
local device="$1"
+ local wds
+ local adhoc sta apmode
+ local adhoc_if sta_if ap_if
config_get vifs "$device" vifs
for vif in $vifs; do
config_get vifs "$device" vifs
for vif in $vifs; do
@@
-14,18
+19,24
@@
scan_broadcom() {
sta_if="$vif"
;;
ap)
sta_if="$vif"
;;
ap)
- ap=1
+ ap
mode
=1
ap_if="${ap_if:+$ap_if }$vif"
;;
ap_if="${ap_if:+$ap_if }$vif"
;;
+ wds)
+ config_get addr "$vif" bssid
+ [ -z "$addr" ] || append wds "$addr"
+ ;;
*) echo "$device($vif): Invalid mode";;
esac
done
*) echo "$device($vif): Invalid mode";;
esac
done
+ config_set "$device" wds "$wds"
local _c=
for vif in ${adhoc_if:-$sta_if $ap_if}; do
config_set "$vif" ifname "wl0${_c:+.$_c}"
_c=$((${_c:-0} + 1))
done
local _c=
for vif in ${adhoc_if:-$sta_if $ap_if}; do
config_set "$vif" ifname "wl0${_c:+.$_c}"
_c=$((${_c:-0} + 1))
done
+ config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if}"
ifdown="down"
for vif in 0 1 2 3; do
ifdown="down"
for vif in 0 1 2 3; do
@@
-38,7
+49,7
@@
scan_broadcom() {
mssid=1
apsta=0
radio=1
mssid=1
apsta=0
radio=1
- case "$adhoc:$sta:$ap" in
+ case "$adhoc:$sta:$ap
mode
" in
1*)
ap=0
mssid=0
1*)
ap=0
mssid=0
@@
-59,18
+70,35
@@
scan_broadcom() {
esac
}
esac
}
+disable_broadcom() {
+ wlc down
+ (
+ include /lib/network
-setup_broadcom() {
+ # make sure the interfaces are down and removed from all bridges
+ for dev in wl0 wl0.1 wl0.2 wl0.3; do
+ ifconfig "$dev" down 2>/dev/null >/dev/null && {
+ unbridge "$dev"
+ }
+ done
+ )
+ true
+}
+
+enable_broadcom() {
local _c
config_get channel "$device" channel
config_get country "$device" country
config_get maxassoc "$device" maxassoc
local _c
config_get channel "$device" channel
config_get country "$device" country
config_get maxassoc "$device" maxassoc
+ config_get wds "$device" wds
+ config_get vifs "$device" vifs
+ local vif_pre_up vif_post_up vif_do_up
_c=0
nas="$(which nas)"
nas_cmd=
if_up=
_c=0
nas="$(which nas)"
nas_cmd=
if_up=
- for vif in $
{adhoc_if:-$sta_if $ap_if}
; do
+ for vif in $
vifs
; do
append vif_pre_up "vif $_c" "$N"
append vif_post_up "vif $_c" "$N"
append vif_pre_up "vif $_c" "$N"
append vif_post_up "vif $_c" "$N"
@@
-121,13
+149,21
@@
setup_broadcom() {
append vif_post_up "eap_restrict $eap_r" "$N"
config_get ssid "$vif" ssid
append vif_post_up "eap_restrict $eap_r" "$N"
config_get ssid "$vif" ssid
+ append vif_post_up "vlan_mode 0"
append vif_post_up "ssid $ssid" "$N"
append vif_post_up "ssid $ssid" "$N"
+ [ "$wet" = 1 -o "$apsta" = 1 -o "$ap" = 0 -o "$infra" = 0 ] && \
+ append vif_do_up "ssid $ssid" "$N"
+
append vif_post_up "enabled 1" "$N"
config_get ifname "$vif" ifname
append if_up "ifconfig $ifname up" ";$N"
append vif_post_up "enabled 1" "$N"
config_get ifname "$vif" ifname
append if_up "ifconfig $ifname up" ";$N"
+ net_cfg="$(find_net_config "$vif")"
+ [ -z "$net_cfg" ] || {
+ bridge="$(bridge_interface "$net_cfg")"
+ append if_up "start_net '$ifname' '$net_cfg'" ";$N"
+ }
[ -z "$nasopts" ] || {
[ -z "$nasopts" ] || {
- config_get bridge "$vif" bridge # XXX: integrate with /etc/config/network later
eval "${vif}_ssid=\"\$ssid\""
mode="-A"
[ "$vif" = "$sta_if" ] && mode="-S"
eval "${vif}_ssid=\"\$ssid\""
mode="-A"
[ "$vif" = "$sta_if" ] && mode="-S"
@@
-139,8
+175,8
@@
setup_broadcom() {
wlc stdin <<EOF
$ifdown
wlc stdin <<EOF
$ifdown
-mssid $mssid
ap $ap
ap $ap
+mssid $mssid
apsta $apsta
infra $infra
${wet:+wet 1}
apsta $apsta
infra $infra
${wet:+wet 1}
@@
-148,7
+184,7
@@
${wet:+wet 1}
radio ${radio:-1}
macfilter 0
maclist none
radio ${radio:-1}
macfilter 0
maclist none
-wds
none
+wds
${wds:-none}
channel ${channel:-0}
country ${country:-IL0}
maxassoc ${maxassoc:-128}
channel ${channel:-0}
country ${country:-IL0}
maxassoc ${maxassoc:-128}
@@
-157,8
+193,29
@@
$vif_pre_up
up
$vif_post_up
EOF
up
$vif_post_up
EOF
- eval "$nas_cmd"
eval "$if_up"
eval "$if_up"
+ wlc stdin <<EOF
+$vif_do_up
+EOF
+ eval "$nas_cmd"
}
}
+detect_broadcom() {
+ [ -f /proc/net/wl0 ] || return
+ config_get type wl0 type
+ [ "$type" = broadcom ] && return
+ cat <<EOF
+config wifi-device wl0
+ option type broadcom
+ option channel 5
+
+config wifi-iface
+ option device wl0
+ option mode ap
+ option ssid OpenWrt
+ option hidden 0
+ option encryption none
+
+EOF
+}
This page took
0.024934 seconds
and
4
git commands to generate.