Fix dependencies and build (#1849)

[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 89728c3..6a38d03 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -116,9 +116,9 @@ enable_broadcom() {
                append vif_post_up "vif $_c" "$N"
                
                [ "$mode" = "sta" ] || {
                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"
                        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"
                }
 
                        append vif_pre_up "ap_isolate $isolate" "$N"
                }
 


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

-                               wsec_r=0
+                               wsec_r=1

                                wsec=1
                                defkey=1
                                config_get key "$vif" key
                                wsec=1
                                defkey=1
                                config_get key "$vif" key


@@ -178,7 +178,7 @@ enable_broadcom() {
                append vif_post_up "eap_restrict $eap_r" "$N"
                
                config_get ssid "$vif" ssid
                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";;
                append vif_post_up "ssid $ssid" "$N"
                case "$mode" in
                        sta|adhoc) append vif_do_up "ssid $ssid" "$N";;


@@ -211,12 +211,14 @@ mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
 apsta $apsta
 infra $infra
 ${wet:+wet 1}

+802.11d 0
+802.11h 0

 
 radio ${radio:-1}
 macfilter 0
 maclist none
 wds ${wds:-none}
 
 radio ${radio:-1}
 macfilter 0
 maclist none
 wds ${wds:-none}

-channel ${channel:-0}
+${channel:+channel $channel}

 country ${country:-IL0}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}
 country ${country:-IL0}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}


@@ -241,9 +243,12 @@ detect_broadcom() {
 config wifi-device  wl0
        option type     broadcom
        option channel  5
 config wifi-device  wl0
        option type     broadcom
        option channel  5

+# disable radio to prevent an open ap after reflashing:
+       option disabled 1

 
 config wifi-iface
        option device   wl0
 
 config wifi-iface
        option device   wl0

+       option network  lan

        option mode     ap
        option ssid     OpenWrt
        option hidden   0
        option mode     ap
        option ssid     OpenWrt
        option hidden   0