mac80211: merge changes from trunk and add back the !LINUX_2_4 dependency

[openwrt-10.03/.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 9ebc0be0320f8fac3084d82312c6543e7a6cd333..2f4abd0852a091c4d07ef11bcb2e0823edfb627d 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -105,11 +105,13 @@ mac80211_hostapd_setup_bss() {
 
        config_get macaddr "$vif" macaddr
        config_get_bool hidden "$vif" hidden 0
+       config_get maxassoc "$vif" maxassoc
        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
 wmm_enabled=1
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
+${maxassoc:+max_num_sta=$maxassoc}
 EOF
 }