qcacld-3.0: Fix camelCase issues with struct hdd_tx_rx_stats

Multiple fields within struct hdd_tx_rx_stats are currently defined
with camelCase. Rename these to align with the Linux coding style
which states "mixed-case names are frowned upon."

Change-Id: I28f81baab8ed43e3e87449e8a4476e540477b57a
CRs-Fixed: 2130212

core/hdd/inc/wlan_hdd_main.h

@@ -432,17 +432,17 @@ struct hdd_tx_rx_histogram {
 
 struct hdd_tx_rx_stats {
 	/* start_xmit stats */
-	__u32    txXmitCalled;
-	__u32    txXmitDropped;
-	__u32    txXmitOrphaned;
-	__u32    txXmitClassifiedAC[NUM_TX_QUEUES];
-	__u32    txXmitDroppedAC[NUM_TX_QUEUES];
+	__u32    tx_called;
+	__u32    tx_dropped;
+	__u32    tx_orphaned;
+	__u32    tx_classified_ac[NUM_TX_QUEUES];
+	__u32    tx_dropped_ac[NUM_TX_QUEUES];
 
 	/* rx stats */
-	__u32 rxPackets[NUM_CPUS];
-	__u32 rxDropped[NUM_CPUS];
-	__u32 rxDelivered[NUM_CPUS];
-	__u32 rxRefused[NUM_CPUS];
+	__u32 rx_packets[NUM_CPUS];
+	__u32 rx_dropped[NUM_CPUS];
+	__u32 rx_delivered[NUM_CPUS];
+	__u32 rx_refused[NUM_CPUS];
 
 	/* txflow stats */
 	bool     is_txflow_paused;
@@ -488,15 +488,15 @@ struct hdd_arp_stats_s {
  * @ClassA_stat: "Class A" stats reported by firmware
  * @ClassD_stat: "Class D" stats reported by firmware
  * @per_chain_rssi_stats: Per-chain RSSI stats
- * @hddTxRxStats: Tx & Rx stats
- * @hddPmfStats: Protercted Management Frame stats
+ * @tx_rx_stats: Tx & Rx stats
+ * @hddPmfStats: Protected Management Frame stats
  */
 struct hdd_stats {
 	tCsrSummaryStatsInfo summary_stat;
 	tCsrGlobalClassAStatsInfo ClassA_stat;
 	tCsrGlobalClassDStatsInfo ClassD_stat;
 	struct csr_per_chain_rssi_stats_info  per_chain_rssi_stats;
-	struct hdd_tx_rx_stats hddTxRxStats;
+	struct hdd_tx_rx_stats tx_rx_stats;
 	struct hdd_arp_stats_s hdd_arp_stats;
 #ifdef WLAN_FEATURE_11W
 	struct hdd_pmf_stats hddPmfStats;

core/hdd/src/wlan_hdd_assoc.c

@@ -1749,7 +1749,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	}
 	wlan_hdd_clear_link_layer_stats(adapter);
 
-	adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt = 0;
+	adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0;
 
 	/* Unblock anyone waiting for disconnect to complete */
 	complete(&adapter->disconnect_comp_var);

core/hdd/src/wlan_hdd_ipa.c

@@ -3846,12 +3846,12 @@ static void hdd_ipa_send_skb_to_network(qdf_nbuf_t skb,
 
 	cpu_index = wlan_hdd_get_cpu();
 
-	++adapter->hdd_stats.hddTxRxStats.rxPackets[cpu_index];
+	++adapter->hdd_stats.tx_rx_stats.rx_packets[cpu_index];
 	result = hdd_ipa_aggregated_rx_ind(skb);
 	if (result == NET_RX_SUCCESS)
-		++adapter->hdd_stats.hddTxRxStats.rxDelivered[cpu_index];
+		++adapter->hdd_stats.tx_rx_stats.rx_delivered[cpu_index];
 	else
-		++adapter->hdd_stats.hddTxRxStats.rxRefused[cpu_index];
+		++adapter->hdd_stats.tx_rx_stats.rx_refused[cpu_index];
 
 	HDD_IPA_INCREASE_NET_SEND_COUNT(hdd_ipa);
 }

core/hdd/src/wlan_hdd_rx_monitor.c

@@ -69,7 +69,7 @@ void hdd_rx_monitor_callback(ol_osif_vdev_handle context,
 		skb_next = skb->next;
 		skb->dev = adapter->dev;
 
-		++adapter->hdd_stats.hddTxRxStats.rxPackets[cpu_index];
+		++adapter->hdd_stats.tx_rx_stats.rx_packets[cpu_index];
 		++adapter->stats.rx_packets;
 		adapter->stats.rx_bytes += skb->len;
 
@@ -94,9 +94,9 @@ void hdd_rx_monitor_callback(ol_osif_vdev_handle context,
 
 		if (NET_RX_SUCCESS == rxstat)
 			++adapter->
-				hdd_stats.hddTxRxStats.rxDelivered[cpu_index];
+				hdd_stats.tx_rx_stats.rx_delivered[cpu_index];
 		else
-			++adapter->hdd_stats.hddTxRxStats.rxRefused[cpu_index];
+			++adapter->hdd_stats.tx_rx_stats.rx_refused[cpu_index];
 
 		skb = skb_next;
 	}

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -151,7 +151,7 @@ hdd_softap_tx_resume_false(struct hdd_adapter *adapter, bool tx_resume)
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			hdd_err("Failed to start tx_flow_control_timer");
 		else
-			adapter->hdd_stats.hddTxRxStats.txflow_timer_cnt++;
+			adapter->hdd_stats.tx_rx_stats.txflow_timer_cnt++;
 	}
 }
 #else
@@ -230,7 +230,7 @@ static inline struct sk_buff *hdd_skb_orphan(struct hdd_adapter *adapter,
 
 	if (need_orphan) {
 		skb_orphan(skb);
-		++adapter->hdd_stats.hddTxRxStats.txXmitOrphaned;
+		++adapter->hdd_stats.tx_rx_stats.tx_orphaned;
 	} else
 		skb = skb_unshare(skb, GFP_ATOMIC);
 
@@ -263,7 +263,7 @@ static inline struct sk_buff *hdd_skb_orphan(struct hdd_adapter *adapter,
 		 * to send more packets. The flow would ultimately be controlled
 		 * by the limited number of tx descriptors for the vdev.
 		 */
-		++adapter->hdd_stats.hddTxRxStats.txXmitOrphaned;
+		++adapter->hdd_stats.tx_rx_stats.tx_orphaned;
 		skb_orphan(skb);
 	}
 #endif
@@ -294,8 +294,8 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 	uint8_t STAId;
 	uint32_t num_seg;
 
-	++adapter->hdd_stats.hddTxRxStats.txXmitCalled;
-	adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt = 0;
+	++adapter->hdd_stats.tx_rx_stats.tx_called;
+	adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0;
 
 	/* Prevent this function from being called during SSR since TL
 	 * context may not be reinitialized at this time which may
@@ -394,7 +394,7 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 
 	/* Get TL AC corresponding to Qdisc queue index/AC. */
 	ac = hdd_qdisc_ac_to_tl_ac[skb->queue_mapping];
-	++adapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac];
+	++adapter->hdd_stats.tx_rx_stats.tx_classified_ac[ac];
 
 #if defined(IPA_OFFLOAD)
 	if (!qdf_nbuf_ipa_owned_get(skb)) {
@@ -458,7 +458,7 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Failed to send packet to txrx for staid:%d",
 			  __func__, STAId);
-		++adapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
+		++adapter->hdd_stats.tx_rx_stats.tx_dropped_ac[ac];
 		goto drop_pkt_and_release_skb;
 	}
 	netif_trans_update(dev);
@@ -481,7 +481,7 @@ drop_pkt:
 
 drop_pkt_accounting:
 	++adapter->stats.tx_dropped;
-	++adapter->hdd_stats.hddTxRxStats.txXmitDropped;
+	++adapter->hdd_stats.tx_rx_stats.tx_dropped;
 
 	return NETDEV_TX_OK;
 }
