upgrade the ixp4xx ethernet driver to v0.3.1, split the Gateway 7001 support to two...

[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 4dad011..bc3a1f3 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -92,21 +92,34 @@ enable_broadcom() {
        config_get maxassoc "$device" maxassoc
        config_get wds "$device" wds
        config_get vifs "$device" vifs
        config_get maxassoc "$device" maxassoc
        config_get wds "$device" wds
        config_get vifs "$device" vifs

+       config_get distance "$device" distance
+       config_get slottime "$device" slottime

        local vif_pre_up vif_post_up vif_do_up
 
        _c=0
        nas="$(which nas)"
        nas_cmd=
        if_up=
        local vif_pre_up vif_post_up vif_do_up
 
        _c=0
        nas="$(which nas)"
        nas_cmd=
        if_up=

+
+       [ -z "$slottime" ] && {
+               [ -n "$distance" ] && {
+                       # slottime = 9 + (distance / 150) + (distance % 150 ? 1 : 0)
+                       slottime="$((9 + ($distance / 150) + 1 - (150 - ($distance % 150)) / 150 ))"
+               }
+       } || {
+               slottime="${slottime:--1}"
+       }
+

        for vif in $vifs; do
        for vif in $vifs; do

+               config_get mode "$vif" mode

                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                

-               [ "$vif" = "$sta_if" ] || {
+               [ "$mode" = "sta" ] || {

                        config_get_bool hidden "$vif" hidden 1
                        append vif_pre_up "closed $hidden" "$N"
                        config_get_bool isolate "$vif" isolate
                        config_get_bool hidden "$vif" hidden 1
                        append vif_pre_up "closed $hidden" "$N"
                        config_get_bool isolate "$vif" isolate

-                       append vif_pre_up "ap_isolate $hidden" "$N"
+                       append vif_pre_up "ap_isolate $isolate" "$N"

                }
 
                wsec_r=0
                }
 
                wsec_r=0


@@ -117,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


@@ -132,7 +145,7 @@ enable_broadcom() {
                                                done
                                        ;;
                                        "");;
                                                done
                                        ;;
                                        "");;

-                                       *) append vif_pre_up "wepkey 1,$key" "$N";;
+                                       *) append vif_pre_up "wepkey =1,$key" "$N";;

                                esac
                        ;;
                        *psk*|*PSK*)
                                esac
                        ;;
                        *psk*|*PSK*)


@@ -140,7 +153,7 @@ enable_broadcom() {
                                config_get key "$vif" key
                                case "$enc" in
                                        wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;;
                                config_get key "$vif" key
                                case "$enc" in
                                        wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;;

-                                       *) auth=4; crypto=2;;
+                                       *) auth=4; wsec=2;;

                                esac
                                eval "${vif}_key=\"\$key\""
                                nasopts="-k \"\$${vif}_key\""
                                esac
                                eval "${vif}_key=\"\$key\""
                                nasopts="-k \"\$${vif}_key\""


@@ -153,7 +166,7 @@ enable_broadcom() {
                                config_get port "$vif" port
                                case "$enc" in
                                        wpa2*|WPA2*) auth=64; wsec=4;;
                                config_get port "$vif" port
                                case "$enc" in
                                        wpa2*|WPA2*) auth=64; wsec=4;;

-                                       *) auth=2; crypto=2;;
+                                       *) auth=2; wsec=2;;

                                esac
                                eval "${vif}_key=\"\$key\""
                                nasopts="-r \"\$${vif}_key\" -h $server -p $port"
                                esac
                                eval "${vif}_key=\"\$key\""
                                nasopts="-r \"\$${vif}_key\" -h $server -p $port"


@@ -165,15 +178,17 @@ 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"
                append vif_post_up "ssid $ssid" "$N"

-               [ "$wet" = 1 -o "$apsta" = 1 -o "$ap" = 0 -o "$infra" = 0 ] && \
-                       append vif_do_up "ssid $ssid" "$N"
+               case "$mode" in
+                       sta|adhoc) append vif_do_up "ssid $ssid" "$N";;
+               esac

                
                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
                append if_up "ifconfig $ifname up" ";$N"
                
                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
                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")"
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
                        bridge="$(bridge_interface "$net_cfg")"


@@ -183,7 +198,7 @@ enable_broadcom() {
                        eval "${vif}_ssid=\"\$ssid\""
                        mode="-A"
                        [ "$vif" = "$sta_if" ] && mode="-S"
                        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 $crypto -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+                       [ -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 &"

                }
                _c=$(($_c + 1))
        done
                }
                _c=$(($_c + 1))
        done


@@ -196,14 +211,17 @@ 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}
 country ${country:-IL0}
 maxassoc ${maxassoc:-128}

+slottime ${slottime:--1}

 
 $vif_pre_up
 up
 
 $vif_pre_up
 up