Merge "qca-wifi: Check for initialized tid"
diff --git a/dp/wifi3.0/dp_tx_capture.c b/dp/wifi3.0/dp_tx_capture.c
index d6fa75f..edf7dbf 100644
--- a/dp/wifi3.0/dp_tx_capture.c
+++ b/dp/wifi3.0/dp_tx_capture.c
@@ -4519,7 +4519,9 @@
 	if (!peer)
 		return;
 
-	dp_peer_tx_cap_tid_queue_flush_tlv(pdev, peer, ppdu_desc, usr_idx);
+	if (peer->tx_capture.is_tid_initialized) {
+		dp_peer_tx_cap_tid_queue_flush_tlv(pdev, peer, ppdu_desc, usr_idx);
+	}
 
 	dp_peer_unref_delete(peer, DP_MOD_ID_TX_CAPTURE);
 	return;
@@ -4883,6 +4885,12 @@
 				dp_ppdu_desc_free(ptr_nbuf_list, usr_idx);
 				continue;
 			}
+
+			if (!peer->tx_capture.is_tid_initialized) {
+				dp_ppdu_desc_free(ptr_nbuf_list, usr_idx);
+				continue;
+			}
+
 			tx_tid = &peer->tx_capture.tx_tid[cur_user->tid];
 			qdf_nbuf_queue_init(&head_ppdu);
 			dp_tx_mon_proc_pending_ppdus(pdev, tx_tid,