Explorar o código

qcacmn: Remove redundant field for rxmon global enable

Remove redundant field for rxmon global enable
and fix writing global enable field to correct
dword

Change-Id: I4efc0da559dce873bcb8721aeb0d7b7410b39dd9
CRs-Fixed: 3150784
Naga %!s(int64=3) %!d(string=hai) anos
pai
achega
9ad28af16e
Modificáronse 3 ficheiros con 2 adicións e 8 borrados
  1. 2 3
      dp/wifi3.0/dp_htt.c
  2. 0 1
      dp/wifi3.0/dp_htt.h
  3. 0 4
      dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c

+ 2 - 3
dp/wifi3.0/dp_htt.c

@@ -1040,8 +1040,8 @@ int htt_h2t_rx_ring_cfg(struct htt_soc *htt_soc, int pdev_id,
 	*msg_word = 0;
 	HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG);
 
-	if (htt_tlv_filter->rx_mon_global_en)
-		*msg_word  |= (1 << RXMON_GLOBAL_EN_SHIFT);
+	/* applicable only for post Li */
+	dp_rx_mon_enable(soc->dp_soc, msg_word, htt_tlv_filter);
 
 	/*
 	 * pdev_id is indexed from 0 whereas mac_id is indexed from 1
@@ -1080,7 +1080,6 @@ int htt_h2t_rx_ring_cfg(struct htt_soc *htt_soc, int pdev_id,
 		ring_buf_size);
 
 	dp_mon_rx_packet_length_set(soc->dp_soc, msg_word, htt_tlv_filter);
-	dp_rx_mon_enable(soc->dp_soc, msg_word, htt_tlv_filter);
 
 	/* word 2 */
 	msg_word++;

+ 0 - 1
dp/wifi3.0/dp_htt.h

@@ -673,7 +673,6 @@ struct htt_rx_ring_tlv_filter {
 		 data_mpdu_log:1,
 		 enable:1;
 #endif
-	uint8_t rx_mon_global_en;
 };
 
 /**

+ 0 - 4
dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c

@@ -1222,7 +1222,6 @@ void dp_mon_filter_setup_rx_mon_mode_2_0(struct dp_pdev *pdev)
 
 	rx_tlv_filter = &filter.rx_tlv_filter;
 	rx_tlv_filter->valid = true;
-	rx_tlv_filter->tlv_filter.rx_mon_global_en = 1;
 
 	dp_mon_filter_set_status_cmn(mon_pdev, rx_tlv_filter);
 	dp_mon_filter_show_filter(mon_pdev, mode, rx_tlv_filter);
@@ -1542,7 +1541,6 @@ void dp_mon_filter_setup_rx_pkt_log_full_2_0(struct dp_pdev *pdev)
 
 	/* Enabled the filter */
 	filter.rx_tlv_filter.valid = true;
-	rx_tlv_filter->rx_mon_global_en = 1;
 	dp_mon_filter_set_status_cmn(&mon_pdev_be->mon_pdev,
 				     &filter.rx_tlv_filter);
 
@@ -1593,7 +1591,6 @@ void dp_mon_filter_setup_rx_pkt_log_lite_2_0(struct dp_pdev *pdev)
 
 	/* Enabled the filter */
 	filter.rx_tlv_filter.valid = true;
-	filter.rx_tlv_filter.tlv_filter.rx_mon_global_en = 1;
 	dp_mon_filter_set_status_cmn(&mon_pdev_be->mon_pdev,
 				     &filter.rx_tlv_filter);
 
@@ -1824,7 +1821,6 @@ dp_rx_mon_filter_h2t_setup(struct dp_soc *soc, struct dp_pdev *pdev,
 			continue;
 
 		filter->valid = true;
-		tlv_filter->rx_mon_global_en = 1;
 
 		/*
 		 * Set the super bit fields