From c3e68bc67d954d32849a7b68f5d78ecb9a59cf35 Mon Sep 17 00:00:00 2001 From: "Ruchi, Agrawal" Date: Mon, 16 Jul 2018 16:45:34 +0530 Subject: [PATCH] qcacmn: desc na change Part of base changes, move due to dependency on other changes. Change-Id: I7d640d2976c4c2c2c156a5223683dc4b28559577 CRs-Fixed: 2283286 --- dp/inc/cdp_txrx_stats_struct.h | 2 +- dp/wifi3.0/dp_main.c | 8 ++++---- dp/wifi3.0/dp_tx.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h index 5b7dc0eb5a..081bb5f1f0 100644 --- a/dp/inc/cdp_txrx_stats_struct.h +++ b/dp/inc/cdp_txrx_stats_struct.h @@ -412,7 +412,7 @@ struct cdp_tx_ingress_stats { /* Packets dropped on the Tx side */ struct { struct cdp_pkt_info dropped_pkt; - uint32_t desc_na; + struct cdp_pkt_info desc_na; uint32_t ring_full; uint32_t enqueue_fail; uint32_t dma_error; diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 0c8d6b803d..bdace54570 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -5171,7 +5171,7 @@ static inline void dp_aggregate_pdev_stats(struct dp_pdev *pdev) DP_STATS_AGGR(pdev, vdev, tx_i.dropped.dma_error); DP_STATS_AGGR(pdev, vdev, tx_i.dropped.ring_full); DP_STATS_AGGR(pdev, vdev, tx_i.dropped.enqueue_fail); - DP_STATS_AGGR(pdev, vdev, tx_i.dropped.desc_na); + DP_STATS_AGGR(pdev, vdev, tx_i.dropped.desc_na.num); DP_STATS_AGGR(pdev, vdev, tx_i.dropped.res_full); DP_STATS_AGGR(pdev, vdev, tx_i.cce_classified); DP_STATS_AGGR(pdev, vdev, tx_i.cce_classified_raw); @@ -5182,7 +5182,7 @@ static inline void dp_aggregate_pdev_stats(struct dp_pdev *pdev) pdev->stats.tx_i.dropped.dma_error + pdev->stats.tx_i.dropped.ring_full + pdev->stats.tx_i.dropped.enqueue_fail + - pdev->stats.tx_i.dropped.desc_na + + pdev->stats.tx_i.dropped.desc_na.num + pdev->stats.tx_i.dropped.res_full; pdev->stats.tx.last_ack_rssi = @@ -5309,7 +5309,7 @@ dp_print_pdev_tx_stats(struct dp_pdev *pdev) DP_PRINT_STATS(" Ring Full = %d", pdev->stats.tx_i.dropped.ring_full); DP_PRINT_STATS(" Descriptor Not available = %d", - pdev->stats.tx_i.dropped.desc_na); + pdev->stats.tx_i.dropped.desc_na.num); DP_PRINT_STATS(" HW enqueue failed= %d", pdev->stats.tx_i.dropped.enqueue_fail); DP_PRINT_STATS(" Resources Full = %d", @@ -6775,7 +6775,7 @@ static void dp_txrx_path_stats(struct dp_soc *soc) DP_TRACE(FATAL, "Total packets dropped: %u,", pdev->stats.tx_i.dropped.dropped_pkt.num); DP_TRACE(FATAL, "Descriptor not available: %u", - pdev->stats.tx_i.dropped.desc_na); + pdev->stats.tx_i.dropped.desc_na.num); DP_TRACE(FATAL, "Ring full: %u", pdev->stats.tx_i.dropped.ring_full); DP_TRACE(FATAL, "Enqueue fail: %u", diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index dd780d7fc2..5223179a40 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -506,7 +506,7 @@ struct dp_tx_ext_desc_elem_s *dp_tx_prepare_ext_desc(struct dp_vdev *vdev, qdf_mem_zero(&cached_ext_desc[0], HAL_TX_EXT_DESC_WITH_META_DATA); if (!msdu_ext_desc) { - DP_STATS_INC(vdev, tx_i.dropped.desc_na, 1); + DP_STATS_INC(vdev, tx_i.dropped.desc_na.num, 1); return NULL; } @@ -609,7 +609,7 @@ struct dp_tx_desc_s *dp_tx_prepare_desc_single(struct dp_vdev *vdev, /* Allocate software Tx descriptor */ tx_desc = dp_tx_desc_alloc(soc, desc_pool_id); if (qdf_unlikely(!tx_desc)) { - DP_STATS_INC(vdev, tx_i.dropped.desc_na, 1); + DP_STATS_INC(vdev, tx_i.dropped.desc_na.num, 1); return NULL; } @@ -737,7 +737,7 @@ static struct dp_tx_desc_s *dp_tx_prepare_desc(struct dp_vdev *vdev, /* Allocate software Tx descriptor */ tx_desc = dp_tx_desc_alloc(soc, desc_pool_id); if (!tx_desc) { - DP_STATS_INC(vdev, tx_i.dropped.desc_na, 1); + DP_STATS_INC(vdev, tx_i.dropped.desc_na.num, 1); return NULL; }