@@ -556,14 +556,14 @@ static void __hdd_softap_tx_timeout(struct net_device *dev)
 	QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG,
 			"carrier state: %d", netif_carrier_ok(dev));
 
-	++adapter->hdd_stats.hddTxRxStats.tx_timeout_cnt;
-	++adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt;
+	++adapter->hdd_stats.tx_rx_stats.tx_timeout_cnt;
+	++adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt;
 
-	if (adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt >
+	if (adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt >
 	    HDD_TX_STALL_THRESHOLD) {
 		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "Detected data stall due to continuous TX timeouts");
-		adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt = 0;
+		adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0;
 		cdp_post_data_stall_event(soc,
 					  DATA_STALL_LOG_INDICATOR_HOST_DRIVER,
 					  DATA_STALL_LOG_HOST_SOFTAP_TX_TIMEOUT,
@@ -762,7 +762,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 			continue;
 		}
 		cpu_index = wlan_hdd_get_cpu();
-		++adapter->hdd_stats.hddTxRxStats.rxPackets[cpu_index];
+		++adapter->hdd_stats.tx_rx_stats.rx_packets[cpu_index];
 		++adapter->stats.rx_packets;
 		adapter->stats.rx_bytes += skb->len;
 
@@ -825,9 +825,9 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 		else
 			rxstat = netif_rx_ni(skb);
 		if (NET_RX_SUCCESS == rxstat)
-			++adapter->hdd_stats.hddTxRxStats.rxDelivered[cpu_index];
+			++adapter->hdd_stats.tx_rx_stats.rx_delivered[cpu_index];
 		else
-			++adapter->hdd_stats.hddTxRxStats.rxRefused[cpu_index];
+			++adapter->hdd_stats.tx_rx_stats.rx_refused[cpu_index];
 	}
 
 	return QDF_STATUS_SUCCESS;

