more mssid fixes

[openwrt/svn-archive/archive.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 27d9ca6be73b8d51b7a081498ae5b77c975033e7..9fed98f81824566e043590ebad5f78ade36d83ad 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -2,7 +2,9 @@ append DRIVERS "broadcom"
 
 scan_broadcom() {
        local device="$1"
-       local wds=
+       local wds
+       local adhoc sta apmode
+       local adhoc_if sta_if ap_if
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
@@ -17,7 +19,7 @@ scan_broadcom() {
                                sta_if="$vif"
                        ;;
                        ap)
-                               ap=1
+                               apmode=1
                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;
                        wds)
@@ -34,6 +36,7 @@ scan_broadcom() {
                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
@@ -46,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
@@ -88,12 +91,14 @@ enable_broadcom() {
        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"
                
@@ -146,6 +151,9 @@ 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
@@ -167,8 +175,8 @@ enable_broadcom() {
        wlc stdin <<EOF
 $ifdown
 
-mssid $mssid
 ap $ap
+mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
@@ -186,6 +194,9 @@ up
 $vif_post_up
 EOF
        eval "$if_up"
+       wlc stdin <<EOF
+$vif_do_up
+EOF
        eval "$nas_cmd"
 }