Cumulative patch from commit 9b05135aa477f2c64d08bdb99062907cf767c1ea
9b05135 P2P: Fix association with an AP/P2P GO that is not a P2P manager
8884ce0 hostapd: check validity of cwMin/cwMax values
9649b53 vlan: Print libnl error message on vlan_add / vlan_del
279724d Add QCA vendor subcmd for Link Property Query
Change-Id: I33606ae68e16c8eb07473add034c7bca5aa6e153
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index c44f70d..455013a 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -843,6 +843,29 @@
}
+static int hostapd_config_check_cw(struct hostapd_config *conf, int queue)
+{
+ int tx_cwmin = conf->tx_queue[queue].cwmin;
+ int tx_cwmax = conf->tx_queue[queue].cwmax;
+ int ac_cwmin = conf->wmm_ac_params[queue].cwmin;
+ int ac_cwmax = conf->wmm_ac_params[queue].cwmax;
+
+ if (tx_cwmin > tx_cwmax) {
+ wpa_printf(MSG_ERROR,
+ "Invalid TX queue cwMin/cwMax values. cwMin(%d) greater than cwMax(%d)",
+ tx_cwmin, tx_cwmax);
+ return -1;
+ }
+ if (ac_cwmin > ac_cwmax) {
+ wpa_printf(MSG_ERROR,
+ "Invalid WMM AC cwMin/cwMax values. cwMin(%d) greater than cwMax(%d)",
+ ac_cwmin, ac_cwmax);
+ return -1;
+ }
+ return 0;
+}
+
+
int hostapd_config_check(struct hostapd_config *conf, int full_config)
{
size_t i;
@@ -872,6 +895,11 @@
return -1;
}
+ for (i = 0; i < NUM_TX_QUEUES; i++) {
+ if (hostapd_config_check_cw(conf, i))
+ return -1;
+ }
+
for (i = 0; i < conf->num_bss; i++) {
if (hostapd_config_check_bss(conf->bss[i], conf, full_config))
return -1;