core/hdd/src/wlan_hdd_tx_rx.c

@@ -145,11 +145,11 @@ hdd_tx_resume_false(struct hdd_adapter *adapter, bool tx_resume)
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			hdd_err("Failed to start tx_flow_control_timer");
 		else
-			adapter->hdd_stats.hddTxRxStats.txflow_timer_cnt++;
+			adapter->hdd_stats.tx_rx_stats.txflow_timer_cnt++;
 	}
 
-	adapter->hdd_stats.hddTxRxStats.txflow_pause_cnt++;
-	adapter->hdd_stats.hddTxRxStats.is_txflow_paused = true;
+	adapter->hdd_stats.tx_rx_stats.txflow_pause_cnt++;
+	adapter->hdd_stats.tx_rx_stats.is_txflow_paused = true;
 }
 #else
 
@@ -193,7 +193,7 @@ static inline struct sk_buff *hdd_skb_orphan(struct hdd_adapter *adapter,
 
 	if (need_orphan) {
 		skb_orphan(skb);
-		++adapter->hdd_stats.hddTxRxStats.txXmitOrphaned;
+		++adapter->hdd_stats.tx_rx_stats.tx_orphaned;
 	} else
 		skb = skb_unshare(skb, GFP_ATOMIC);
 
@@ -309,9 +309,9 @@ void hdd_get_tx_resource(struct hdd_adapter *adapter,
 						    tx_flow_control_timer))) {
 			qdf_mc_timer_start(&adapter->tx_flow_control_timer,
 					   timer_value);
-			adapter->hdd_stats.hddTxRxStats.txflow_timer_cnt++;
-			adapter->hdd_stats.hddTxRxStats.txflow_pause_cnt++;
-			adapter->hdd_stats.hddTxRxStats.is_txflow_paused = true;
+			adapter->hdd_stats.tx_rx_stats.txflow_timer_cnt++;
+			adapter->hdd_stats.tx_rx_stats.txflow_pause_cnt++;
+			adapter->hdd_stats.tx_rx_stats.is_txflow_paused = true;
 		}
 	}
 }
@@ -342,7 +342,7 @@ static inline struct sk_buff *hdd_skb_orphan(struct hdd_adapter *adapter,
 		 * to send more packets. The flow would ultimately be controlled
 		 * by the limited number of tx descriptors for the vdev.
 		 */
-		++adapter->hdd_stats.hddTxRxStats.txXmitOrphaned;
+		++adapter->hdd_stats.tx_rx_stats.tx_orphaned;
 		skb_orphan(skb);
 	}
 #endif
@@ -584,8 +584,8 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	}
 #endif
 
