Add CDMA/EVDO support to comgt package

[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 0bffb42..2e6f2e8 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -5,7 +5,6 @@ scan_broadcom() {
        local wds
        local adhoc sta apmode
        local adhoc_if sta_if ap_if
-       local macfilter
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
@@ -53,7 +52,7 @@ scan_broadcom() {
        case "$adhoc:$sta:$apmode" in
                1*)
                        ap=0
-                       mssid=0
+                       mssid=
                        infra=0
                ;;
                :1:1)
@@ -63,24 +62,12 @@ scan_broadcom() {
                :1:)
                        wet=1
                        ap=0
-                       mssid=0
+                       mssid=
                ;;
                ::)
                        radio=0
                ;;
        esac
-       macfilter=0
-       case "$macfilter" in
-               allow|2)
-                       macfilter=2;
-               ;;
-               deny|1)
-                       macfilter=1;
-               ;;
-               disable|0)
-                       macfilter=0;
-               ;;
-       esac
 }
 
 disable_broadcom() {
@@ -127,6 +114,18 @@ enable_broadcom() {
        } || {
                slottime="${slottime:--1}"
        }
+       
+       case "$macfilter" in
+               allow|2)
+                       macfilter=2;
+               ;;
+               deny|1)
+                       macfilter=1;
+               ;;
+               disable|none|0)
+                       macfilter=0;
+               ;;
+       esac
 
        for vif in $vifs; do
                config_get mode "$vif" mode
@@ -159,11 +158,11 @@ enable_broadcom() {
                                                        config_get k "$vif" key$knr
                                                        [ -n "$k" ] || continue
                                                        [ "$defkey" = "$knr" ] && def="=" || def=""
-                                                       append vif_pre_up "wepkey $def$knr,$k" "$N"
+                                                       append vif_do_up "wepkey $def$knr,$k" "$N"
                                                done
                                        ;;
                                        "");;
-                                       *) append vif_pre_up "wepkey =1,$key" "$N";;
+                                       *) append vif_do_up "wepkey =1,$key" "$N";;
                                esac
                        ;;
                        *psk*|*PSK*)
@@ -192,17 +191,15 @@ enable_broadcom() {
                                nasopts="-r \"\$${vif}_key\" -h $server -p $port"
                        ;;
                esac
-               append vif_post_up "wsec $wsec" "$N"
-               append vif_post_up "wpa_auth $auth" "$N"
-               append vif_post_up "wsec_restrict $wsec_r" "$N"
-               append vif_post_up "eap_restrict $eap_r" "$N"
+               append vif_do_up "wsec $wsec" "$N"
+               append vif_do_up "wpa_auth $auth" "$N"
+               append vif_do_up "wsec_restrict $wsec_r" "$N"
+               append vif_do_up "eap_restrict $eap_r" "$N"
                
                config_get ssid "$vif" ssid
                append vif_post_up "vlan_mode 0" "$N"
                append vif_post_up "ssid $ssid" "$N"
-               case "$mode" in
-                       sta|adhoc) append vif_do_up "ssid $ssid" "$N";;
-               esac
+               append vif_do_up "ssid $ssid" "$N"
                
                append vif_post_up "enabled 1" "$N"
                
@@ -222,8 +219,8 @@ enable_broadcom() {
                        [ "$mode" = "sta" ] && {
                                nas_mode="-S"
                                [ -z "$bridge" ] || {
-                                       append vif_pre_up "supplicant 1" "$N"
-                                       append vif_pre_up "passphrase $key" "$N"
+                                       append vif_post_up "supplicant 1" "$N"
+                                       append vif_post_up "passphrase $key" "$N"
                                        
                                        use_nas=0
                                }
@@ -237,7 +234,7 @@ enable_broadcom() {
 $ifdown
 
 ap $ap
-mssid $mssid
+${mssid:+mssid $mssid}
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
@@ -251,8 +248,8 @@ macfilter ${macfilter:-0}
 maclist ${maclist:-none}
 wds none
 ${wds:+wds $wds}
-${channel:+channel $channel}
 country ${country:-IL0}
+${channel:+channel $channel}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}