replace the hostapd preselection with a wpad preselection to enable proper client...

[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 7d56c10..75f8b08 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -42,7 +42,7 @@ scan_broadcom() {
 
        local _c=
        for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
 
        local _c=
        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))
        done
        config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
                _c=$((${_c:-0} + 1))
        done
        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"
-       wlc down
+       local device="$1"
+       set_wifi_down "$device"
+       wlc ifname "$device" down

        (
                include /lib/network
 
                # make sure the interfaces are down and removed from all bridges
        (
                include /lib/network
 
                # 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 && {
                                unbridge "$dev"
                        }
                        ifconfig "$dev" down 2>/dev/null >/dev/null && {
                                unbridge "$dev"
                        }


@@ -109,6 +110,7 @@ disable_broadcom() {
 }
 
 enable_broadcom() {
 }
 
 enable_broadcom() {

+       local device="$1"

        local _c
        config_get channel "$device" channel
        config_get country "$device" country
        local _c
        config_get channel "$device" channel
        config_get country "$device" country


@@ -124,10 +126,15 @@ enable_broadcom() {
        config_get maclist "$device" maclist
        config_get macaddr "$device" macaddr
        config_get txpower "$device" txpower
        config_get maclist "$device" maclist
        config_get macaddr "$device" macaddr
        config_get txpower "$device" txpower

+       config_get frag "$device" frag
+       config_get rts "$device" rts

        local vif_pre_up vif_post_up vif_do_up vif_txpower
        local vif_pre_up vif_post_up vif_do_up vif_txpower

+       local doth=0
+       local wmm=0

 
        _c=0
        nas="$(which nas)"
 
        _c=0
        nas="$(which nas)"

+       [ -n "$nas" ] && nas="start-stop-daemon -S -b -x $nas -- "

        nas_cmd=
        if_up=
 
        nas_cmd=
        if_up=
 


@@ -139,7 +146,7 @@ enable_broadcom() {
        } || {
                slottime="${slottime:--1}"
        }
        } || {
                slottime="${slottime:--1}"
        }

-       
+

        case "$macfilter" in
                allow|2)
                        macfilter=2;
        case "$macfilter" in
                allow|2)
                        macfilter=2;


@@ -159,7 +166,10 @@ enable_broadcom() {
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                append vif_do_up "vif $_c" "$N"
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                append vif_do_up "vif $_c" "$N"

-               
+
+               config_get_bool wmm "$vif" wmm "$wmm"
+               config_get_bool doth "$vif" doth "$doth"
+

                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0
                        append vif_pre_up "closed $hidden" "$N"
                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0
                        append vif_pre_up "closed $hidden" "$N"


@@ -174,11 +184,15 @@ enable_broadcom() {
                nasopts=
                config_get enc "$vif" encryption
                case "$enc" in
                nasopts=
                config_get enc "$vif" encryption
                case "$enc" in

-                       WEP|wep)
+                       *WEP*|*wep*)

                                wsec_r=1
                                wsec=1
                                defkey=1
                                config_get key "$vif" key
                                wsec_r=1
                                wsec=1
                                defkey=1
                                config_get key "$vif" key

+                               case "$enc" in
+                                       *shared*) append vif_do_up "wepauth 1" "$N";;
+                                       *) append vif_do_up "wepauth 0" "$N";;
+                               esac

                                case "$key" in
                                        [1234])
                                                defkey="$key"
                                case "$key" in
                                        [1234])
                                                defkey="$key"


@@ -273,7 +287,7 @@ enable_broadcom() {
                _c=$(($_c + 1))
        done
        killall -KILL nas >&- 2>&-
                _c=$(($_c + 1))
        done
        killall -KILL nas >&- 2>&-

-       wlc stdin <<EOF
+       wlc ifname "$device" stdin <<EOF

 $ifdown
 
 apsta $apsta
 $ifdown
 
 apsta $apsta


@@ -282,9 +296,12 @@ ${mssid:+mssid $mssid}
 infra $infra
 ${wet:+wet 1}
 802.11d 0
 infra $infra
 ${wet:+wet 1}
 802.11d 0

-802.11h 0
+802.11h ${doth:-0}
+wme ${wmm:-0}

 rxant ${rxantenna:-3}
 txant ${txantenna:-3}
 rxant ${rxantenna:-3}
 txant ${txantenna:-3}

+fragthresh ${frag:-2346}
+rtsthresh ${rts:-2347}

 monitor ${monitor:-0}
 passive ${passive:-0}
 
 monitor ${monitor:-0}
 passive ${passive:-0}
 


@@ -304,7 +321,7 @@ up
 $vif_post_up
 EOF
        eval "$if_up"
 $vif_post_up
 EOF
        eval "$if_up"

-       wlc stdin <<EOF
+       wlc ifname "$device" stdin <<EOF

 $vif_do_up
 EOF
 
 $vif_do_up
 EOF
 


@@ -318,11 +335,13 @@ EOF
 
 
 detect_broadcom() {
 
 
 detect_broadcom() {

-       [ -f /proc/net/wl0 ] || return
-       config_get type wl0 type
-       [ "$type" = broadcom ] && return
-       cat <<EOF
-config wifi-device  wl0
+       local i=0
+
+       while [ -f /proc/net/wl$((i++)) ]; do
+               config_get type wl${i} type
+               [ "$type" = broadcom ] && continue
+               cat <<EOF
+config wifi-device  wl${i}

        option type     broadcom
        option channel  5
 
        option type     broadcom
        option channel  5
 


@@ -330,10 +349,12 @@ config wifi-device  wl0
        option disabled 1
 
 config wifi-iface
        option disabled 1
 
 config wifi-iface

-       option device   wl0
+       option device   wl${i}

        option network  lan
        option mode     ap
        option network  lan
        option mode     ap

-       option ssid     OpenWrt
+       option ssid     OpenWrt${i#0}

        option encryption none
        option encryption none

+

 EOF
 EOF

+       done

 }
 }