From 623ecdd5a28bafbac97786c3fe667045d3d78c5d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 12 Aug 2012 11:36:45 +0300 Subject: [PATCH] Remove default ACM=1 from AC_VO and AC_VI There is no need to mandate admission control (ACM=1) by default, so clear that flag in the case the configuration file does not specify wmm_ac_{vo,vi}_acm value. This gets closer to the values mentioned in the sample hostapd.conf file and reduces the need to specify WMM parameters in the configuration file for most common use cases. Signed-hostap: Jouni Malinen --- src/ap/ap_config.c | 4 ++-- wpa_supplicant/config.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c index f6038f9bd..4fa111400 100644 --- a/src/ap/ap_config.c +++ b/src/ap/ap_config.c @@ -104,9 +104,9 @@ struct hostapd_config * hostapd_config_defaults(void) const struct hostapd_wmm_ac_params ac_be = { aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */ const struct hostapd_wmm_ac_params ac_vi = /* video traffic */ - { aCWmin - 1, aCWmin, 2, 3000 / 32, 1 }; + { aCWmin - 1, aCWmin, 2, 3000 / 32, 0 }; const struct hostapd_wmm_ac_params ac_vo = /* voice traffic */ - { aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 1 }; + { aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 0 }; const struct hostapd_tx_queue_params txq_bk = { 7, ecw2cw(aCWmin), ecw2cw(aCWmax), 0 }; const struct hostapd_tx_queue_params txq_be = diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index fe8c727e2..aeb6aba72 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2555,9 +2555,9 @@ struct wpa_config * wpa_config_alloc_empty(const char *ctrl_interface, const struct hostapd_wmm_ac_params ac_be = { aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */ const struct hostapd_wmm_ac_params ac_vi = /* video traffic */ - { aCWmin - 1, aCWmin, 2, 3000 / 32, 1 }; + { aCWmin - 1, aCWmin, 2, 3000 / 32, 0 }; const struct hostapd_wmm_ac_params ac_vo = /* voice traffic */ - { aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 1 }; + { aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 0 }; config = os_zalloc(sizeof(*config)); if (config == NULL)