[target/generic]: preliminary 2.6.38 support

[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 2f8fedf..b20785c 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -103,13 +103,17 @@ mac80211_hostapd_setup_bss() {
        config_get_bool wds "$vif" wds 0
        [ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
 
        config_get_bool wds "$vif" wds 0
        [ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
 

+       local macaddr hidden maxassoc wmm

        config_get macaddr "$vif" macaddr
        config_get macaddr "$vif" macaddr

+       config_get maxassoc "$vif" maxassoc

        config_get_bool hidden "$vif" hidden 0
        config_get_bool hidden "$vif" hidden 0

+       config_get_bool wmm "$vif" wmm 1

        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg

-wmm_enabled=1
+wmm_enabled=$wmm

 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden

+${maxassoc:+max_num_sta=$maxassoc}

 EOF
 }
 
 EOF
 }
 


@@ -317,12 +321,11 @@ enable_mac80211() {
                        [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel"
                fi
 
                        [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel"
                fi
 

-               # txpower is not yet implemented in iw

                config_get vif_txpower "$vif" txpower
                # use vif_txpower (from wifi-iface) to override txpower (from
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"
                config_get vif_txpower "$vif" txpower
                # use vif_txpower (from wifi-iface) to override txpower (from
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"

-               [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
+               [ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00"

        done
 
        local start_hostapd=
        done
 
        local start_hostapd=


@@ -425,6 +428,7 @@ detect_mac80211() {
 
                        list="  list ht_capab"
                        [ "$(($ht_cap & 1))" -eq 1 ] && append ht_capab "$list  LDPC" "$N"
 
                        list="  list ht_capab"
                        [ "$(($ht_cap & 1))" -eq 1 ] && append ht_capab "$list  LDPC" "$N"

+                       [ "$(($ht_cap & 16))" -eq 16 ] && append ht_capab "$list        GF" "$N"

                        [ "$(($ht_cap & 32))" -eq 32 ] && append ht_capab "$list        SHORT-GI-20" "$N"
                        [ "$(($ht_cap & 64))" -eq 64 ] && append ht_capab "$list        SHORT-GI-40" "$N"
                        [ "$(($ht_cap & 128))" -eq 128 ] && append ht_capab "$list      TX-STBC" "$N"
                        [ "$(($ht_cap & 32))" -eq 32 ] && append ht_capab "$list        SHORT-GI-20" "$N"
                        [ "$(($ht_cap & 64))" -eq 64 ] && append ht_capab "$list        SHORT-GI-40" "$N"
                        [ "$(($ht_cap & 128))" -eq 128 ] && append ht_capab "$list      TX-STBC" "$N"