bcm63xx: Add support for 2.6.38

[openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index ac1562f..2ca63bb 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -13,6 +13,8 @@ mac80211_hostapd_setup_base() {
        config_get country "$device" country
        config_get hwmode "$device" hwmode
        config_get channel "$device" channel
        config_get country "$device" country
        config_get hwmode "$device" hwmode
        config_get channel "$device" channel

+       config_get beacon_int "$device" beacon_int
+       config_get basic_rate_list "$device" basic_rate

        config_get_bool noscan "$device" noscan
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        [ "$channel" = auto ] && channel=
        config_get_bool noscan "$device" noscan
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        [ "$channel" = auto ] && channel=


@@ -34,6 +36,11 @@ mac80211_hostapd_setup_base() {
                }
        }
 
                }
        }
 

+       local country_ie=0
+       [ -n "$country" ] && country_ie=1
+       config_get_bool country_ie "$device" country_ie "$country_ie"
+       [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N"
+

        config_get macfilter "$vif" macfilter
        case "$macfilter" in
                allow)
        config_get macfilter "$vif" macfilter
        case "$macfilter" in
                allow)


@@ -51,6 +58,16 @@ mac80211_hostapd_setup_base() {
                        echo "$mac" >> $macfile
                done
        }
                        echo "$mac" >> $macfile
                done
        }

+
+       local br brval brstr
+       [ -n "$basic_rate_list" ] && {
+               for br in $basic_rate_list; do
+                       brval="$(($br / 100))"
+                       [ -n "$brstr" ] && brstr="$brstr "
+                       brstr="$brstr$brval"
+               done
+       }
+       

        cat >> "$cfgfile" <<EOF
 ctrl_interface=/var/run/hostapd-$phy
 driver=nl80211
        cat >> "$cfgfile" <<EOF
 ctrl_interface=/var/run/hostapd-$phy
 driver=nl80211


@@ -92,8 +109,10 @@ tx_queue_data0_cwmax=7
 tx_queue_data0_burst=1.5
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}
 tx_queue_data0_burst=1.5
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}

+${beacon_int:+beacon_int=$beacon_int}

 ${country:+country_code=$country}
 ${noscan:+noscan=$noscan}
 ${country:+country_code=$country}
 ${noscan:+noscan=$noscan}

+${brstr:+basic_rates=$brstr}

 $base_cfg
 
 EOF
 $base_cfg
 
 EOF


@@ -127,6 +146,8 @@ mac80211_hostapd_setup_bss() {
        local macaddr hidden maxassoc wmm
        config_get macaddr "$vif" macaddr
        config_get maxassoc "$vif" maxassoc
        local macaddr hidden maxassoc wmm
        config_get macaddr "$vif" macaddr
        config_get maxassoc "$vif" maxassoc

+       config_get dtim_period "$vif" dtim_period
+       config_get max_listen_int "$vif" max_listen_int

        config_get_bool hidden "$vif" hidden 0
        config_get_bool wmm "$vif" wmm 1
        cat >> /var/run/hostapd-$phy.conf <<EOF
        config_get_bool hidden "$vif" hidden 0
        config_get_bool wmm "$vif" wmm 1
        cat >> /var/run/hostapd-$phy.conf <<EOF


@@ -134,6 +155,8 @@ $hostapd_cfg
 wmm_enabled=$wmm
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
 wmm_enabled=$wmm
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden

+${dtim_period:+dtim_period=$dtim_period}
+${max_listen_int:+max_listen_interval=$max_listen_int}

 ${maxassoc:+max_num_sta=$maxassoc}
 EOF
 }
 ${maxassoc:+max_num_sta=$maxassoc}
 EOF
 }


@@ -390,8 +413,8 @@ enable_mac80211() {
                                adhoc)
                                        config_get bssid "$vif" bssid
                                        config_get ssid "$vif" ssid
                                adhoc)
                                        config_get bssid "$vif" bssid
                                        config_get ssid "$vif" ssid

-                                       config_get bintval "$vif" bintval
-                                       config_get basicrates "$vif" basicrates
+                                       config_get beacon_int "$device" beacon_int
+                                       config_get basic_rate_list "$device" basic_rate

                                        config_get encryption "$vif" encryption
                                        config_get key "$vif" key 1
                                        config_get mcast_rate "$vif" mcast_rate
                                        config_get encryption "$vif" encryption
                                        config_get key "$vif" key 1
                                        config_get mcast_rate "$vif" mcast_rate


@@ -416,6 +439,17 @@ enable_mac80211() {
                                                esac
                                        }
 
                                                esac
                                        }
 

+                                       local br brval brsub brstr
+                                       [ -n "$basic_rate_list" ] && {
+                                               for br in $basic_rate_list; do
+                                                       brval="$(($br / 1000))"
+                                                       brsub="$((($br / 100) % 10))"
+                                                       [ "$brsub" -gt 0 ] && brval="$brval.$brsub"
+                                                       [ -n "$brstr" ] && brstr="$brstr,"
+                                                       brstr="$brstr$brval"
+                                               done
+                                       }
+

                                        local mcval=""
                                        [ -n "$mcast_rate" ] && {
                                                mcval="$(($mcast_rate / 1000))"
                                        local mcval=""
                                        [ -n "$mcast_rate" ] && {
                                                mcval="$(($mcast_rate / 1000))"


@@ -425,8 +459,8 @@ enable_mac80211() {
 
                                        iw dev "$ifname" ibss join "$ssid" $freq \
                                                ${fixed:+fixed-freq} $bssid \
 
                                        iw dev "$ifname" ibss join "$ssid" $freq \
                                                ${fixed:+fixed-freq} $bssid \

-                                               ${bintval:+beacon-interval $bintval} \
-                                               ${basicrates:+basic-rates $basicrates} \
+                                               ${beacon_int:+beacon-interval $beacon_int} \
+                                               ${brstr:+basic-rates $brstr} \

                                                ${mcval:+mcast-rate $mcval} \
                                                ${keyspec:+keys $keyspec}
                                ;;
                                                ${mcval:+mcast-rate $mcval} \
                                                ${keyspec:+keys $keyspec}
                                ;;


@@ -448,7 +482,7 @@ enable_mac80211() {
 }
 
 
 }
 
 

-check_device() {
+check_mac80211_device() {

        config_get phy "$1" phy
        [ -z "$phy" ] && {
                find_mac80211_phy "$1" >/dev/null || return 0
        config_get phy "$1" phy
        [ -z "$phy" ] && {
                find_mac80211_phy "$1" >/dev/null || return 0


@@ -467,7 +501,7 @@ detect_mac80211() {
        done
        for dev in $(ls /sys/class/ieee80211); do
                found=0
        done
        for dev in $(ls /sys/class/ieee80211); do
                found=0

-               config_foreach check_device wifi-device
+               config_foreach check_mac80211_device wifi-device

                [ "$found" -gt 0 ] && continue
 
                mode_11n=""
                [ "$found" -gt 0 ] && continue
 
                mode_11n=""