瀏覽代碼

Merge "qca-wifi: Add support for OFDMA UL per user info"

Linux Build Service Account 6 年之前
父節點
當前提交
603df432f8
共有 2 個文件被更改,包括 14 次插入2 次删除
  1. 3 0
      dp/inc/cdp_txrx_extd_struct.h
  2. 11 2
      dp/wifi3.0/dp_rx_mon_feature.c

+ 3 - 0
dp/inc/cdp_txrx_extd_struct.h

@@ -40,6 +40,9 @@
  *       <enum 1 bw_40_MHz>
  *       <enum 1 bw_40_MHz>
  *       <enum 2 bw_80_MHz>
  *       <enum 2 bw_80_MHz>
  *       <enum 3 bw_160_MHz>
  *       <enum 3 bw_160_MHz>
+ * @ofdma_info_valid: RU info valid
+ * @ofdma_ru_start_index: RU index number(0-73)
+ * @ofdma_ru_width: size of RU in units of 1(26tone)RU
  * @nss: NSS 1,2, ...8
  * @nss: NSS 1,2, ...8
  * @mcs: MCS index
  * @mcs: MCS index
  * @preamble: preamble
  * @preamble: preamble

+ 11 - 2
dp/wifi3.0/dp_rx_mon_feature.c

@@ -74,6 +74,7 @@ dp_rx_populate_cdp_indication_mpdu_info(
 	uint32_t user)
 	uint32_t user)
 {
 {
 	int i;
 	int i;
+	struct mon_rx_user_status *rx_user_status;
 
 
 	cdp_mpdu_info->ppdu_id = ppdu_info->com_info.ppdu_id;
 	cdp_mpdu_info->ppdu_id = ppdu_info->com_info.ppdu_id;
 	cdp_mpdu_info->channel = ppdu_info->rx_status.chan_num;
 	cdp_mpdu_info->channel = ppdu_info->rx_status.chan_num;
@@ -92,8 +93,16 @@ dp_rx_populate_cdp_indication_mpdu_info(
 	cdp_mpdu_info->nf = ppdu_info->rx_status.chan_noise_floor;
 	cdp_mpdu_info->nf = ppdu_info->rx_status.chan_noise_floor;
 
 
 	if (ppdu_info->rx_status.reception_type == HAL_RX_TYPE_MU_OFDMA) {
 	if (ppdu_info->rx_status.reception_type == HAL_RX_TYPE_MU_OFDMA) {
-		cdp_mpdu_info->nss = ppdu_info->rx_user_status[user].nss;
-		cdp_mpdu_info->mcs = ppdu_info->rx_user_status[user].mcs;
+		rx_user_status =  &ppdu_info->rx_user_status[user];
+		cdp_mpdu_info->nss = rx_user_status->nss;
+		cdp_mpdu_info->mcs = rx_user_status->mcs;
+		cdp_mpdu_info->ofdma_info_valid =
+				rx_user_status->ofdma_info_valid;
+		cdp_mpdu_info->ofdma_ru_start_index =
+				rx_user_status->dl_ofdma_ru_start_index;
+		cdp_mpdu_info->ofdma_ru_width =
+				rx_user_status->dl_ofdma_ru_width;
+
 	} else {
 	} else {
 		cdp_mpdu_info->nss = ppdu_info->rx_status.nss;
 		cdp_mpdu_info->nss = ppdu_info->rx_status.nss;
 		cdp_mpdu_info->mcs = ppdu_info->rx_status.mcs;
 		cdp_mpdu_info->mcs = ppdu_info->rx_status.mcs;