aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-02-01 12:34:12 (GMT)
committerJouni Malinen <j@w1.fi>2011-02-01 12:34:12 (GMT)
commitd2da22494884b8aacf5897bb6a1813278d46b6bc (patch)
tree648732f28a6f1f16bdefc74e259e4679d00ec782 /hostapd
parent09c395b4bb7af8d8565f07c2ac7d67427f9540ad (diff)
downloadhostap-d2da22494884b8aacf5897bb6a1813278d46b6bc.zip
hostap-d2da22494884b8aacf5897bb6a1813278d46b6bc.tar.gz
hostap-d2da22494884b8aacf5897bb6a1813278d46b6bc.tar.bz2
AP: Enable WMM with default parameters by default for HT
If WMM is not disabled explicitly (wmm_enabled=0 in hostapd.conf), enable WMM automatically whenever HT (ieee80211n) is enabled. Use the default WMM parameters for AP TX queues and the EDCA parameters advertised for stations in WMM IE if no overriding values are included in the configuration.
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/config_file.c4
-rw-r--r--hostapd/hostapd.conf1
2 files changed, 1 insertions, 4 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 6d340d7..03382d4 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -778,7 +778,7 @@ static int hostapd_config_tx_queue(struct hostapd_config *conf, char *name,
}
if (num >= NUM_TX_QUEUES) {
- /* for backwards compatibility, do not tricker failure */
+ /* for backwards compatibility, do not trigger failure */
wpa_printf(MSG_INFO, "DEPRECATED: '%s' not used", name);
return 0;
}
@@ -813,8 +813,6 @@ static int hostapd_config_tx_queue(struct hostapd_config *conf, char *name,
return -1;
}
- queue->configured = 1;
-
return 0;
}
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 3a79a94..2def335 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -198,7 +198,6 @@ auth_algs=3
ignore_broadcast_ssid=0
# TX queue parameters (EDCF / bursting)
-# default for all these fields: not set, use hardware defaults
# tx_queue_<queue name>_<param>
# queues: data0, data1, data2, data3, after_beacon, beacon
# (data0 is the highest priority queue)