From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 11 Jan 2011 13:19:53 +0000 (+0000)
Subject: [package] mac80211: support per-vif wmm option, defaults to 1 if unset
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=a276aa5223943bd2d7b088d925fa3308ab95e698;p=15.05%2Fopenwrt.git

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


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24966 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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}