diff --git a/dp/inc/cdp_txrx_cmn.h b/dp/inc/cdp_txrx_cmn.h
index 95aa5416d493..ee23b5855f21 100644
--- a/dp/inc/cdp_txrx_cmn.h
+++ b/dp/inc/cdp_txrx_cmn.h
@@ -231,9 +231,8 @@ cdp_mgmt_send_ext(ol_txrx_soc_handle soc, struct cdp_vdev *vdev,
 
 static inline void
 cdp_mgmt_tx_cb_set(ol_txrx_soc_handle soc, struct cdp_pdev *pdev,
-			 uint8_t type,
-			 ol_txrx_mgmt_tx_cb download_cb,
-			 ol_txrx_mgmt_tx_cb ota_ack_cb, void *ctxt)
+		   uint8_t type, ol_txrx_mgmt_tx_cb download_cb,
+		   ol_txrx_mgmt_tx_cb ota_ack_cb, void *ctxt)
 {
 	if (soc->ops->cmn_drv_ops->txrx_mgmt_tx_cb_set)
 		return soc->ops->cmn_drv_ops->txrx_mgmt_tx_cb_set
diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h
index c24719ef9444..ad9b5eacac35 100644
--- a/dp/inc/cdp_txrx_ops.h
+++ b/dp/inc/cdp_txrx_ops.h
@@ -104,10 +104,10 @@ struct cdp_cmn_ops {
 	 * callback function
 	 */
 
-	void (*txrx_mgmt_tx_cb_set)
-		(struct cdp_pdev *pdev, uint8_t type,
-		 ol_txrx_mgmt_tx_cb download_cb, ol_txrx_mgmt_tx_cb ota_ack_cb,
-		 void *ctxt);
+	void (*txrx_mgmt_tx_cb_set)(struct cdp_pdev *pdev, uint8_t type,
+				    ol_txrx_mgmt_tx_cb download_cb,
+				    ol_txrx_mgmt_tx_cb ota_ack_cb,
+				    void *ctxt);
 
 	int (*txrx_get_tx_pending)(struct cdp_pdev *pdev);
 
diff --git a/qdf/linux/src/i_qdf_nbuf.h b/qdf/linux/src/i_qdf_nbuf.h
index bb0803d5d8a6..c7c1007cc5e2 100644
--- a/qdf/linux/src/i_qdf_nbuf.h
+++ b/qdf/linux/src/i_qdf_nbuf.h
@@ -129,6 +129,7 @@ typedef union {
  * @tx.ipa.owned   : packet owned by IPA
  * @tx.ipa.priv    : private data, used by IPA
  * @tx.desc_id     : tx desc id, used to sync between host and fw
+ * @tx.mgmt_desc_id     : used to get mgmt descriptor for tx completion cb
  */
 struct qdf_nbuf_cb {
 	/* common */
@@ -232,6 +233,7 @@ struct qdf_nbuf_cb {
 							priv:31;
 					} ipa;
 					uint16_t desc_id;
+					uint16_t mgmt_desc_id;
 				} mcl;
 			} dev;
 		} tx;
@@ -373,6 +375,10 @@ QDF_COMPILE_TIME_ASSERT(qdf_nbuf_cb_size,
 
 #define QDF_NBUF_CB_TX_DESC_ID(skb) \
 	(((struct qdf_nbuf_cb *)((skb)->cb))->u.tx.dev.mcl.desc_id)
+
+#define QDF_NBUF_CB_MGMT_TXRX_DESC_ID(skb) \
+	(((struct qdf_nbuf_cb *)((skb)->cb))->u.tx.dev.mcl.mgmt_desc_id)
+
 #define QDF_NBUF_CB_TX_PACKET_STATE(skb) \
 	(((struct qdf_nbuf_cb *) \
 		((skb)->cb))->u.tx.dev.mcl.trace.packet_state)
diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h
index dad38a3df5eb..dcec05b99107 100644
--- a/wmi/inc/wmi_unified_param.h
+++ b/wmi/inc/wmi_unified_param.h
@@ -1372,10 +1372,13 @@ struct tx_send_params {
  * @chanfreq: channel frequency
  * @pdata: frame data
  * @desc_id: descriptor id relyaed back by target
- * @macaddr - macaddr of peer
+ * @macaddr: macaddr of peer
  * @qdf_ctx: qdf context for qdf_nbuf_map
  * @tx_param: TX send parameters
  * @tx_params_valid: Flag that indicates if TX params are valid
+ * @use_6mbps: specify whether management frame to transmit should
+ *  use 6 Mbps rather than 1 Mbps min rate(for 5GHz band or P2P)
+ * @tx_type: type of managment frame (determines what callback to use)
  */
 struct wmi_mgmt_params {
 	void *tx_frame;
@@ -1388,6 +1391,8 @@ struct wmi_mgmt_params {
 	void *qdf_ctx;
 	struct tx_send_params tx_param;
 	bool tx_params_valid;
+	uint8_t use_6mbps;
+	uint8_t tx_type;
 };
 
 /**