Revert "qcacmn: Change pdev_stats to pdev_stats_v2"

This reverts Change-Id: I6dd3abd61730d8f17d74a11a42978a64853136e5.
wmi_pdev_stats_v2 and wmi_pdev_stats_v1 are defined depends on
specific target, can’t use them directly in our common code,
must use wmi_pdev_stats instead. And use different config to
enable v1 or v2 pdev stats.

Change-Id: I6ad11d723ac0c9ed55a266c204957af706045d3d
CRs-Fixed: 2521638
This commit is contained in:
Will Huang 2019-09-09 16:29:42 +08:00 • committed by nshrivas
commit c180dcd475

View file

@ -8757,7 +8757,7 @@ static QDF_STATUS extract_all_stats_counts_tlv(wmi_unified_t wmi_handle,
* to save total length calculated
*/
min_data_len =
(((uint64_t)ev->num_pdev_stats) * sizeof(wmi_pdev_stats_v2)) +
(((uint64_t)ev->num_pdev_stats) * sizeof(wmi_pdev_stats)) +
(((uint64_t)ev->num_vdev_stats) * sizeof(wmi_vdev_stats)) +
(((uint64_t)ev->num_peer_stats) * sizeof(wmi_peer_stats)) +
(((uint64_t)ev->num_bcnflt_stats) *
@ -8818,7 +8818,7 @@ static QDF_STATUS extract_all_stats_counts_tlv(wmi_unified_t wmi_handle,
* extract_pdev_tx_stats() - extract pdev tx stats from event
*/
static void extract_pdev_tx_stats(wmi_host_dbg_tx_stats *tx,
struct wlan_dbg_tx_stats_v2 *tx_stats)
struct wlan_dbg_tx_stats *tx_stats)
{
/* Tx Stats */
tx->comp_queued = tx_stats->comp_queued;
@ -8852,7 +8852,7 @@ static void extract_pdev_tx_stats(wmi_host_dbg_tx_stats *tx,
* extract_pdev_rx_stats() - extract pdev rx stats from event
*/
static void extract_pdev_rx_stats(wmi_host_dbg_rx_stats *rx,
struct wlan_dbg_rx_stats_v2 *rx_stats)
struct wlan_dbg_rx_stats *rx_stats)
{
/* Rx Stats */
rx->mid_ppdu_route_change = rx_stats->mid_ppdu_route_change;
@ -8896,8 +8896,8 @@ static QDF_STATUS extract_pdev_stats_tlv(wmi_unified_t wmi_handle,
data = param_buf->data;
if (index < ev_param->num_pdev_stats) {
wmi_pdev_stats_v2 *ev = (wmi_pdev_stats_v2 *) ((data) +
(index * sizeof(wmi_pdev_stats_v2)));
wmi_pdev_stats *ev = (wmi_pdev_stats *) ((data) +
(index * sizeof(wmi_pdev_stats)));
pdev_stats->chan_nf = ev->chan_nf;
pdev_stats->tx_frame_count = ev->tx_frame_count;
@ -8996,7 +8996,7 @@ static QDF_STATUS extract_vdev_stats_tlv(wmi_unified_t wmi_handle,
if (index < ev_param->num_vdev_stats) {
wmi_vdev_stats *ev = (wmi_vdev_stats *) ((data) +
((ev_param->num_pdev_stats) *
sizeof(wmi_pdev_stats_v2)) +
sizeof(wmi_pdev_stats)) +
(index * sizeof(wmi_vdev_stats)));
vdev_stats->vdev_id = ev->vdev_id;
@ -9099,8 +9099,7 @@ static QDF_STATUS extract_bcn_stats_tlv(wmi_unified_t wmi_handle,
if (index < ev_param->num_bcn_stats) {
wmi_bcn_stats *ev = (wmi_bcn_stats *) ((data) +
((ev_param->num_pdev_stats) *
sizeof(wmi_pdev_stats_v2)) +
((ev_param->num_pdev_stats) * sizeof(wmi_pdev_stats)) +
((ev_param->num_vdev_stats) * sizeof(wmi_vdev_stats)) +
((ev_param->num_peer_stats) * sizeof(wmi_peer_stats)) +
((ev_param->num_chan_stats) * sizeof(wmi_chan_stats)) +
@ -9137,8 +9136,7 @@ static QDF_STATUS extract_peer_stats_tlv(wmi_unified_t wmi_handle,
if (index < ev_param->num_peer_stats) {
wmi_peer_stats *ev = (wmi_peer_stats *) ((data) +
((ev_param->num_pdev_stats) *
sizeof(wmi_pdev_stats_v2)) +
((ev_param->num_pdev_stats) * sizeof(wmi_pdev_stats)) +
((ev_param->num_vdev_stats) * sizeof(wmi_vdev_stats)) +
(index * sizeof(wmi_peer_stats)));
@ -9278,8 +9276,7 @@ static QDF_STATUS extract_chan_stats_tlv(wmi_unified_t wmi_handle,
if (index < ev_param->num_chan_stats) {
wmi_chan_stats *ev = (wmi_chan_stats *) ((data) +
((ev_param->num_pdev_stats) *
sizeof(wmi_pdev_stats_v2)) +
((ev_param->num_pdev_stats) * sizeof(wmi_pdev_stats)) +
((ev_param->num_vdev_stats) * sizeof(wmi_vdev_stats)) +
((ev_param->num_peer_stats) * sizeof(wmi_peer_stats)) +
(index * sizeof(wmi_chan_stats)));