qcacld: remove unused stats from getStats

"iwpriv wlan0 getStats" has unused stats elements.
Remove the invalid elements from the structure.

Change-Id: I6a7b6dc5f8604536215ca65af7f30ecb4262e90e
CRs-FIXED: 764458

4 files changed, 3 insertions, 117 deletions

diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 8f4ec23a81b7..68ece7964842 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -316,39 +316,16 @@ typedef struct hdd_tx_rx_stats_s
    // start_xmit stats
    __u32    txXmitCalled;
    __u32    txXmitDropped;
-   __u32    txXmitBackPressured;
-   __u32    txXmitQueued;
    __u32    txXmitClassifiedAC[NUM_TX_QUEUES];
    __u32    txXmitDroppedAC[NUM_TX_QUEUES];
-   __u32    txXmitBackPressuredAC[NUM_TX_QUEUES];
-   __u32    txXmitQueuedAC[NUM_TX_QUEUES];
-   // fetch_cbk stats
-   __u32    txFetched;
-   __u32    txFetchedAC[NUM_TX_QUEUES];
-   __u32    txFetchEmpty;
-   __u32    txFetchLowResources;
-   __u32    txFetchDequeueError;
-   __u32    txFetchDequeued;
-   __u32    txFetchDequeuedAC[NUM_TX_QUEUES];
-   __u32    txFetchDePressured;
-   __u32    txFetchDePressuredAC[NUM_TX_QUEUES];
    // complete_cbk_stats
    __u32    txCompleted;
-   // flush stats
-   __u32    txFlushed;
-   __u32    txFlushedAC[NUM_TX_QUEUES];
-   // Deque depressure stats
-   __u32    txDequeDePressured;
-   __u32    txDequeDePressuredAC[NUM_TX_QUEUES];
    // rx stats
    __u32    rxChains;
    __u32    rxPackets;
    __u32    rxDropped;
    __u32    rxDelivered;
    __u32    rxRefused;
-   __u32    pkt_tx_count; //TX pkt Counter used for dynamic splitscan
-   __u32    pkt_rx_count; //RX pkt Counter used for dynamic splitscan
-
 } hdd_tx_rx_stats_t;
 
 #ifdef WLAN_FEATURE_11W
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index f226484157e3..989e56d06e19 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -120,8 +120,6 @@ static VOS_STATUS hdd_softap_flush_tx_queues( hdd_adapter_t *pAdapter )
                pktNode = list_entry(anchor, skb_list_node_t, anchor);
                skb = pktNode->skb;
                ++pAdapter->stats.tx_dropped;
-               ++pAdapter->hdd_stats.hddTxRxStats.txFlushed;
-               ++pAdapter->hdd_stats.hddTxRxStats.txFlushedAC[i];
                kfree_skb(skb);
                continue;
             }
@@ -374,7 +372,6 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif /* QCA_PKT_PROTO_TRACE */
    pAdapter->stats.tx_bytes += skb->len;
    ++pAdapter->stats.tx_packets;
-   ++pAdapter->hdd_stats.hddTxRxStats.pkt_tx_count;
 
    if (WLANTL_SendSTA_DataFrame((WLAN_HDD_GET_CTX(pAdapter))->pvosContext,
                                  STAId, skb
@@ -533,8 +530,6 @@ static void hdd_softap_flush_tx_queues_sta( hdd_adapter_t *pAdapter, v_U8_t STAI
             pktNode = list_entry(anchor, skb_list_node_t, anchor);
             skb = pktNode->skb;
             ++pAdapter->stats.tx_dropped;
-            ++pAdapter->hdd_stats.hddTxRxStats.txFlushed;
-            ++pAdapter->hdd_stats.hddTxRxStats.txFlushedAC[i];
             kfree_skb(skb);
             continue;
          }
@@ -800,8 +795,6 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext,
       return VOS_STATUS_E_FAILURE;
    }
 
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetched;
-
    *ppVosPacket = NULL;
 
    //Make sure the AC being asked for is sane
@@ -812,8 +805,6 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext,
       return VOS_STATUS_E_FAILURE;
    }
 
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetchedAC[ac];
-
    VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_INFO,
               "%s: AC %d passed by TL", __func__, ac);
 
@@ -829,7 +820,6 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    {
       //Remember VOS is in a low resource situation
       pAdapter->isVosOutOfResource = VOS_TRUE;
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchLowResources;
       VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_WARN,
                  "%s: VOSS in Low Resource scenario", __func__);
       //TL needs to handle this case. VOS_STATUS_E_EMPTY is returned when the queue is empty.
@@ -863,7 +853,6 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    }
    else
    {
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
       VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_ERROR,
                  "%s: Error in de-queuing skb from Tx queue status = %d",
                  __func__, status );
@@ -879,7 +868,6 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext,
                  "%s: Error attaching skb", __func__);
       vos_pkt_return_packet(pVosPacket);
       ++pAdapter->stats.tx_dropped;
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
       kfree_skb(skb);
       return VOS_STATUS_E_FAILURE;
    }
