From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 11 Jan 2011 13:19:53 +0000 (+0000)
Subject: mac80211: support per-vif wmm option, defaults to 1 if unset
X-Git-Tag: reboot~17889
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=253f4d82f25aad381ad3f878053b23c4bd307e31;p=openwrt%2Fstaging%2Fxback.git

mac80211: support per-vif wmm option, defaults to 1 if unset

SVN-Revision: 24966
---

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 2f4abd0852..b20785cf67 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -103,12 +103,14 @@ mac80211_hostapd_setup_bss() {
 	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_bool hidden "$vif" hidden 0
 	config_get maxassoc "$vif" maxassoc
+	config_get_bool hidden "$vif" hidden 0
+	config_get_bool wmm "$vif" wmm 1
 	cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
-wmm_enabled=1
+wmm_enabled=$wmm
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
 ${maxassoc:+max_num_sta=$maxassoc}