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 c499ca8..bc3a1f3 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -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


@@ -145,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*)


@@ -153,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\""


@@ -166,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"


@@ -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";;


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


@@ -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}