add frameburst closes #1759

[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 c6444d6..3562455 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -52,7 +52,7 @@ scan_broadcom() {
        case "$adhoc:$sta:$apmode" in
                1*)
                        ap=0
        case "$adhoc:$sta:$apmode" in
                1*)
                        ap=0

-                       mssid=0
+                       mssid=

                        infra=0
                ;;
                :1:1)
                        infra=0
                ;;
                :1:1)


@@ -62,7 +62,7 @@ scan_broadcom() {
                :1:)
                        wet=1
                        ap=0
                :1:)
                        wet=1
                        ap=0

-                       mssid=0
+                       mssid=

                ;;
                ::)
                        radio=0
                ;;
                ::)
                        radio=0


@@ -71,6 +71,7 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
 }
 
 disable_broadcom() {

+       set_wifi_down "$1"

        wlc down
        (
                include /lib/network
        wlc down
        (
                include /lib/network


@@ -96,6 +97,9 @@ enable_broadcom() {
        config_get slottime "$device" slottime
        config_get rxant "$device" rxant
        config_get txant "$device" txant
        config_get slottime "$device" slottime
        config_get rxant "$device" rxant
        config_get txant "$device" txant

+       config_get_bool frameburst "$device" frameburst
+       config_get macfilter "$device" macfilter
+       config_get maclist "$device" maclist

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


@@ -111,6 +115,18 @@ enable_broadcom() {
        } || {
                slottime="${slottime:--1}"
        }
        } || {
                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
 
        for vif in $vifs; do
                config_get mode "$vif" mode


@@ -143,11 +159,11 @@ enable_broadcom() {
                                                        config_get k "$vif" key$knr
                                                        [ -n "$k" ] || continue
                                                        [ "$defkey" = "$knr" ] && def="=" || def=""
                                                        config_get k "$vif" key$knr
                                                        [ -n "$k" ] || continue
                                                        [ "$defkey" = "$knr" ] && def="=" || def=""

-                                                       append vif_pre_up "wepkey $def$knr,$k" "$N"
+                                                       append vif_do_up "wepkey $def$knr,$k" "$N"

                                                done
                                        ;;
                                        "");;
                                                done
                                        ;;
                                        "");;

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

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


@@ -176,41 +192,41 @@ enable_broadcom() {
                                nasopts="-r \"\$${vif}_key\" -h $server -p $port"
                        ;;
                esac
                                nasopts="-r \"\$${vif}_key\" -h $server -p $port"
                        ;;
                esac

-               append vif_post_up "wsec $wsec" "$N"
-               append vif_post_up "wpa_auth $auth" "$N"
-               append vif_post_up "wsec_restrict $wsec_r" "$N"
-               append vif_post_up "eap_restrict $eap_r" "$N"
+               append vif_do_up "wsec $wsec" "$N"
+               append vif_do_up "wpa_auth $auth" "$N"
+               append vif_do_up "wsec_restrict $wsec_r" "$N"
+               append vif_do_up "eap_restrict $eap_r" "$N"

                
                config_get ssid "$vif" ssid
                append vif_post_up "vlan_mode 0" "$N"
                append vif_post_up "ssid $ssid" "$N"
                
                config_get ssid "$vif" ssid
                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";;
-               esac
+               append vif_do_up "ssid $ssid" "$N"

                
                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
                
                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"
                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\""
                }
                [ -z "$nasopts" ] || {
                        eval "${vif}_ssid=\"\$ssid\""

-                       mode="-A"
-                       [ "$ap" = "0" ] && {
-                               mode="-S"
+                       nas_mode="-A"
+                       use_nas=1
+                       [ "$mode" = "sta" ] && {
+                               nas_mode="-S"

                                [ -z "$bridge" ] || {
                                [ -z "$bridge" ] || {

-                                       append vif_pre_up "supplicant 1" "$N"
-                                       append vif_pre_up "passphrase $key" "$N"
+                                       append vif_post_up "supplicant 1" "$N"
+                                       append vif_post_up "passphrase $key" "$N"

                                        
                                        

-                                       nas=""
+                                       use_nas=0

                                }
                        }
                                }
                        }

-                       [ -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 &"
+                       [ -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
                }
                _c=$(($_c + 1))
        done


@@ -219,7 +235,7 @@ enable_broadcom() {
 $ifdown
 
 ap $ap
 $ifdown
 
 ap $ap

-mssid $mssid
+${mssid:+mssid $mssid}

 apsta $apsta
 infra $infra
 ${wet:+wet 1}
 apsta $apsta
 infra $infra
 ${wet:+wet 1}


@@ -229,13 +245,15 @@ rxant ${rxant:-3}
 txant ${txant:-3}
 
 radio ${radio:-1}
 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}
 country ${country:-IL0}

+${channel:+channel $channel}

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

+${frameburst:+frameburst $frameburst}

 
 $vif_pre_up
 up
 
 $vif_pre_up
 up