diff options
| author | Rajeev Kumar <quic_rajekuma@quicinc.com> | 2020-05-11 19:39:12 +0530 |
|---|---|---|
| committer | Paul Chen <chenpaul@google.com> | 2020-05-20 01:37:22 +0000 |
| commit | a5a5e7277b8bbf6f08d4f696950f8a802896feae (patch) | |
| tree | 97a3183051941d6414e948962effeab425aa9736 | |
| parent | 1e88f3340e43fff35f30130197a168211f6a070e (diff) | |
| download | qcacld-a5a5e7277b8bbf6f08d4f696950f8a802896feae.tar.gz | |
qcacld-3.0: Handle tx_power_level under radio stat
Host driver do receives radio tx power level stats as part of
radio stats even though we have different event ID for that.
Handling the tx_power_level as part of radio stats only if
num_tx_power_level is set.
Change-Id: I46aff51c70c444c94c9b10f32b7776ba4a1ca4e8
CRs-Fixed: 2686882
Bug: 155942196
Signed-off-by: Rajeev Kumar <quic_rajekuma@quicinc.com>
| -rw-r--r-- | core/hdd/src/wlan_hdd_stats.c | 43 |
1 files changed, 40 insertions, 3 deletions
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 12f11f4556..52ab19ad15 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -945,15 +945,22 @@ static int hdd_llstats_post_radio_stats(struct hdd_adapter *adapter, QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_CHANNELS, radiostat->numChannels)) { hdd_err("QCA_WLAN_VENDOR_ATTR put fail"); + goto failure; } if (radiostat->total_num_tx_power_levels) { - if (nla_put(vendor_event, + ret = + nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME_PER_LEVEL, sizeof(u32) * radiostat->total_num_tx_power_levels, - radiostat->tx_time_per_power_level)) { + radiostat->tx_time_per_power_level); + qdf_mem_free(radiostat->tx_time_per_power_level); + radiostat->tx_time_per_power_level = NULL; + if (ret) { + qdf_mem_free(radiostat->channels); + radiostat->channels = NULL; hdd_err("nla_put fail"); goto failure; } @@ -1052,7 +1059,7 @@ static void hdd_process_ll_stats(tSirLLStatsResults *results, if (results->paramId & WMI_LINK_STATS_RADIO) { tpSirWifiRadioStat rs_results, stat_result; - u64 channel_size = 0; + u64 channel_size = 0, pwr_lvl_size = 0; int i; stats = qdf_mem_malloc(sizeof(*stats)); if (!stats) @@ -1071,13 +1078,40 @@ static void hdd_process_ll_stats(tSirLLStatsResults *results, for (i = 0; i < results->num_radio; i++) { channel_size = rs_results->numChannels * sizeof(tSirWifiChannelStats); + pwr_lvl_size = sizeof(uint32_t) * + rs_results->total_num_tx_power_levels; + + if (rs_results->total_num_tx_power_levels && + rs_results->tx_time_per_power_level) { + stat_result->tx_time_per_power_level = + qdf_mem_malloc(pwr_lvl_size); + if (!stat_result->tx_time_per_power_level) { + while (i-- > 0) { + stat_result--; + qdf_mem_free(stat_result-> + tx_time_per_power_level); + qdf_mem_free(stat_result-> + channels); + } + qdf_mem_free(stat_result); + qdf_mem_free(stats); + goto exit; + } + qdf_mem_copy(stat_result->tx_time_per_power_level, + rs_results->tx_time_per_power_level, + pwr_lvl_size); + } if (channel_size) { stat_result->channels = qdf_mem_malloc(channel_size); if (!stat_result->channels) { + qdf_mem_free(stat_result-> + tx_time_per_power_level); while (i-- > 0) { stat_result--; qdf_mem_free(stat_result-> + tx_time_per_power_level); + qdf_mem_free(stat_result-> channels); } qdf_mem_free(stats->result); @@ -1461,6 +1495,9 @@ static void wlan_hdd_handle_ll_stats(struct hdd_adapter *adapter, for (i = 0; i < num_radio; i++) { if (radio_stat->numChannels) qdf_mem_free(radio_stat->channels); + if (radio_stat->total_num_tx_power_levels) + qdf_mem_free(radio_stat-> + tx_time_per_power_level); radio_stat++; } return; |