Set country before channel (#2958)

[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 d423288..d9b2220 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
@@ -94,6 +95,10 @@ enable_broadcom() {
        config_get vifs "$device" vifs
        config_get distance "$device" distance
        config_get slottime "$device" slottime
+       config_get rxant "$device" rxant
+       config_get txant "$device" txant
+       config_get macfilter "$device" macfilter
+       config_get maclist "$device" maclist
        local vif_pre_up vif_post_up vif_do_up
 
        _c=0
@@ -109,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
@@ -116,9 +133,9 @@ enable_broadcom() {
                append vif_post_up "vif $_c" "$N"
                
                [ "$mode" = "sta" ] || {
-                       config_get_bool hidden "$vif" hidden 1
+                       config_get_bool hidden "$vif" hidden 0
                        append vif_pre_up "closed $hidden" "$N"
-                       config_get_bool isolate "$vif" isolate
+                       config_get_bool isolate "$vif" isolate 0
                        append vif_pre_up "ap_isolate $isolate" "$N"
                }
 
@@ -152,7 +169,8 @@ enable_broadcom() {
                                wsec_r=1
                                config_get key "$vif" key
                                case "$enc" in
-                                       wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;;
+                                       wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;;
+                                       wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;;
                                        *) auth=4; wsec=2;;
                                esac
                                eval "${vif}_key=\"\$key\""
@@ -165,6 +183,7 @@ enable_broadcom() {
                                config_get server "$vif" server
                                config_get port "$vif" port
                                case "$enc" in
+                                       wpa*+wpa2*|WPA*+WPA2*) auth=66; wsec=6;;
                                        wpa2*|WPA2*) auth=64; wsec=4;;
                                        *) auth=2; wsec=2;;
                                esac
@@ -178,7 +197,7 @@ enable_broadcom() {
                append vif_post_up "eap_restrict $eap_r" "$N"
                
                config_get ssid "$vif" ssid
-               append vif_post_up "vlan_mode 0"
+               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";;
@@ -187,18 +206,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"
-                       [ "$vif" = "$sta_if" ] && mode="-S"
-                       [ -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 &"
+                       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"
+                                       
+                                       use_nas=0
+                               }
+                       }
+                       [ -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
@@ -211,13 +240,18 @@ mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
+802.11d 0
+802.11h 0
+rxant ${rxant:-3}
+txant ${txant:-3}
 
 radio ${radio:-1}
-macfilter 0
-maclist none
-wds ${wds:-none}
-${channel:-channel $channel}
+macfilter ${macfilter:-0}
+maclist ${maclist:-none}
+wds none
+${wds:+wds $wds}
 country ${country:-IL0}
+${channel:+channel $channel}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}
 
@@ -242,12 +276,14 @@ config wifi-device  wl0
        option type     broadcom
        option channel  5
 
+       # REMOVE THIS LINE TO ENABLE WIFI:
+       option disabled 1
+
 config wifi-iface
        option device   wl0
+       option network  lan
        option mode     ap
        option ssid     OpenWrt
-       option hidden   0
        option encryption none
-
 EOF
 }