-	++adapter->hdd_stats.hddTxRxStats.txXmitCalled;
-	adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt = 0;
+	++adapter->hdd_stats.tx_rx_stats.tx_called;
+	adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0;
 
 	if (cds_is_driver_recovering() || cds_is_driver_in_bad_state()) {
 		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -629,7 +629,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	 */
 	up = skb->priority;
 
-	++adapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac];
+	++adapter->hdd_stats.tx_rx_stats.tx_classified_ac[ac];
 #ifdef HDD_WMM_DEBUG
 	QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: Classified as ac %d up %d", __func__, ac, up);
@@ -753,7 +753,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	if (!hdd_is_tx_allowed(skb, STAId)) {
 		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Tx not allowed for sta_id: %d"), STAId);
-		++adapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
+		++adapter->hdd_stats.tx_rx_stats.tx_dropped_ac[ac];
 		goto drop_pkt_and_release_skb;
 	}
 
@@ -764,7 +764,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
 			 "%s: TX function not registered by the data path",
 			 __func__);
-		++adapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
+		++adapter->hdd_stats.tx_rx_stats.tx_dropped_ac[ac];
 		goto drop_pkt_and_release_skb;
 	}
 
@@ -773,7 +773,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Failed to send packet to txrx for staid: %d",
 			  __func__, STAId);
-		++adapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
+		++adapter->hdd_stats.tx_rx_stats.tx_dropped_ac[ac];
 		goto drop_pkt_and_release_skb;
 	}
 	netif_trans_update(dev);
@@ -802,7 +802,7 @@ drop_pkt:
 drop_pkt_accounting:
 
 	++adapter->stats.tx_dropped;
-	++adapter->hdd_stats.hddTxRxStats.txXmitDropped;
+	++adapter->hdd_stats.tx_rx_stats.tx_dropped;
 
 	return NETDEV_TX_OK;
 }
@@ -897,13 +897,13 @@ static void __hdd_tx_timeout(struct net_device *dev)
 	wlan_hdd_display_netif_queue_history(hdd_ctx);
 	cdp_dump_flow_pool_info(cds_get_context(QDF_MODULE_ID_SOC));
 
-	++adapter->hdd_stats.hddTxRxStats.tx_timeout_cnt;
-	++adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt;
+	++adapter->hdd_stats.tx_rx_stats.tx_timeout_cnt;
+	++adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt;
 
 	diff_jiffies = jiffies -
-		       adapter->hdd_stats.hddTxRxStats.jiffies_last_txtimeout;
+		       adapter->hdd_stats.tx_rx_stats.jiffies_last_txtimeout;
 
-	if ((adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt > 1) &&
+	if ((adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt > 1) &&
 	    (diff_jiffies > (HDD_TX_TIMEOUT * 2))) {
 		/*
 		 * In case when there is no traffic is running, it may
@@ -917,18 +917,18 @@ static void __hdd_tx_timeout(struct net_device *dev)
 		 * TX TIME out has occurred more than twice of HDD_TX_TIMEOUT
 		 * back then host may recovered here from data stall.
 		 */
-		adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt = 0;
+		adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0;
 		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG,
 			  "Reset continous tx timeout stat");
 	}
 
-	adapter->hdd_stats.hddTxRxStats.jiffies_last_txtimeout = jiffies;
+	adapter->hdd_stats.tx_rx_stats.jiffies_last_txtimeout = jiffies;
 
