upgrade compat-wireless to 2008-11-03

[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 5f87282..ece3a69 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -5,10 +5,12 @@ scan_broadcom() {
        local wds
        local adhoc sta apmode mon
        local adhoc_if sta_if ap_if mon_if
        local wds
        local adhoc sta apmode mon
        local adhoc_if sta_if ap_if mon_if

+       local _c=0

 
        config_get vifs "$device" vifs
        for vif in $vifs; do
                config_get mode "$vif" mode
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
                config_get mode "$vif" mode

+               _c=$(($_c + 1))

                case "$mode" in
                        adhoc)
                                adhoc=1
                case "$mode" in
                        adhoc)
                                adhoc=1


@@ -24,7 +26,10 @@ scan_broadcom() {
                        ;;
                        wds)
                                config_get addr "$vif" bssid
                        ;;
                        wds)
                                config_get addr "$vif" bssid

-                               [ -z "$addr" ] || append wds "$addr"
+                               [ -z "$addr" ] || {
+                                       addr=$(echo "$addr" | tr 'A-F' 'a-f')
+                                       append wds "$addr"
+                               }

                        ;;
                        monitor)
                                mon=1
                        ;;
                        monitor)
                                mon=1


@@ -50,7 +55,11 @@ scan_broadcom() {
 
        ap=1
        infra=1
 
        ap=1
        infra=1

-       mssid=1
+       if [ "$_c" -gt 1 ]; then
+               mssid=1
+       else
+               mssid=
+       fi

        apsta=0
        radio=1
        monitor=0
        apsta=0
        radio=1
        monitor=0


@@ -145,6 +154,7 @@ enable_broadcom() {
                config_get mode "$vif" mode
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                config_get mode "$vif" mode
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"

+               append vif_do_up "vif $_c" "$N"

                
                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0
                
                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0


@@ -202,7 +212,7 @@ enable_broadcom() {
                                        *) auth=2; wsec=2;;
                                esac
                                eval "${vif}_key=\"\$key\""
                                        *) auth=2; wsec=2;;
                                esac
                                eval "${vif}_key=\"\$key\""

-                               nasopts="-r \"\$${vif}_key\" -h $server -p $port"
+                               nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}"

                        ;;
                esac
                append vif_do_up "wsec $wsec" "$N"
                        ;;
                esac
                append vif_do_up "wsec $wsec" "$N"