diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2021-08-13 00:43:36 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2021-08-13 00:43:36 -0700 |
| commit | 1b42d4d262fb8961dc3e710aaab956a8ed1642e1 (patch) | |
| tree | 8041a2f64105c90362358ac3385efc3fd7dda1d1 | |
| parent | 412e0b7fb01eed2119c69d3b65db8dbb9932e558 (diff) | |
| parent | b844b519b051fd1c985cae93d33196ec2bd67ca5 (diff) | |
Merge b844b519b051fd1c985cae93d33196ec2bd67ca5 on remote branch
Change-Id: Ic9869f957a39e56a8bd56adc28e1f49ede62b375
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/llstats.cpp | 5 | ||||
| -rw-r--r-- | qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c | 5 |
3 files changed, 11 insertions, 1 deletions
@@ -1,4 +1,6 @@ # TODO: Find a better way to separate build configs for ADP vs non-ADP devices +QCOM_WLAN_ROOT := $(call my-dir) + ifneq ($(BOARD_IS_AUTOMOTIVE),true) include $(call all-subdir-makefiles) endif diff --git a/qcwcn/wifi_hal/llstats.cpp b/qcwcn/wifi_hal/llstats.cpp index 46f6a5e..2e07e46 100644 --- a/qcwcn/wifi_hal/llstats.cpp +++ b/qcwcn/wifi_hal/llstats.cpp @@ -1189,6 +1189,7 @@ int LLStatsCommand::handleResponse(WifiEvent &reply) status = WIFI_ERROR_INVALID_ARGS; goto cleanup; } + num_rates = 0; for (peerInfo = (struct nlattr *) nla_data(tb_vendor[ QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO]), rem = nla_len(tb_vendor[ @@ -1200,7 +1201,8 @@ int LLStatsCommand::handleResponse(WifiEvent &reply) QCA_WLAN_VENDOR_ATTR_LL_STATS_MAX+ 1]; pPeerStats = (wifi_peer_info *) ( (u8 *)pIfaceStat->peer_info - + (i++ * sizeof(wifi_peer_info))); + + (i++ * sizeof(wifi_peer_info)) + + (num_rates * sizeof(wifi_rate_stat))); nla_parse(tb2, QCA_WLAN_VENDOR_ATTR_LL_STATS_MAX, (struct nlattr *) nla_data(peerInfo), nla_len(peerInfo), NULL); @@ -1209,6 +1211,7 @@ int LLStatsCommand::handleResponse(WifiEvent &reply) { goto cleanup; } + num_rates += pPeerStats->num_rate; } } diff --git a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c index bb0ff98..48538ff 100644 --- a/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c +++ b/qcwcn/wpa_supplicant_8_lib/driver_cmd_nl80211.c @@ -1874,6 +1874,11 @@ static int wpa_driver_get_all_sta_info(struct i802_bss *bss, int *status) struct sta_info *sta; int ret, total_ret = 0; + if(bss->drv && bss->drv->nlmode != NL80211_IFTYPE_AP) { + wpa_printf(MSG_ERROR,"Not a hapd interface"); + return -1; + } + if (!hapd) { wpa_printf(MSG_ERROR,"hapd is NULL"); return -1; |