-	if (adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt >
+	if (adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt >
 	    HDD_TX_STALL_THRESHOLD) {
 		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "Data stall due to continuous TX timeouts");
-		adapter->hdd_stats.hddTxRxStats.cont_txtimeout_cnt = 0;
+		adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0;
 		cdp_post_data_stall_event(soc,
 					  DATA_STALL_LOG_INDICATOR_HOST_DRIVER,
 					  DATA_STALL_LOG_HOST_STA_TX_TIMEOUT,
@@ -1035,7 +1035,7 @@ static QDF_STATUS hdd_mon_rx_packet_cbk(void *context, qdf_nbuf_t rxbuf)
 		skb_next = skb->next;
 		skb->dev = adapter->dev;
 
-		++adapter->hdd_stats.hddTxRxStats.rxPackets[cpu_index];
+		++adapter->hdd_stats.tx_rx_stats.rx_packets[cpu_index];
 		++adapter->stats.rx_packets;
 		adapter->stats.rx_bytes += skb->len;
 
@@ -1060,9 +1060,9 @@ static QDF_STATUS hdd_mon_rx_packet_cbk(void *context, qdf_nbuf_t rxbuf)
 
 		if (NET_RX_SUCCESS == rxstat)
 			++adapter->
-				hdd_stats.hddTxRxStats.rxDelivered[cpu_index];
+				hdd_stats.tx_rx_stats.rx_delivered[cpu_index];
 		else
-			++adapter->hdd_stats.hddTxRxStats.rxRefused[cpu_index];
+			++adapter->hdd_stats.tx_rx_stats.rx_refused[cpu_index];
 
 		skb = skb_next;
 	}
@@ -1257,8 +1257,8 @@ QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 			cfg80211_is_gratuitous_arp_unsolicited_na(skb)) {
 			uint32_t rx_dropped;
 
-			rx_dropped = ++adapter->hdd_stats.hddTxRxStats.
-							rxDropped[cpu_index];
+			rx_dropped = ++adapter->hdd_stats.tx_rx_stats.
+							rx_dropped[cpu_index];
 			/* rate limit error messages to 1/8th */
 			if ((rx_dropped & 0x07) == 0)
 				QDF_TRACE(QDF_MODULE_ID_HDD_DATA,
@@ -1305,14 +1305,14 @@ QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 
 		skb->dev = adapter->dev;
 		skb->protocol = eth_type_trans(skb, skb->dev);
-		++adapter->hdd_stats.hddTxRxStats.rxPackets[cpu_index];
+		++adapter->hdd_stats.tx_rx_stats.rx_packets[cpu_index];
 		++adapter->stats.rx_packets;
 		adapter->stats.rx_bytes += skb->len;
 
 		/* Check & drop replayed mcast packets (for IPV6) */
 		if (hdd_ctx->config->multicast_replay_filter &&
 				hdd_is_mcast_replay(skb)) {
-			++adapter->hdd_stats.hddTxRxStats.rxDropped[cpu_index];
+			++adapter->hdd_stats.tx_rx_stats.rx_dropped[cpu_index];
 			QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG,
 				"%s: Dropping multicast replay pkt", __func__);
 			qdf_nbuf_free(skb);
@@ -1350,14 +1350,14 @@ QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf)
 				rxstat = netif_rx_ni(skb);
 
 			if (NET_RX_SUCCESS == rxstat)
-				++adapter->hdd_stats.hddTxRxStats.
-					 rxDelivered[cpu_index];
+				++adapter->hdd_stats.tx_rx_stats.
+					 rx_delivered[cpu_index];
 			else
-				++adapter->hdd_stats.hddTxRxStats.
-					 rxRefused[cpu_index];
+				++adapter->hdd_stats.tx_rx_stats.
+					 rx_refused[cpu_index];
 		} else {
-			++adapter->hdd_stats.hddTxRxStats.
-				 rxDelivered[cpu_index];
+			++adapter->hdd_stats.tx_rx_stats.
+				 rx_delivered[cpu_index];
 		}
 	}
 

core/hdd/src/wlan_hdd_wext.c

