scan_broadcom() {
local device="$1"
- local wds
+ local vif vifs wds
local adhoc sta apmode mon disabled
local adhoc_if sta_if ap_if mon_if
- local _c=0
config_get vifs "$device" vifs
for vif in $vifs; do
config_get_bool disabled "$vif" disabled 0
[ $disabled -eq 0 ] || continue
+ local mode
config_get mode "$vif" mode
- _c=$(($_c + 1))
case "$mode" in
adhoc)
adhoc=1
ap_if="${ap_if:+$ap_if }$vif"
;;
wds)
+ local addr
config_get addr "$vif" bssid
[ -z "$addr" ] || {
addr=$(echo "$addr" | tr 'A-F' 'a-f')
done
config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
- ifdown="down"
- for vif in 0 1 2 3; do
- append ifdown "vif $vif" "$N"
- append ifdown "enabled 0" "$N"
- done
-
ap=1
infra=1
if [ "$_c" -gt 1 ]; then
disable_broadcom() {
local device="$1"
set_wifi_down "$device"
- wlc ifname "$device" down
- wlc ifname "$device" bssid `wlc ifname "$device" default_bssid`
(
include /lib/network
[ -e $pid_file ] && start-stop-daemon -K -q -s SIGKILL -p $pid_file && rm $pid_file
# make sure the interfaces are down and removed from all bridges
- for dev in $device ${device}-1 ${device}-2 ${device}-3; do
- ifconfig "$dev" down 2>/dev/null >/dev/null && {
- unbridge "$dev"
- }
+ local dev ifname
+ for dev in /sys/class/net/wds${device##wl}-* /sys/class/net/${device}-* /sys/class/net/${device}; do
+ if [ -e "$dev" ]; then
+ ifname=${dev##/sys/class/net/}
+ ip link set dev "$ifname" down
+ unbridge "$ifname"
+ fi
+ done
+
+ # make sure all of the devices are disabled in the driver
+ local ifdown=
+ local bssmax=$(wlc ifname "$device" bssmax)
+ local vif=$((${bssmax:-4} - 1))
+ append ifdown "down" "$N"
+ append ifdown "wds none" "$N"
+ while [ $vif -ge 0 ]; do
+ append ifdown "vif $vif" "$N"
+ append ifdown "enabled 0" "$N"
+ vif=$(($vif - 1))
done
+
+ wlc ifname "$device" stdin <<EOF
+$ifdown
+leddc 0xffff
+EOF
)
true
}
enable_broadcom() {
local device="$1"
- local _c
+ local channel country maxassoc wds vifs distance slottime rxantenna txantenna
+ local frameburst macfilter maclist macaddr txpower frag rts hwmode htmode
config_get channel "$device" channel
config_get country "$device" country
config_get maxassoc "$device" maxassoc
config_get_bool frameburst "$device" frameburst
config_get macfilter "$device" macfilter
config_get maclist "$device" maclist
- config_get macaddr "$device" macaddr
+ config_get macaddr "$device" macaddr $(wlc ifname "$device" default_bssid)
config_get txpower "$device" txpower
config_get frag "$device" frag
config_get rts "$device" rts
config_get hwmode "$device" hwmode
config_get htmode "$device" htmode
- local vif_pre_up vif_post_up vif_do_up vif_txpower
local doth=0
local wmm=1
- _c=0
- nas="$(which nas)"
- nas_cmd=
- if_up=
-
[ -z "$slottime" ] && {
[ -n "$distance" ] && {
# slottime = 9 + (distance / 150) + (distance % 150 ? 1 : 0)
}
# Use 'chanspec' instead of 'channel' for 'N' modes (See bcmwifi.h)
- [ ${nmode:-0} -ne 0 -a -n "$band" -a -n "$channel" ] && {
+ [ -n "$nmode" -a -n "$band" -a -n "$channel" ] && {
+ case "$htmode" in
+ HT40)
+ if [ -n "$gmode" ]; then
+ [ $channel -lt 7 ] && htmode="HT40+" || htmode="HT40-"
+ else
+ [ $(( ($channel / 4) % 2 )) -eq 1 ] && htmode="HT40+" || htmode="HT40-"
+ fi
+ ;;
+ esac
case "$htmode" in
- HT40-) chanspec=$(printf 0x%x%x%02x $band 0xe $(($channel - 2))); channel=;;
- HT40+) chanspec=$(printf 0x%x%x%02x $band 0xd $(($channel + 2))); channel=;;
- HT20) chanspec=$(printf 0x%x%x%02x $band 0xb $channel); channel=;;
+ HT40-) chanspec=$(printf 0x%x%x%02x $band 0xe $(($channel - 2))); nmode=1; channel=;;
+ HT40+) chanspec=$(printf 0x%x%x%02x $band 0xd $(($channel + 2))); nmode=1; channel=;;
+ HT20) chanspec=$(printf 0x%x%x%02x $band 0xb $channel); nmode=1; channel=;;
*) ;;
esac
}
+ local leddc=$(wlc ifname "$device" leddc)
+ [ $((leddc)) -eq $((0xffff)) ] && {
+ leddc=0x005a000a;
+ }
+
+ local _c=0
+ local nas="$(which nas)"
+ local if_pre_up if_up nas_cmd
+ local vif vif_pre_up vif_post_up vif_do_up vif_txpower
+ local bssmax=$(wlc ifname "$device" bssmax)
+ bssmax=${bssmax:-4}
+
for vif in $vifs; do
+ [ $_c -ge $bssmax ] && break
+
config_get vif_txpower "$vif" txpower
+ local mode
config_get mode "$vif" mode
append vif_pre_up "vif $_c" "$N"
append vif_post_up "vif $_c" "$N"
config_get_bool doth "$vif" doth "$doth"
[ "$mode" = "sta" ] || {
+ local hidden isolate
config_get_bool hidden "$vif" hidden 0
append vif_pre_up "closed $hidden" "$N"
config_get_bool isolate "$vif" isolate 0
append vif_pre_up "ap_isolate $isolate" "$N"
}
- wsec_r=0
- eap_r=0
- wsec=0
- auth=0
- nasopts=
+ local wsec_r=0
+ local eap_r=0
+ local wsec=0
+ local auth=0
+ local nasopts=
+ local enc key rekey
+
config_get enc "$vif" encryption
case "$enc" in
*wep*)
+ local def defkey k knr
wsec_r=1
wsec=1
defkey=1
nasopts="-k \"\$${vif}_key\"${rekey:+ -g $rekey}"
;;
*wpa*)
+ local auth_port auth_secret auth_server
wsec_r=1
eap_r=1
config_get auth_server "$vif" auth_server
append vif_do_up "wsec_restrict $wsec_r" "$N"
append vif_do_up "eap_restrict $eap_r" "$N"
+ local ssid
config_get ssid "$vif" ssid
append vif_post_up "vlan_mode 0" "$N"
- append vif_post_up "ssid $ssid" "$N"
- append vif_do_up "ssid $ssid" "$N"
+ append vif_pre_up "ssid $ssid" "$N"
[ "$mode" = "monitor" ] && {
append vif_post_up "monitor $monitor" "$N"
}
[ "$mode" = "adhoc" ] && {
+ local bssid
config_get bssid "$vif" bssid
[ -n "$bssid" ] && {
append vif_pre_up "bssid $bssid" "$N"
append vif_post_up "enabled 1" "$N"
+ local ifname
config_get ifname "$vif" ifname
- #append if_up "ifconfig $ifname up" ";$N"
+ local if_cmd="if_pre_up"
+ [ "$ifname" != "${ifname##${device}-}" ] && if_cmd="if_up"
+ append $if_cmd "macaddr=\$(wlc ifname '$ifname' cur_etheraddr)" ";$N"
+ append $if_cmd "ip link set dev '$ifname' address \$macaddr" ";$N"
+ append if_up "ip link set dev '$ifname' up" ";$N"
- local net_cfg
- net_cfg="$(find_net_config "$vif")"
+ local net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || {
+ ubus -t 30 wait_for network.interface."$net_cfg"
append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
append if_up "start_net '$ifname' '$net_cfg'" ";$N"
}
[ -z "$nas" -o -z "$nasopts" ] || {
eval "${vif}_ssid=\"\$ssid\""
- nas_mode="-A"
+ local nas_mode="-A"
[ "$mode" = "sta" ] && nas_mode="-S"
[ -z "$nas_cmd" ] && {
local pid_file=/var/run/nas.$device.pid
_c=$(($_c + 1))
done
wlc ifname "$device" stdin <<EOF
-$ifdown
-
+${macaddr:+bssid $macaddr}
+${macaddr:+cur_etheraddr $macaddr}
band ${band:-0}
${nmode:+nmode $nmode}
${nmode:+${nreqd:+nreqd $nreqd}}
${gmode:+gmode $gmode}
+leddc $leddc
apsta $apsta
ap $ap
${mssid:+mssid $mssid}
radio ${radio:-1}
macfilter ${macfilter:-0}
maclist ${maclist:-none}
-wds none
${wds:+wds $wds}
country ${country:-US}
${channel:+channel $channel}
${frameburst:+frameburst $frameburst}
$vif_pre_up
+EOF
+ eval "$if_pre_up"
+ wlc ifname "$device" stdin <<EOF
up
$vif_post_up
EOF
local i=-1
while grep -qs "^ *wl$((++i)):" /proc/net/dev; do
- local channel
+ local channel type
config_get type wl${i} type
[ "$type" = broadcom ] && continue
channel=`wlc ifname wl${i} channel`
- cat <<EOF
-config wifi-device wl${i}
- option type broadcom
- option channel ${channel:-11}
-
- # REMOVE THIS LINE TO ENABLE WIFI:
- option disabled 1
-
-config wifi-iface
- option device wl${i}
- option network lan
- option mode ap
- option ssid OpenWrt${i#0}
- option encryption none
+ uci -q batch <<-EOF
+ set wireless.wl${i}=wifi-device
+ set wireless.wl${i}.type=broadcom
+ set wireless.wl${i}.channel=${channel:-11}
+ set wireless.wl${i}.txantenna=3
+ set wireless.wl${i}.rxantenna=3
+ set wireless.wl${i}.disabled=1
+
+ set wireless.default_wl${i}=wifi-iface
+ set wireless.default_wl${i}.device=wl${i}
+ set wireless.default_wl${i}.network=lan
+ set wireless.default_wl${i}.mode=ap
+ set wireless.default_wl${i}.ssid=OpenWrt${i#0}
+ set wireless.default_wl${i}.encryption=none
EOF
+ uci -q commit wireless
done
}