more mssid fixes

[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 27d9ca6..2238275 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"
 
 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
 
        config_get vifs "$device" vifs
        for vif in $vifs; do


@@ -17,7 +19,7 @@ scan_broadcom() {
                                sta_if="$vif"
                        ;;
                        ap)
                                sta_if="$vif"
                        ;;
                        ap)

-                               ap=1
+                               apmode=1

                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;
                        wds)
                                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 "$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
 
        ifdown="down"
        for vif in 0 1 2 3; do


@@ -46,7 +49,7 @@ scan_broadcom() {
        mssid=1
        apsta=0
        radio=1
        mssid=1
        apsta=0
        radio=1

-       case "$adhoc:$sta:$ap" in
+       case "$adhoc:$sta:$apmode" in

                1*)
                        ap=0
                        mssid=0
                1*)
                        ap=0
                        mssid=0


@@ -88,16 +91,19 @@ enable_broadcom() {
        config_get country "$device" country
        config_get maxassoc "$device" maxassoc
        config_get wds "$device" wds
        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=
 
        _c=0
        nas="$(which nas)"
        nas_cmd=
        if_up=

-       for vif in ${adhoc_if:-$sta_if $ap_if}; do
+       for vif in $vifs; do
+               config_get mode "$vif" mode

                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                

-               [ "$vif" = "$sta_if" ] || {
+               [ "$mode" = "sta" ] || {

                        config_get_bool hidden "$vif" hidden 1
                        append vif_pre_up "closed $hidden" "$N"
                        config_get_bool isolate "$vif" isolate
                        config_get_bool hidden "$vif" hidden 1
                        append vif_pre_up "closed $hidden" "$N"
                        config_get_bool isolate "$vif" isolate


@@ -112,7 +118,23 @@ enable_broadcom() {
                config_get enc "$vif" encryption
                case "$enc" in
                        WEP|wep)
                config_get enc "$vif" encryption
                case "$enc" in
                        WEP|wep)

-                               wsec_r=1
+                               wsec_r=0
+                               wsec=1
+                               defkey=1
+                               config_get key "$vif" key
+                               case "$key" in
+                                       [1234])
+                                               defkey="$key"
+                                               for knr in 1 2 3 4; do
+                                                       config_get k "$vif" key$knr
+                                                       [ -n "$k" ] || continue
+                                                       [ "$defkey" = "$knr" ] && def="=" || def=""
+                                                       append vif_pre_up "wepkey $def$knr,$k" "$N"
+                                               done
+                                       ;;
+                                       "");;
+                                       *) append vif_pre_up "wepkey 1,$key" "$N";;
+                               esac

                        ;;
                        *psk*|*PSK*)
                                wsec_r=1
                        ;;
                        *psk*|*PSK*)
                                wsec_r=1


@@ -146,10 +168,15 @@ enable_broadcom() {
                config_get ssid "$vif" ssid
                append vif_post_up "vlan_mode 0"
                append vif_post_up "ssid $ssid" "$N"
                config_get ssid "$vif" ssid
                append vif_post_up "vlan_mode 0"
                append vif_post_up "ssid $ssid" "$N"

+               case "$mode" in
+                       sta|adhoc) append vif_do_up "ssid $ssid" "$N";;
+               esac
+               

                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
                append if_up "ifconfig $ifname up" ";$N"
                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
                append if_up "ifconfig $ifname up" ";$N"

+               local net_cfg bridge

                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
                        bridge="$(bridge_interface "$net_cfg")"
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
                        bridge="$(bridge_interface "$net_cfg")"


@@ -167,8 +194,8 @@ enable_broadcom() {
        wlc stdin <<EOF
 $ifdown
 
        wlc stdin <<EOF
 $ifdown
 

-mssid $mssid

 ap $ap
 ap $ap

+mssid $mssid

 apsta $apsta
 infra $infra
 ${wet:+wet 1}
 apsta $apsta
 infra $infra
 ${wet:+wet 1}


@@ -186,6 +213,9 @@ up
 $vif_post_up
 EOF
        eval "$if_up"
 $vif_post_up
 EOF
        eval "$if_up"

+       wlc stdin <<EOF
+$vif_do_up
+EOF

        eval "$nas_cmd"
 }
 
        eval "$nas_cmd"
 }