@@ -3053,17 +3053,17 @@ int hdd_check_private_wext_control(struct hdd_context *hdd_ctx,
 void hdd_wlan_get_stats(struct hdd_adapter *adapter, uint16_t *length,
 			char *buffer, uint16_t buf_len)
 {
-	struct hdd_tx_rx_stats *pStats = &adapter->hdd_stats.hddTxRxStats;
+	struct hdd_tx_rx_stats *stats = &adapter->hdd_stats.tx_rx_stats;
 	uint32_t len = 0;
 	uint32_t total_rx_pkt = 0, total_rx_dropped = 0;
 	uint32_t total_rx_delv = 0, total_rx_refused = 0;
 	int i = 0;
 
 	for (; i < NUM_CPUS; i++) {
-		total_rx_pkt += pStats->rxPackets[i];
-		total_rx_dropped += pStats->rxDropped[i];
-		total_rx_delv += pStats->rxDelivered[i];
-		total_rx_refused += pStats->rxRefused[i];
+		total_rx_pkt += stats->rx_packets[i];
+		total_rx_dropped += stats->rx_dropped[i];
+		total_rx_delv += stats->rx_delivered[i];
+		total_rx_refused += stats->rx_refused[i];
 	}
 
 	len = scnprintf(buffer, buf_len,
@@ -3075,31 +3075,31 @@ void hdd_wlan_get_stats(struct hdd_adapter *adapter, uint16_t *length,
 		"packets %u, dropped %u, delivered %u, refused %u"
 		"\n",
 		qdf_system_ticks(),
-		pStats->txXmitCalled,
-		pStats->txXmitDropped,
-		pStats->txXmitOrphaned,
-
-		pStats->txXmitDroppedAC[SME_AC_BK],
-		pStats->txXmitDroppedAC[SME_AC_BE],
-		pStats->txXmitDroppedAC[SME_AC_VI],
-		pStats->txXmitDroppedAC[SME_AC_VO],
-
-		pStats->txXmitClassifiedAC[SME_AC_BK],
-		pStats->txXmitClassifiedAC[SME_AC_BE],
-		pStats->txXmitClassifiedAC[SME_AC_VI],
-		pStats->txXmitClassifiedAC[SME_AC_VO],
+		stats->tx_called,
+		stats->tx_dropped,
+		stats->tx_orphaned,
+
+		stats->tx_dropped_ac[SME_AC_BK],
+		stats->tx_dropped_ac[SME_AC_BE],
+		stats->tx_dropped_ac[SME_AC_VI],
+		stats->tx_dropped_ac[SME_AC_VO],
+
+		stats->tx_classified_ac[SME_AC_BK],
+		stats->tx_classified_ac[SME_AC_BE],
+		stats->tx_classified_ac[SME_AC_VI],
+		stats->tx_classified_ac[SME_AC_VO],
 		qdf_system_ticks(),
 		total_rx_pkt, total_rx_dropped, total_rx_delv, total_rx_refused
 		);
 
 	for (i = 0; i < NUM_CPUS; i++) {
-		if (pStats->rxPackets[i] == 0)
+		if (stats->rx_packets[i] == 0)
 			continue;
 		len += scnprintf(buffer + len, buf_len - len,
 			"Rx CPU[%d]:"
 			"packets %u, dropped %u, delivered %u, refused %u\n",
-			i, pStats->rxPackets[i], pStats->rxDropped[i],
-			pStats->rxDelivered[i], pStats->rxRefused[i]);
+			i, stats->rx_packets[i], stats->rx_dropped[i],
+			stats->rx_delivered[i], stats->rx_refused[i]);
 	}
 
 	len += scnprintf(buffer + len, buf_len - len,
@@ -3107,10 +3107,10 @@ void hdd_wlan_get_stats(struct hdd_adapter *adapter, uint16_t *length,
 		"\nCurrent status: %s"
 		"\ntx-flow timer start count %u"
 		"\npause count %u, unpause count %u",
-		(pStats->is_txflow_paused == true ? "PAUSED" : "UNPAUSED"),
-		pStats->txflow_timer_cnt,
-		pStats->txflow_pause_cnt,
-		pStats->txflow_unpause_cnt);
+		(stats->is_txflow_paused == true ? "PAUSED" : "UNPAUSED"),
+		stats->txflow_timer_cnt,
+		stats->txflow_pause_cnt,
+		stats->txflow_unpause_cnt);
 
 	len += cdp_stats(cds_get_context(QDF_MODULE_ID_SOC),
 		adapter->sessionId, &buffer[len], (buf_len - len));

core/hdd/src/wlan_hdd_wmm.c

@@ -340,7 +340,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data)
 
 	/* Get the Tx stats for this AC. */
 	currentTrafficCnt =
-		adapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext->
+		adapter->hdd_stats.tx_rx_stats.tx_classified_ac[pQosContext->
 								    acType];
 
 	hdd_warn("WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d",
@@ -418,7 +418,7 @@ hdd_wmm_enable_inactivity_timer(struct hdd_wmm_qos_context *pQosContext,
 	pAc->wmmInactivityTime = inactivityTime;
 	/* Initialize the current tx traffic count on this AC */
 	pAc->wmmPrevTrafficCnt =
-		adapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext->
+		adapter->hdd_stats.tx_rx_stats.tx_classified_ac[pQosContext->
 								    acType];
 	pQosContext->is_inactivity_timer_running = true;
 	return qdf_status;