AR7 2.6.24, removed duplicate patches

[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 bc90f08..f52e9b0 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,19 +1,10 @@
 append DRIVERS "broadcom"
 
 append DRIVERS "broadcom"
 

-bridge_interface() {
-       (
-               . /etc/functions.sh
-               include network
-               scan_interfaces
-               cfg="$(find_config "$1")"
-               [ -z "$cfg" ] && return 0
-               config_get iftype "$cfg" type
-               [ "$iftype" = bridge ] && config_get "$iftype" bridge
-       )
-}
-

 scan_broadcom() {
        local device="$1"
 scan_broadcom() {
        local device="$1"

+       local wds
+       local adhoc sta apmode
+       local adhoc_if sta_if ap_if

 
        config_get vifs "$device" vifs
        for vif in $vifs; do
 
        config_get vifs "$device" vifs
        for vif in $vifs; do


@@ -28,18 +19,24 @@ scan_broadcom() {
                                sta_if="$vif"
                        ;;
                        ap)
                                sta_if="$vif"
                        ;;
                        ap)

-                               ap=1
+                               apmode=1

                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;
                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;

+                       wds)
+                               config_get addr "$vif" bssid
+                               [ -z "$addr" ] || append wds "$addr"
+                       ;;

                        *) echo "$device($vif): Invalid mode";;
                esac
        done
                        *) echo "$device($vif): Invalid mode";;
                esac
        done

+       config_set "$device" wds "$wds"

 
        local _c=
        for vif in ${adhoc_if:-$sta_if $ap_if}; do
                config_set "$vif" ifname "wl0${_c:+.$_c}"
                _c=$((${_c:-0} + 1))
        done
 
        local _c=
        for vif in ${adhoc_if:-$sta_if $ap_if}; do
                config_set "$vif" ifname "wl0${_c:+.$_c}"
                _c=$((${_c:-0} + 1))
        done

+       config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if}"

 
        ifdown="down"
        for vif in 0 1 2 3; do
 
        ifdown="down"
        for vif in 0 1 2 3; do


@@ -52,7 +49,7 @@ scan_broadcom() {
        mssid=1
        apsta=0
        radio=1
        mssid=1
        apsta=0
        radio=1

-       case "$adhoc:$sta:$ap" in
+       case "$adhoc:$sta:$apmode" in

                1*)
                        ap=0
                        mssid=0
                1*)
                        ap=0
                        mssid=0


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

+       set_wifi_down "$1"

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


@@ -85,6 +83,7 @@ disable_broadcom() {
                        }
                done
        )
                        }
                done
        )

+       true

 }
 
 enable_broadcom() {
 }
 
 enable_broadcom() {


@@ -92,20 +91,52 @@ enable_broadcom() {
        config_get channel "$device" channel
        config_get country "$device" country
        config_get maxassoc "$device" maxassoc
        config_get channel "$device" channel
        config_get country "$device" country
        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
+       config_get rxant "$device" rxant
+       config_get txant "$device" txant
+       config_get macfilter "$device" macfilter
+       config_get maclist "$device" maclist
+       local vif_pre_up vif_post_up vif_do_up

 
        _c=0
        nas="$(which nas)"
        nas_cmd=
        if_up=
 
        _c=0
        nas="$(which nas)"
        nas_cmd=
        if_up=

-       for vif in ${adhoc_if:-$sta_if $ap_if}; do
+
+       [ -z "$slottime" ] && {
+               [ -n "$distance" ] && {
+                       # slottime = 9 + (distance / 150) + (distance % 150 ? 1 : 0)
+                       slottime="$((9 + ($distance / 150) + 1 - (150 - ($distance % 150)) / 150 ))"
+               }
+       } || {
+               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

                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" ] || {
-                       config_get_bool hidden "$vif" hidden 1
+               [ "$mode" = "sta" ] || {
+                       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
-                       append vif_pre_up "ap_isolate $hidden" "$N"
+                       config_get_bool isolate "$vif" isolate 0
+                       append vif_pre_up "ap_isolate $isolate" "$N"

                }
 
                wsec_r=0
                }
 
                wsec_r=0


@@ -117,13 +148,30 @@ enable_broadcom() {
                case "$enc" in
                        WEP|wep)
                                wsec_r=1
                case "$enc" in
                        WEP|wep)
                                wsec_r=1

+                               wsec=1
+                               defkey=1
+                               config_get key "$vif" key
+                               case "$key" in
+                                       [1234])
+                                               defkey="$key"
+                                               for knr in 1 2 3 4; do
+                                                       config_get k "$vif" key$knr
+                                                       [ -n "$k" ] || continue
+                                                       [ "$defkey" = "$knr" ] && def="=" || def=""
+                                                       append vif_pre_up "wepkey $def$knr,$k" "$N"
+                                               done
+                                       ;;
+                                       "");;
+                                       *) append vif_pre_up "wepkey =1,$key" "$N";;
+                               esac

                        ;;
                        *psk*|*PSK*)
                                wsec_r=1
                                config_get key "$vif" key
                                case "$enc" in
                        ;;
                        *psk*|*PSK*)
                                wsec_r=1
                                config_get key "$vif" key
                                case "$enc" in

-                                       wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;;
-                                       *) auth=4; crypto=2;;
+                                       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\""
                                nasopts="-k \"\$${vif}_key\""
                                esac
                                eval "${vif}_key=\"\$key\""
                                nasopts="-k \"\$${vif}_key\""


@@ -135,8 +183,9 @@ 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;;
                                        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"


@@ -148,18 +197,37 @@ 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"

+               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 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"
+                       append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
+               }

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

-                       bridge="$(bridge_interface "$ifname")"

                        eval "${vif}_ssid=\"\$ssid\""
                        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 &"
+                       nas_mode="-A"
+                       use_nas=1
+                       [ "$mode" = "sta" ] && {
+                               nas_mode="-S"
+                               [ -z "$bridge" ] || {
+                                       append vif_pre_up "supplicant 1" "$N"
+                                       append vif_pre_up "passphrase $key" "$N"
+                                       
+                                       use_nas=0
+                               }
+                       }
+                       [ -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


@@ -167,26 +235,35 @@ enable_broadcom() {
        wlc stdin <<EOF
 $ifdown
 
        wlc stdin <<EOF
 $ifdown
 

-mssid $mssid

 ap $ap
 ap $ap

+mssid $mssid

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

+802.11d 0
+802.11h 0
+rxant ${rxant:-3}
+txant ${txant:-3}

 
 radio ${radio:-1}
 
 radio ${radio:-1}

-macfilter 0
-maclist none
+macfilter ${macfilter:-0}
+maclist ${maclist:-none}

 wds none
 wds none

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

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

+slottime ${slottime:--1}

 
 $vif_pre_up
 up
 $vif_post_up
 EOF
 
 $vif_pre_up
 up
 $vif_post_up
 EOF

-       eval "$nas_cmd"

        eval "$if_up"
        eval "$if_up"

+       wlc stdin <<EOF
+$vif_do_up
+EOF
+       eval "$nas_cmd"

 }
 
 
 }
 
 


@@ -199,12 +276,14 @@ config wifi-device  wl0
        option type     broadcom
        option channel  5
 
        option type     broadcom
        option channel  5
 

+       # REMOVE THIS LINE TO ENABLE WIFI:
+       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 mode     ap
        option ssid     OpenWrt

-       option hidden   0

        option encryption none
        option encryption none

-

 EOF
 }
 EOF
 }