X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbroadcom-wl%2Ffiles%2Flib%2Fwifi%2Fbroadcom.sh;h=435c440e2e02bca0b3f2a1046ab91df0eaf8709c;hb=93910ace66076a8e3ea53ad70ad9ae961fbf99d0;hp=33a3ebb8fa9547922c6fb8510d49ce8eaac812bf;hpb=d3abc2c9f5dc2d238c17bd8764f780b38cf58491;p=openwrt-10.03%2F.git

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 33a3ebb8f..435c440e2 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,3 +1,15 @@
+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"
 
@@ -69,6 +81,7 @@ setup_broadcom() {
 	_c=0
 	nas="$(which nas)"
 	nas_cmd=
+	if_up=
 	for vif in ${adhoc_if:-$sta_if $ap_if}; do
 		append vif_pre_up "vif $_c" "$N"
 		append vif_post_up "vif $_c" "$N"
@@ -120,21 +133,23 @@ setup_broadcom() {
 		append vif_post_up "eap_restrict $eap_r" "$N"
 		
 		config_get ssid "$vif" ssid
+		append vif_post_up "vlan_mode 0"
 		append vif_post_up "ssid $ssid" "$N"
 		append vif_post_up "enabled 1" "$N"
 		
+		config_get ifname "$vif" ifname
+		append if_up "ifconfig $ifname up" ";$N"
 		[ -z "$nasopts" ] || {
-			config_get ifname "$vif" ifname
-			config_get bridge "$vif" bridge # XXX: integrate with /etc/config/network later
+			bridge="$(bridge_interface "$ifname")"
 			eval "${vif}_ssid=\"\$ssid\""
 			mode="-A"
 			[ "$vif" = "$sta_if" ] && mode="-S"
-			[ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 -i $ifname${bridge:+ -l $bridge} $mode -m $auth -w $crypto -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+			[ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $mode -m $auth -w $crypto -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
 		}
 		_c=$(($_c + 1))
 	done
 	killall -KILL nas >&- 2>&-
-	cat <<EOF
+	wlc stdin <<EOF
 $ifdown
 
 mssid $mssid
@@ -156,6 +171,7 @@ up
 $vif_post_up
 EOF
 	eval "$nas_cmd"
+	eval "$if_up"
 }