Package the statistics module for netfilter

[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 c6444d6..6167247 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -71,6 +71,7 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
+       set_wifi_down "$1"
        wlc down
        (
                include /lib/network
@@ -191,26 +192,28 @@ enable_broadcom() {
                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
-               append if_up "ifconfig $ifname up" ";$N"
+               #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")"
                        append if_up "start_net '$ifname' '$net_cfg'" ";$N"
+                       append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
                }
                [ -z "$nasopts" ] || {
                        eval "${vif}_ssid=\"\$ssid\""
-                       mode="-A"
-                       [ "$ap" = "0" ] && {
-                               mode="-S"
+                       nas_mode="-A"
+                       use_nas=1
+                       [ "$mode" = "sta" ] && {
+                               nas_mode="-S"
                                [ -z "$bridge" ] || {
                                        append vif_pre_up "supplicant 1" "$N"
                                        append vif_pre_up "passphrase $key" "$N"
                                        
-                                       nas=""
+                                       use_nas=0
                                }
                        }
-                       [ -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 $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+                       [ -z "$nas" -o "$use_nas" = "0" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
                }
                _c=$(($_c + 1))
        done
@@ -231,7 +234,8 @@ txant ${txant:-3}
 radio ${radio:-1}
 macfilter 0
 maclist none
-wds ${wds:-none}
+wds none
+${wds:+wds $wds}
 ${channel:+channel $channel}
 country ${country:-IL0}
 maxassoc ${maxassoc:-128}