From 480a304199e499db028c28524fb4bf8467f89d5e Mon Sep 17 00:00:00 2001
From: Wu Gao <wugao@codeaurora.org>
Date: Fri, 15 Nov 2019 11:12:13 +0800
Subject: [PATCH] qcacld-3.0: Cleanup tx context if cancel mgmt tx

It doesn't cleanup tx context immediately, which cause mgmt will be
tx again unexpectly. Then P2P state mismached and form connection
failed.

Change-Id: I9eba9df057221e5dabf5ff42fe0d2fd695aea9df
CRs-Fixed: 2564622
---
 components/p2p/core/src/wlan_p2p_off_chan_tx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/p2p/core/src/wlan_p2p_off_chan_tx.c b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
index 014d31691480..7dbb2f8c4ffb 100644
--- a/components/p2p/core/src/wlan_p2p_off_chan_tx.c
+++ b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
@@ -607,6 +607,7 @@ static QDF_STATUS p2p_populate_mac_header(
 	seq_ctl->seq_num_lo = (seq_num & WLAN_LOW_SEQ_NUM_MASK);
 	seq_ctl->seq_num_hi = ((seq_num & WLAN_HIGH_SEQ_NUM_MASK) >>
 				WLAN_HIGH_SEQ_NUM_OFFSET);
+	p2p_debug("seq num: %d", seq_num);
 
 	wlan_objmgr_peer_release_ref(peer, WLAN_P2P_ID);
 
@@ -2918,6 +2919,7 @@ QDF_STATUS p2p_process_mgmt_tx_cancel(
 					cancel_tx->p2p_soc_obj;
 			cancel_roc.cookie =
 					cur_tx_ctx->roc_cookie;
+			p2p_remove_tx_context(cur_tx_ctx);
 			return p2p_process_cancel_roc_req(&cancel_roc);
 		}
 		if (is_ack_q) {