@@ -890,7 +878,6 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext,
       VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_ERROR,
                  "%s: VOS packet returned by VOSS is NULL", __func__);
       ++pAdapter->stats.tx_dropped;
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
       kfree_skb(skb);
       return VOS_STATUS_E_FAILURE;
    }
@@ -958,8 +945,6 @@ VOS_STATUS hdd_softap_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    // account for them
    pAdapter->stats.tx_bytes += skb->len;
    ++pAdapter->stats.tx_packets;
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeued;
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeuedAC[ac];
 
    VOS_TRACE( VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_INFO,
               "%s: Valid VOS PKT returned to TL", __func__);
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index 6c6891fa203e..a41dc0147bd1 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -202,10 +202,7 @@ static VOS_STATUS hdd_flush_tx_queues( hdd_adapter_t *pAdapter )
          {
             pktNode = list_entry(anchor, skb_list_node_t, anchor);
             skb = pktNode->skb;
-            //TODO
-            //++pAdapter->stats.tx_dropped;
-            ++pAdapter->hdd_stats.hddTxRxStats.txFlushed;
-            ++pAdapter->hdd_stats.hddTxRxStats.txFlushedAC[i];
+            ++pAdapter->stats.tx_dropped;
             kfree_skb(skb);
             continue;
          }
@@ -273,8 +270,6 @@ void hdd_flush_ibss_tx_queues( hdd_adapter_t *pAdapter, v_U8_t STAId)
                list_del(tmp);
                kfree_skb(skb);
 
-               ++pAdapter->hdd_stats.hddTxRxStats.txFlushed;
-               ++pAdapter->hdd_stats.hddTxRxStats.txFlushedAC[i];
                pAdapter->wmm_tx_queue[i].count--;
             }
          }
@@ -290,8 +285,6 @@ void hdd_flush_ibss_tx_queues( hdd_adapter_t *pAdapter, v_U8_t STAId)
       {
          netif_tx_start_queue(txq);
          pAdapter->isTxSuspended[i] = VOS_FALSE;
-         ++pAdapter->hdd_stats.hddTxRxStats.txDequeDePressured;
-         ++pAdapter->hdd_stats.hddTxRxStats.txDequeDePressuredAC[i];
       }
 
       spin_unlock_bh(&pAdapter->wmm_tx_queue[i].lock);
@@ -905,7 +898,6 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
    pAdapter->stats.tx_bytes += skb->len;
    ++pAdapter->stats.tx_packets;
