diff --git a/dp/wifi3.0/dp_tx_capture.c b/dp/wifi3.0/dp_tx_capture.c
index 0c359ac..a04dda7 100644
--- a/dp/wifi3.0/dp_tx_capture.c
+++ b/dp/wifi3.0/dp_tx_capture.c
@@ -2370,7 +2370,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;
@@ -2389,6 +2388,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;
@@ -3538,7 +3538,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);
 
diff --git a/tools/linux/cfg80211_ven_cmd.h b/tools/linux/cfg80211_ven_cmd.h
index e320f85..cd07fe3 100644
--- a/tools/linux/cfg80211_ven_cmd.h
+++ b/tools/linux/cfg80211_ven_cmd.h
@@ -1123,8 +1123,6 @@
 	OL_ATH_PARAM_ACS_NEAR_RANGE_WEIGHTAGE = 413,
 	OL_ATH_PARAM_ACS_MID_RANGE_WEIGHTAGE = 414,
 	OL_ATH_PARAM_ACS_FAR_RANGE_WEIGHTAGE = 415,
-	/* Set SELF AP OBSS_PD_THRESHOLD value */
-	OL_ATH_PARAM_SET_CMD_OBSS_PD_THRESHOLD = 416,
 	/* Enable/Disable/Set MGMT_TTL in milliseconds. */
 	OL_ATH_PARAM_MGMT_TTL = 417,
 	/* Enable/Disable/Set PROBE_RESP_TTL in milliseconds */
@@ -1133,8 +1131,6 @@
 	OL_ATH_PARAM_MU_PPDU_DURATION = 419,
 	/* Set TBTT_CTRL_CFG */
 	OL_ATH_PARAM_TBTT_CTRL = 420,
-	/* Enable/disable AP OBSS_PD_THRESHOLD */
-	OL_ATH_PARAM_SET_CMD_OBSS_PD_THRESHOLD_ENABLE = 421,
 	/* Get baseline radio level channel width */
 	OL_ATH_PARAM_RCHWIDTH = 422,
 	/* Whether external ACS request is in progress */
@@ -2928,10 +2924,6 @@
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_ACS_FAR_RANGE_WEIGHTAGE, SET_PARAM, 1},
 	{"get_acs_far_range_weightage",
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_ACS_FAR_RANGE_WEIGHTAGE, GET_PARAM, 0},
-	{"set_self_obss_pd_tx_threshold",
-		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_SET_CMD_OBSS_PD_THRESHOLD, SET_PARAM, 1},
-	{"get_self_obss_pd_tx_threshold",
-		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_SET_CMD_OBSS_PD_THRESHOLD, GET_PARAM, 0},
 	{"set_mgmt_ttl",
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_MGMT_TTL, SET_PARAM, 1},
 	{"get_mgmt_ttl",
@@ -2948,12 +2940,6 @@
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_TBTT_CTRL, SET_PARAM, 1},
 	{"get_tbtt_ctrl",
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_TBTT_CTRL, GET_PARAM, 0},
-	{"self_obss_pd_tx_enable",
-		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_SET_CMD_OBSS_PD_THRESHOLD_ENABLE,
-		SET_PARAM, 1},
-	{"get_self_obss_pd_tx_enable",
-		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_SET_CMD_OBSS_PD_THRESHOLD_ENABLE,
-		GET_PARAM, 0},
 	{"get_rchwidth",
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_RCHWIDTH, GET_PARAM, 0},
 	{"hw_mode",
diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c
index d85ac8d..ad56192 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -7909,15 +7909,16 @@
 	wmi_pdev_nfcal_power_all_channels_event *event =
 	    (wmi_pdev_nfcal_power_all_channels_event *)evt_buf;
 
-	if ((sizeof(event->nfdBr) == sizeof(param->nfdbr)) &&
-	    (sizeof(event->nfdBm) == sizeof(param->nfdbm)) &&
-	    (sizeof(event->freqNum) == sizeof(param->freqnum))) {
-		qdf_mem_copy(param->nfdbr, event->nfdBr, sizeof(param->nfdbr));
-		qdf_mem_copy(param->nfdbm, event->nfdBm, sizeof(param->nfdbm));
+	if ((sizeof(event->nfdBr) <= sizeof(param->nfdbr)) &&
+	    (sizeof(event->nfdBm) <= sizeof(param->nfdbm)) &&
+	    (sizeof(event->freqNum) <= sizeof(param->freqnum))) {
+		qdf_mem_copy(param->nfdbr, event->nfdBr, sizeof(event->nfdBr));
+		qdf_mem_copy(param->nfdbm, event->nfdBm, sizeof(event->nfdBm));
 		qdf_mem_copy(param->freqnum, event->freqNum,
-			     sizeof(param->freqnum));
+			     sizeof(event->freqNum));
 	} else {
-		WMI_LOGE("%s: %d Failed copy out of bound memory!\n", __func__, __LINE__);
+		WMI_LOGE("%s: %d Failed copy out of bound memory!\n", __func__,
+			 __LINE__);
 		return QDF_STATUS_E_RESOURCES;
 	}