rdc: disable pci serial, remove bluetooth (because usb is disabled)

[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 b598952..4f96b25 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,19 +1,38 @@
 append DRIVERS "broadcom"
 
-bridge_interface() {
-       (
-               . /etc/functions.sh
-               include network
+find_vif_config() {(
+       local vif="$1"
+       local cfg
+       local ifname
+
+       config_get cfg "$vif" network
+
+       [ -z "$cfg" ] && {
+               include /lib/network
                scan_interfaces
-               cfg="$(find_config "$1")"
-               [ -z "$cfg" ] && return 0
-               config_get iftype "$cfg" type
-               [ "$iftype" = bridge ] && config_get "$iftype" bridge
-       )
-}
+
+               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=
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
@@ -31,9 +50,14 @@ scan_broadcom() {
                                ap=1
                                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
+       config_set "$device" wds "$wds"
 
        local _c=
        for vif in ${adhoc_if:-$sta_if $ap_if}; do
@@ -77,7 +101,6 @@ disable_broadcom() {
        wlc down
        (
                include /lib/network
-               scan_interfaces
 
                # make sure the interfaces are down and removed from all bridges
                for dev in wl0 wl0.1 wl0.2 wl0.3; do
@@ -86,6 +109,7 @@ disable_broadcom() {
                        }
                done
        )
+       true
 }
 
 enable_broadcom() {
@@ -93,6 +117,7 @@ enable_broadcom() {
        config_get channel "$device" channel
        config_get country "$device" country
        config_get maxassoc "$device" maxassoc
+       config_get wds "$device" wds
 
        _c=0
        nas="$(which nas)"
@@ -155,8 +180,12 @@ enable_broadcom() {
                
                config_get ifname "$vif" ifname
                append if_up "ifconfig $ifname up" ";$N"
+               net_cfg="$(find_vif_config "$vif")"
+               [ -z "$net_cfg" ] || {
+                       bridge="$(bridge_interface "$net_cfg")"
+                       append if_up "start_net '$ifname' '$net_cfg'" ";$N"
+               }
                [ -z "$nasopts" ] || {
-                       bridge="$(bridge_interface "$ifname")"
                        eval "${vif}_ssid=\"\$ssid\""
                        mode="-A"
                        [ "$vif" = "$sta_if" ] && mode="-S"
@@ -177,7 +206,7 @@ ${wet:+wet 1}
 radio ${radio:-1}
 macfilter 0
 maclist none
-wds none
+wds ${wds:-none}
 channel ${channel:-0}
 country ${country:-IL0}
 maxassoc ${maxassoc:-128}
@@ -186,8 +215,8 @@ $vif_pre_up
 up
 $vif_post_up
 EOF
-       eval "$nas_cmd"
        eval "$if_up"
+       eval "$nas_cmd"
 }