commit bf2e62ef66045e0204a34cc70a3ee413c24b7a9a
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 24 10:39:13 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 24 10:39:13 2020 -0700
tree 7473cce7b5267fa12b5d3f015138a3be67230561
parent 27e9d5b07709d42922c0782ceb6efe24d0c25c36
parent cf3fa7f0ea231c0c51f92934427d056756a3b861

Merge "qca-wifi: Add ATF stats enable command"

dp/wifi3.0/dp_tx_capture.c

diff --git a/dp/wifi3.0/dp_tx_capture.c b/dp/wifi3.0/dp_tx_capture.c
index a879293..b36ffc2 100644
--- a/dp/wifi3.0/dp_tx_capture.c
+++ b/dp/wifi3.0/dp_tx_capture.c
@@ -3643,7 +3643,8 @@
 			dp_tx_cap_peer_unref_del(peer);
 		if (!(type == IEEE80211_FC0_TYPE_MGT &&
 		    (subtype == MGMT_SUBTYPE_PROBE_RESP >> 4 ||
-		     subtype == MGMT_SUBTYPE_DISASSOC >> 4))) {
+		     subtype == MGMT_SUBTYPE_DISASSOC >> 4 ||
+		     subtype == MGMT_SUBTYPE_DEAUTH >> 4))) {
 			if (!dp_peer_or_pdev_tx_cap_enabled(pdev, NULL,
 							    ppdu_desc->user[0]
 							    .mac_addr)) {
@@ -3831,7 +3832,8 @@
 
 			if (type == IEEE80211_FC0_TYPE_MGT &&
 			    (subtype == MGMT_SUBTYPE_PROBE_RESP >> 4 ||
-			     subtype == MGMT_SUBTYPE_DISASSOC >> 4)) {
+			     subtype == MGMT_SUBTYPE_DISASSOC >> 4 ||
+			     subtype == MGMT_SUBTYPE_DEAUTH >> 4)) {
 				if (!dp_peer_or_pdev_tx_cap_enabled(pdev,
 								    NULL,
 								    wh->i_addr1

umac/dfs/core/src/misc/dfs_zero_cac.c

diff --git a/umac/dfs/core/src/misc/dfs_zero_cac.c b/umac/dfs/core/src/misc/dfs_zero_cac.c
index 1bd7ce3..939c7cb 100644
--- a/umac/dfs/core/src/misc/dfs_zero_cac.c
+++ b/umac/dfs/core/src/misc/dfs_zero_cac.c
@@ -4178,6 +4178,7 @@
 	struct dfs_soc_priv_obj *dfs_soc_obj;
 
 	dfs_soc_obj = dfs->dfs_soc_obj;
+	dfs_soc_obj->cur_precac_dfs_index = dfs->dfs_psoc_idx;
 	dfs = dfs_soc_obj->dfs_priv[dfs_soc_obj->cur_precac_dfs_index].dfs;
 #define EXTRA_TIME_IN_SEC 5
 	dfs_soc_obj->dfs_precac_timer_running = 1;