Revert "qcacld-3.0: Add check for data tx rx based on vendor command" (9ecfaffa) · Commits · e / devices / android_kernel_fairphone_FP5

components/pkt_capture/core/src/wlan_pkt_capture_main.c

+9 −31

Original line number	Diff line number	Diff line
		@@ -257,23 +257,6 @@ void pkt_capture_callback(void soc, enum WDI_EVENT event, void log_data,
		uint8_t bssid[QDF_MAC_ADDR_SIZE];
		uint8_t tid = 0;
		struct dp_soc *psoc = soc;
		struct wlan_objmgr_vdev *vdev;
		struct wlan_objmgr_psoc *obj_mgr_psoc;
		struct pkt_psoc_priv *psoc_priv;
		struct pkt_capture_frame_filter *frame_filter;

		vdev = pkt_capture_get_vdev();
		if (!vdev)
		return;

		obj_mgr_psoc = wlan_vdev_get_psoc(vdev);
		psoc_priv = pkt_capture_psoc_get_priv(obj_mgr_psoc);
		if (!psoc_priv) {
		pkt_capture_err("psoc_priv is NULL");
		return;
		}

		frame_filter = &psoc_priv->frame_filter;

		switch (event) {
		case WDI_EVENT_PKT_CAPTURE_TX_DATA:
		@@ -291,9 +274,10 @@ void pkt_capture_callback(void soc, enum WDI_EVENT event, void log_data,

		hal_tx_comp_get_status(&desc->comp, &tx_comp_status,
		psoc->hal_soc);

		if (!frame_filter->data_tx_frame_filter)
		if (!(pkt_capture_get_pktcap_mode_v2() &
		PKT_CAPTURE_MODE_DATA_ONLY)) {
		return;
		}

		if (tx_comp_status.valid)
		pktcapture_hdr.ppdu_id = tx_comp_status.ppdu_id;
		@@ -413,17 +397,9 @@ void pkt_capture_callback(void soc, enum WDI_EVENT event, void log_data,

		case WDI_EVENT_PKT_CAPTURE_RX_DATA:
		{
		qdf_nbuf_t nbuf = (qdf_nbuf_t)log_data;

		if (!frame_filter->data_rx_frame_filter) {
		/*
		* Rx offload packets are delivered only to pkt capture
		* component and not to stack so free them.
		*/
		if (status == RX_OFFLOAD_PKT)
		qdf_nbuf_free(nbuf);
		if (!(pkt_capture_get_pktcap_mode_v2() &
		PKT_CAPTURE_MODE_DATA_ONLY))
		return;
		}

		pkt_capture_msdu_process_pkts(bssid, log_data, vdev_id, soc,
		status);
		@@ -434,7 +410,8 @@ void pkt_capture_callback(void soc, enum WDI_EVENT event, void log_data,
		{
		qdf_nbuf_t nbuf = (qdf_nbuf_t)log_data;

		if (!frame_filter->data_rx_frame_filter) {
		if (!(pkt_capture_get_pktcap_mode_v2() &
		PKT_CAPTURE_MODE_DATA_ONLY)) {
		/*
		* Rx offload packets are delivered only to pkt capture
		* component and not to stack so free them
		@@ -455,7 +432,8 @@ void pkt_capture_callback(void soc, enum WDI_EVENT event, void log_data,
		bool is_pkt_during_roam = false;
		uint32_t freq = 0;

		if (!frame_filter->data_tx_frame_filter)
		if (!(pkt_capture_get_pktcap_mode_v2() &
		PKT_CAPTURE_MODE_DATA_ONLY))
		return;

		offload_deliver_msg =