add antenna diversity config support for broadcom-wl

[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 71f81a7..fc26d07 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -94,6 +94,8 @@ enable_broadcom() {
        config_get vifs "$device" vifs
        config_get distance "$device" distance
        config_get slottime "$device" slottime
        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

        local vif_pre_up vif_post_up vif_do_up
 
        _c=0
        local vif_pre_up vif_post_up vif_do_up
 
        _c=0


@@ -116,9 +118,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"
                }
 


@@ -152,7 +154,8 @@ enable_broadcom() {
                                wsec_r=1
                                config_get key "$vif" key
                                case "$enc" in
                                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\""
                                        *) auth=4; wsec=2;;
                                esac
                                eval "${vif}_key=\"\$key\""


@@ -165,6 +168,7 @@ enable_broadcom() {
                                config_get server "$vif" server
                                config_get port "$vif" port
                                case "$enc" in
                                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
                                        wpa2*|WPA2*) auth=64; wsec=4;;
                                        *) auth=2; wsec=2;;
                                esac


@@ -178,7 +182,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";;


@@ -213,12 +217,14 @@ infra $infra
 ${wet:+wet 1}
 802.11d 0
 802.11h 0
 ${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}
 
 radio ${radio:-1}
 macfilter 0
 maclist none
 wds ${wds:-none}

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

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


@@ -243,9 +249,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