-   ++pAdapter->hdd_stats.hddTxRxStats.pkt_tx_count;
 
    /*
     * TODO: Should we stop net queues when txrx returns non-NULL?.
@@ -1299,8 +1291,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
       return VOS_STATUS_E_FAILURE;
    }
 
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetched;
-
    *ppVosPacket = NULL;
 
    //Make sure the AC being asked for is sane
@@ -1311,8 +1301,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
       return VOS_STATUS_E_FAILURE;
    }
 
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetchedAC[ac];
-
 #ifdef HDD_WMM_DEBUG
    VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
              "%s: AC %d passed by TL", __func__, ac);
@@ -1327,7 +1315,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    if (unlikely((0==pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessAllowed) &&
                 (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.uIsAuthenticated))
    {
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchEmpty;
 #ifdef HDD_WMM_DEBUG
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_FATAL,
                  "%s: no packets pending", __func__);
@@ -1347,7 +1334,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    }
    else
    {
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchEmpty;
 #ifdef HDD_WMM_DEBUG
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_FATAL,
                    "%s: no packets pending", __func__);
@@ -1367,7 +1353,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    {
       //Remember VOS is in a low resource situation
       pAdapter->isVosOutOfResource = VOS_TRUE;
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchLowResources;
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_WARN,"%s: VOSS in Low Resource scenario", __func__);
       //TL will now think we have no more packets in this AC
       return VOS_STATUS_E_FAILURE;
@@ -1386,7 +1371,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    }
    else
    {
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_WARN, "%s: Error in de-queuing "
          "skb from Tx queue status = %d", __func__, status );
       vos_pkt_return_packet(pVosPacket);
@@ -1400,7 +1384,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_WARN,"%s: Error attaching skb", __func__);
       vos_pkt_return_packet(pVosPacket);
       ++pAdapter->stats.tx_dropped;
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
       kfree_skb(skb);
       return VOS_STATUS_E_FAILURE;
    }
@@ -1410,7 +1393,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    {
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_WARN,"%s: VOS packet returned by VOSS is NULL", __func__);
       ++pAdapter->stats.tx_dropped;
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeueError;
       kfree_skb(skb);
       return VOS_STATUS_E_FAILURE;
    }
@@ -1518,8 +1500,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    if ( (pAdapter->isTxSuspended[ac]) &&
         (size <= HDD_TX_QUEUE_LOW_WATER_MARK) )
    {
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDePressured;
-      ++pAdapter->hdd_stats.hddTxRxStats.txFetchDePressuredAC[ac];
       VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_INFO,
                  "%s: TX queue[%d] re-enabled", __func__, ac);
       pAdapter->isTxSuspended[ac] = VOS_FALSE;
@@ -1539,8 +1519,6 @@ VOS_STATUS hdd_tx_fetch_packet_cbk( v_VOID_t *vosContext,
    // account for them
    pAdapter->stats.tx_bytes += skb->len;
    ++pAdapter->stats.tx_packets;
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeued;
-   ++pAdapter->hdd_stats.hddTxRxStats.txFetchDequeuedAC[ac];
 
    if((pHddCtx->cfg_ini->thermalMitigationEnable) &&
       (WLAN_HDD_INFRA_STATION == pAdapter->device_mode))
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 4ccf782365eb..0e0c0723c16d 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -676,25 +676,15 @@ void hdd_wlan_get_stats(hdd_adapter_t *pAdapter, v_U16_t *length,
 
     snprintf(buffer, buf_len,
         "\nTransmit"
-        "\ncalled %u, dropped %u, backpressured %u, queued %u"
+        "\ncalled %u, dropped %u,"
         "\n      dropped BK %u, BE %u, VI %u, VO %u"
         "\n   classified BK %u, BE %u, VI %u, VO %u"
-        "\nbackpressured BK %u, BE %u, VI %u, VO %u"
-        "\n       queued BK %u, BE %u, VI %u, VO %u"
-        "\nfetched %u, empty %u, lowres %u, deqerr %u"
-        "\ndequeued %u, depressured %u, deque-depressured %u, completed %u, flushed %u"
-        "\n      fetched BK %u, BE %u, VI %u, VO %u"
-        "\n     dequeued BK %u, BE %u, VI %u, VO %u"
-        "\n  depressured BK %u, BE %u, VI %u, VO %u"
-        "\nDeque depressured BK %u, BE %u, VI %u, VO %u"
-        "\n      flushed BK %u, BE %u, VI %u, VO %u"
+        "\ncompleted %u,"
         "\n\nReceive"
         "\nchains %u, packets %u, dropped %u, delivered %u, refused %u"
         "\n",
         pStats->txXmitCalled,
         pStats->txXmitDropped,
-        pStats->txXmitBackPressured,
-        pStats->txXmitQueued,
 
         pStats->txXmitDroppedAC[WLANTL_AC_BK],
         pStats->txXmitDroppedAC[WLANTL_AC_BE],
@@ -706,51 +696,7 @@ void hdd_wlan_get_stats(hdd_adapter_t *pAdapter, v_U16_t *length,
         pStats->txXmitClassifiedAC[WLANTL_AC_VI],
         pStats->txXmitClassifiedAC[WLANTL_AC_VO],
 
-        pStats->txXmitBackPressuredAC[WLANTL_AC_BK],
-        pStats->txXmitBackPressuredAC[WLANTL_AC_BE],
-        pStats->txXmitBackPressuredAC[WLANTL_AC_VI],
-        pStats->txXmitBackPressuredAC[WLANTL_AC_VO],
-
-        pStats->txXmitQueuedAC[WLANTL_AC_BK],
-        pStats->txXmitQueuedAC[WLANTL_AC_BE],
-        pStats->txXmitQueuedAC[WLANTL_AC_VI],
-        pStats->txXmitQueuedAC[WLANTL_AC_VO],
-
-        pStats->txFetched,
-        pStats->txFetchEmpty,
-        pStats->txFetchLowResources,
-        pStats->txFetchDequeueError,
-
-        pStats->txFetchDequeued,
-        pStats->txFetchDePressured,
-        pStats->txDequeDePressured,
         pStats->txCompleted,
-        pStats->txFlushed,
-
-        pStats->txFetchedAC[WLANTL_AC_BK],
-        pStats->txFetchedAC[WLANTL_AC_BE],
-        pStats->txFetchedAC[WLANTL_AC_VI],
-        pStats->txFetchedAC[WLANTL_AC_VO],
-
-        pStats->txFetchDequeuedAC[WLANTL_AC_BK],
-        pStats->txFetchDequeuedAC[WLANTL_AC_BE],
-        pStats->txFetchDequeuedAC[WLANTL_AC_VI],
-        pStats->txFetchDequeuedAC[WLANTL_AC_VO],
-
-        pStats->txFetchDePressuredAC[WLANTL_AC_BK],
-        pStats->txFetchDePressuredAC[WLANTL_AC_BE],
-        pStats->txFetchDePressuredAC[WLANTL_AC_VI],
-        pStats->txFetchDePressuredAC[WLANTL_AC_VO],
-
-        pStats->txDequeDePressuredAC[WLANTL_AC_BK],
-        pStats->txDequeDePressuredAC[WLANTL_AC_BE],
-        pStats->txDequeDePressuredAC[WLANTL_AC_VI],
-        pStats->txDequeDePressuredAC[WLANTL_AC_VO],
-
-        pStats->txFlushedAC[WLANTL_AC_BK],
-        pStats->txFlushedAC[WLANTL_AC_BE],
-        pStats->txFlushedAC[WLANTL_AC_VI],
-        pStats->txFlushedAC[WLANTL_AC_VO],
 
         pStats->rxChains,
         pStats->rxPackets,