X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b573d8ec23fe7dcba00cdea3be95608b72f37902..4822dacdd483b62f17d487f3c6f8b1bed2fcdeba:/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 1ce85c4c5..397932e2a 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,19 +1,10 @@
 append DRIVERS "broadcom"
 
-bridge_interface() {
-	(
-		. /etc/functions.sh
-		include network
-		scan_interfaces
-		cfg="$(find_config "$1")"
-		[ -z "$cfg" ] && return 0
-		config_get iftype "$cfg" type
-		[ "$iftype" = bridge ] && config_get "$iftype" bridge
-	)
-}
-
 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
@@ -28,12 +19,17 @@ scan_broadcom() {
 				sta_if="$vif"
 			;;
 			ap)
-				ap=1
+				apmode=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
@@ -52,7 +48,7 @@ scan_broadcom() {
 	mssid=1
 	apsta=0
 	radio=1
-	case "$adhoc:$sta:$ap" in
+	case "$adhoc:$sta:$apmode" in
 		1*)
 			ap=0
 			mssid=0
@@ -75,7 +71,17 @@ scan_broadcom() {
 
 disable_broadcom() {
 	wlc down
-	ifconfig wl0 down
+	(
+		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
+			ifconfig "$dev" down 2>/dev/null >/dev/null && {
+				unbridge "$dev"
+			}
+		done
+	)
+	true
 }
 
 enable_broadcom() {
@@ -83,6 +89,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)"
@@ -145,8 +152,12 @@ enable_broadcom() {
 		
 		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" ] || {
-			bridge="$(bridge_interface "$ifname")"
 			eval "${vif}_ssid=\"\$ssid\""
 			mode="-A"
 			[ "$vif" = "$sta_if" ] && mode="-S"
@@ -158,8 +169,8 @@ enable_broadcom() {
 	wlc stdin <<EOF
 $ifdown
 
-mssid $mssid
 ap $ap
+mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
@@ -167,7 +178,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}
@@ -176,8 +187,8 @@ $vif_pre_up
 up
 $vif_post_up
 EOF
-	eval "$nas_cmd"
 	eval "$if_up"
+	eval "$nas_cmd"
 }