qcacmn: Moved Rx mpdu byte count as they are not supported in HKV1

mpdu byte count is not supported in HKV1.

Change-Id: I23f0608d44958159abffc3b5b3eccde29d9cf07f

hal/wifi3.0/hal_generic_api.h

@@ -262,14 +262,49 @@ hal_rx_handle_ofdma_info(
 			   SW_RESPONSE_REFERENCE_PTR_EXT);
 }
 
+static inline void
+hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo,
+			   struct mon_rx_user_status *mon_rx_user_status)
+{
+	uint32_t mpdu_ok_byte_count;
+	uint32_t mpdu_err_byte_count;
+
+	mpdu_ok_byte_count = HAL_RX_GET(rx_tlv,
+					RX_PPDU_END_USER_STATS_17,
+					MPDU_OK_BYTE_COUNT);
+	mpdu_err_byte_count = HAL_RX_GET(rx_tlv,
+					 RX_PPDU_END_USER_STATS_19,
+					 MPDU_ERR_BYTE_COUNT);
+
+	mon_rx_user_status->mpdu_ok_byte_count = mpdu_ok_byte_count;
+	mon_rx_user_status->mpdu_err_byte_count = mpdu_err_byte_count;
+}
+#else
+static inline void
+hal_rx_handle_ofdma_info(void *rx_tlv,
+			 struct mon_rx_user_status *mon_rx_user_status)
+{
+}
+
+static inline void
+hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo,
+			   struct mon_rx_user_status *mon_rx_user_status)
+{
+	struct hal_rx_ppdu_info *ppdu_info =
+			(struct hal_rx_ppdu_info *)ppduinfo;
+
+	/* HKV1: doesn't support mpdu byte count */
+	mon_rx_user_status->mpdu_ok_byte_count = ppdu_info->rx_status.ppdu_len;
+	mon_rx_user_status->mpdu_err_byte_count = 0;
+}
+#endif
+
 static inline void
 hal_rx_populate_mu_user_info(void *rx_tlv, void *ppduinfo,
 			     struct mon_rx_user_status *mon_rx_user_status)
 {
 	struct hal_rx_ppdu_info *ppdu_info =
 			(struct hal_rx_ppdu_info *)ppduinfo;
-	uint32_t mpdu_ok_byte_count;
-	uint32_t mpdu_err_byte_count;
 
 	mon_rx_user_status->ast_index = ppdu_info->rx_status.ast_index;
 	mon_rx_user_status->tid = ppdu_info->rx_status.tid;
@@ -301,31 +336,10 @@ hal_rx_populate_mu_user_info(void *rx_tlv, void *ppduinfo,
 		     &ppdu_info->com_info.mpdu_fcs_ok_bitmap,
 		     HAL_RX_NUM_WORDS_PER_PPDU_BITMAP *
 		     sizeof(ppdu_info->com_info.mpdu_fcs_ok_bitmap[0]));
-	mpdu_ok_byte_count = HAL_RX_GET(rx_tlv,
-					RX_PPDU_END_USER_STATS_17,
-					MPDU_OK_BYTE_COUNT);
-	mpdu_err_byte_count = HAL_RX_GET(rx_tlv,
-					 RX_PPDU_END_USER_STATS_19,
-					 MPDU_ERR_BYTE_COUNT);
 
-	mon_rx_user_status->mpdu_ok_byte_count = mpdu_ok_byte_count;
-	mon_rx_user_status->mpdu_err_byte_count = mpdu_err_byte_count;
+	hal_rx_populate_byte_count(rx_tlv, ppdu_info, mon_rx_user_status);
 }
 
-#else
-static inline void
-hal_rx_handle_ofdma_info(void *rx_tlv,
-			 struct mon_rx_user_status *mon_rx_user_status)
-{
-}
-
-static inline void
-hal_rx_populate_mu_user_info(void *rx_tlv, void *ppduinfo,
-			     struct mon_rx_user_status *mon_rx_user_status)
-{
-}
-#endif
-
 #define HAL_RX_UPDATE_RSSI_PER_CHAIN_BW(chain, word_1, word_2, \
 					ppdu_info, rssi_info_tlv) \
 	{						\