commit 85651cbf2ac173712783adda51e6246763504644
author Linux Build Service Account <lnxbuild@localhost> Thu May 07 01:40:26 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu May 07 01:40:26 2020 -0700
tree d1f36c0a1be9141187db2b3ced4fa5e43aaa2a36
parent 07548a9f660bbac261d24712377c7c92c3ab6aa8
parent 5ba310df2ad23fd9b8799e982b6dfdab69827b90

Merge "qca-wifi: set frame control for BRP frame"

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 41a068d..60cfe91 100644
--- a/dp/wifi3.0/dp_tx_capture.c
+++ b/dp/wifi3.0/dp_tx_capture.c
@@ -2420,7 +2420,6 @@
 					 IEEE80211_FC0_TYPE_CTL);
 	break;
 	case HTT_STATS_FTYPE_SGEN_BRP:
-	case HTT_STATS_FTYPE_SGEN_MU_BRP:
 		ppdu_desc->frame_ctrl = (IEEE80211_FC0_SUBTYPE_BRPOLL |
 					 IEEE80211_FC0_TYPE_CTL);
 	break;
@@ -2439,6 +2438,7 @@
 	break;
 	case HTT_STATS_FTYPE_SGEN_MU_TRIG:
 	case HTT_STATS_FTYPE_SGEN_MU_BAR:
+	case HTT_STATS_FTYPE_SGEN_MU_BRP:
 		ppdu_desc->frame_ctrl = (IEEE80211_FC0_SUBTYPE_TRIGGER |
 					 IEEE80211_FC0_TYPE_CTL);
 	break;
@@ -3588,7 +3588,8 @@
 	user = &ppdu_desc->user[0];
 
 	ppdu_desc_frame_ctrl = ppdu_desc->frame_ctrl;
-	if (ppdu_desc->htt_frame_type == HTT_STATS_FTYPE_SGEN_MU_BAR)
+	if ((ppdu_desc->htt_frame_type == HTT_STATS_FTYPE_SGEN_MU_BAR) ||
+	    (ppdu_desc->htt_frame_type == HTT_STATS_FTYPE_SGEN_MU_BRP))
 		ppdu_desc_frame_ctrl = (IEEE80211_FC0_SUBTYPE_TRIGGER |
 					IEEE80211_FC0_TYPE_CTL);