diff options
| author | Jouni Malinen <j@w1.fi> | 2012-08-12 11:36:45 +0300 |
|---|---|---|
| committer | Arik Nemtsov <arik@wizery.com> | 2012-09-04 16:00:29 +0300 |
| commit | fd007609ed7cd93887dd4deabcdc91c87314a7fc (patch) | |
| tree | 7f1c5dde7f1d2925ac7a24052542c3f7698893c3 | |
| parent | a14ea0109e5cebce07126fb8b35ffc55ad25c1b0 (diff) | |
| download | external_wpa_supplicant_8_ti-fd007609ed7cd93887dd4deabcdc91c87314a7fc.zip external_wpa_supplicant_8_ti-fd007609ed7cd93887dd4deabcdc91c87314a7fc.tar.gz external_wpa_supplicant_8_ti-fd007609ed7cd93887dd4deabcdc91c87314a7fc.tar.bz2 | |
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 <j@w1.fi>
| -rw-r--r-- | src/ap/ap_config.c | 4 | ||||
| -rw-r--r-- | 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 b9e1c5f..e7de744 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 wpa_wmm_ac_params ac_be = { aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */ const struct wpa_wmm_ac_params ac_vi = /* video traffic */ - { aCWmin - 1, aCWmin, 2, 3000 / 32, 1 }; + { aCWmin - 1, aCWmin, 2, 3000 / 32, 0 }; const struct wpa_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 886cff9..f392497 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2542,9 +2542,9 @@ struct wpa_config * wpa_config_alloc_empty(const char *ctrl_interface, const struct wpa_wmm_ac_params ac_be = { aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */ const struct wpa_wmm_ac_params ac_vi = /* video traffic */ - { aCWmin - 1, aCWmin, 2, 3000 / 32, 1 }; + { aCWmin - 1, aCWmin, 2, 3000 / 32, 0 }; const struct wpa_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) |