X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbroadcom-wl%2Ffiles%2Flib%2Fwifi%2Fbroadcom.sh;h=9fed98f81824566e043590ebad5f78ade36d83ad;hp=1ce85c4c5f474ef2577a40f6f501bb658dfc57d7;hb=84bcbeac8f0d48b785384ca181a70b9253577428;hpb=849999beba127f4ba50fcac8888391a41e6b658c

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 1ce85c4c5f..9fed98f818 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,18 +19,24 @@ 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
 		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
@@ -52,7 +49,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 +72,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,12 +90,15 @@ enable_broadcom() {
 	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=
-	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"
 		
@@ -141,12 +151,19 @@ enable_broadcom() {
 		config_get ssid "$vif" ssid
 		append vif_post_up "vlan_mode 0"
 		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"
+		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 +175,8 @@ enable_broadcom() {
 	wlc stdin <<EOF
 $ifdown
 
-mssid $mssid
 ap $ap
+mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
@@ -167,7 +184,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 +193,11 @@ $vif_pre_up
 up
 $vif_post_up
 EOF
-	eval "$nas_cmd"
 	eval "$if_up"
+	wlc stdin <<EOF
+$vif_do_up
+EOF
+	eval "$nas_cmd"
 }