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;
diff --git a/src/ap/vlan_util.c b/src/ap/vlan_util.c
index cc54051..d4e0efb 100644
--- a/src/ap/vlan_util.c
+++ b/src/ap/vlan_util.c
@@ -31,7 +31,7 @@
*/
int vlan_add(const char *if_name, int vid, const char *vlan_if_name)
{
- int ret = -1;
+ int err, ret = -1;
struct nl_sock *handle = NULL;
struct nl_cache *cache = NULL;
struct rtnl_link *rlink = NULL;
@@ -58,14 +58,18 @@
goto vlan_add_error;
}
- if (nl_connect(handle, NETLINK_ROUTE) < 0) {
- wpa_printf(MSG_ERROR, "VLAN: failed to connect to netlink");
+ err = nl_connect(handle, NETLINK_ROUTE);
+ if (err < 0) {
+ wpa_printf(MSG_ERROR, "VLAN: failed to connect to netlink: %s",
+ nl_geterror(err));
goto vlan_add_error;
}
- if (rtnl_link_alloc_cache(handle, AF_UNSPEC, &cache) < 0) {
+ err = rtnl_link_alloc_cache(handle, AF_UNSPEC, &cache);
+ if (err < 0) {
cache = NULL;
- wpa_printf(MSG_ERROR, "VLAN: failed to alloc cache");
+ wpa_printf(MSG_ERROR, "VLAN: failed to alloc cache: %s",
+ nl_geterror(err));
goto vlan_add_error;
}
@@ -92,23 +96,29 @@
goto vlan_add_error;
}
- if (rtnl_link_set_type(rlink, "vlan") < 0) {
- wpa_printf(MSG_ERROR, "VLAN: failed to set link type");
+ err = rtnl_link_set_type(rlink, "vlan");
+ if (err < 0) {
+ wpa_printf(MSG_ERROR, "VLAN: failed to set link type: %s",
+ nl_geterror(err));
goto vlan_add_error;
}
rtnl_link_set_link(rlink, if_idx);
rtnl_link_set_name(rlink, vlan_if_name);
- if (rtnl_link_vlan_set_id(rlink, vid) < 0) {
- wpa_printf(MSG_ERROR, "VLAN: failed to set link vlan id");
+ err = rtnl_link_vlan_set_id(rlink, vid);
+ if (err < 0) {
+ wpa_printf(MSG_ERROR, "VLAN: failed to set link vlan id: %s",
+ nl_geterror(err));
goto vlan_add_error;
}
- if (rtnl_link_add(handle, rlink, NLM_F_CREATE) < 0) {
+ err = rtnl_link_add(handle, rlink, NLM_F_CREATE);
+ if (err < 0) {
wpa_printf(MSG_ERROR, "VLAN: failed to create link %s for "
- "vlan %d on %s (%d)",
- vlan_if_name, vid, if_name, if_idx);
+ "vlan %d on %s (%d): %s",
+ vlan_if_name, vid, if_name, if_idx,
+ nl_geterror(err));
goto vlan_add_error;
}
@@ -127,7 +137,7 @@
int vlan_rem(const char *if_name)
{
- int ret = -1;
+ int err, ret = -1;
struct nl_sock *handle = NULL;
struct nl_cache *cache = NULL;
struct rtnl_link *rlink = NULL;
@@ -140,14 +150,18 @@
goto vlan_rem_error;
}
- if (nl_connect(handle, NETLINK_ROUTE) < 0) {
- wpa_printf(MSG_ERROR, "VLAN: failed to connect to netlink");
+ err = nl_connect(handle, NETLINK_ROUTE);
+ if (err < 0) {
+ wpa_printf(MSG_ERROR, "VLAN: failed to connect to netlink: %s",
+ nl_geterror(err));
goto vlan_rem_error;
}
- if (rtnl_link_alloc_cache(handle, AF_UNSPEC, &cache) < 0) {
+ err = rtnl_link_alloc_cache(handle, AF_UNSPEC, &cache);
+ if (err < 0) {
cache = NULL;
- wpa_printf(MSG_ERROR, "VLAN: failed to alloc cache");
+ wpa_printf(MSG_ERROR, "VLAN: failed to alloc cache: %s",
+ nl_geterror(err));
goto vlan_rem_error;
}
@@ -158,9 +172,10 @@
goto vlan_rem_error;
}
- if (rtnl_link_delete(handle, rlink) < 0) {
- wpa_printf(MSG_ERROR, "VLAN: failed to remove link %s",
- if_name);
+ err = rtnl_link_delete(handle, rlink);
+ if (err < 0) {
+ wpa_printf(MSG_ERROR, "VLAN: failed to remove link %s: %s",
+ if_name, nl_geterror(err));
goto vlan_rem_error;
}
diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h
index e51f85f..140295c 100644
--- a/src/common/qca-vendor.h
+++ b/src/common/qca-vendor.h
@@ -151,6 +151,7 @@
QCA_NL80211_VENDOR_SUBCMD_DCC_CLEAR_STATS = 98,
QCA_NL80211_VENDOR_SUBCMD_DCC_UPDATE_NDL = 99,
QCA_NL80211_VENDOR_SUBCMD_DCC_STATS_EVENT = 100,
+ QCA_NL80211_VENDOR_SUBCMD_LINK_PROPERTIES = 101,
};
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index a45fe73..c02044b 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -2485,10 +2485,21 @@
size_t tmplen;
int res;
u8 group_capab;
+ struct p2p_message msg;
if (p2p_ie == NULL)
return 0; /* WLAN AP is not a P2P manager */
+ os_memset(&msg, 0, sizeof(msg));
+ if (p2p_parse_p2p_ie(p2p_ie, &msg) < 0)
+ return 0;
+
+ p2p_dbg(p2p, "BSS P2P manageability %s",
+ msg.manageability ? "enabled" : "disabled");
+
+ if (!msg.manageability)
+ return 0;
+
/*
* (Re)Association Request - P2P IE
* P2P Capability attribute (shall be present)