diff --git a/VERSION.txt b/VERSION.txt
index 3be76e56e577..c759ce1ae864 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,2 +1,2 @@
-Current Component wlan-cmn.driver.lnx.1.0 version 5.1.0.22D
+Current Component wlan-cmn.driver.lnx.1.0 version 5.1.0.22K
 Matches Component wlan-cld3.driver.lnx.1.1 version 5.1.0.22C
diff --git a/dp/inc/cdp_txrx_host_stats.h b/dp/inc/cdp_txrx_host_stats.h
index 3dc738bd92eb..e87ca3b1e074 100644
--- a/dp/inc/cdp_txrx_host_stats.h
+++ b/dp/inc/cdp_txrx_host_stats.h
@@ -38,7 +38,7 @@
 /* Need to rename the function to reflect the functionality "show" / "display"
  * WIN -- to figure out whether to change OSIF to converge (not an immediate AI)
  * */
-#if QCA_OL_11AC_FAST_PATH
+#if WLAN_FEATURE_FASTPATH
 int ol_txrx_host_stats_get(
 	ol_txrx_vdev_handle vdev,
 	struct ol_txrx_stats_req *req);
@@ -82,7 +82,7 @@ ol_txrx_disable_enhanced_stats(ol_txrx_pdev_handle pdev);
 uint32_t *ol_txrx_get_stats_base(ol_txrx_pdev_handle pdev,
 	uint32_t *stats_base, uint32_t msg_len, uint8_t type);
 #endif
-#endif /* QCA_OL_11AC_FAST_PATH*/
+#endif /* WLAN_FEATURE_FASTPATH*/
 #if (HOST_SW_TSO_ENABLE || HOST_SW_TSO_SG_ENABLE)
 void
 ol_tx_print_tso_stats(
@@ -110,15 +110,15 @@ void
 ol_rst_rx_cksum_stats(ol_txrx_vdev_handle vdev);
 #endif /* RX_CHECKSUM_OFFLOAD */
 
-#if (ATH_SUPPORT_IQUE && QCA_OL_11AC_FAST_PATH)
+#if (ATH_SUPPORT_IQUE && WLAN_FEATURE_FASTPATH)
 A_STATUS
 ol_txrx_host_me_stats(ol_txrx_vdev_handle vdev);
-#endif /* QCA_OL_11AC_FAST_PATH */
+#endif /* WLAN_FEATURE_FASTPATH */
 #if PEER_FLOW_CONTROL
 extern void
 ol_txrx_per_peer_stats(struct ol_txrx_pdev_t *pdev, char *addr);
 #endif
-#if QCA_OL_11AC_FAST_PATH && PEER_FLOW_CONTROL
+#if WLAN_FEATURE_FASTPATH && PEER_FLOW_CONTROL
 int ol_txrx_host_msdu_ttl_stats(
 	ol_txrx_vdev_handle vdev,
 	struct ol_txrx_stats_req *req);
diff --git a/hif/inc/hif.h b/hif/inc/hif.h
index b6db21d98fbc..d30de2d75ec4 100644
--- a/hif/inc/hif.h
+++ b/hif/inc/hif.h
@@ -615,6 +615,11 @@ uint32_t hif_set_nss_wifiol_mode(struct hif_opaque_softc *osc,
 int32_t hif_get_nss_wifiol_bypass_nw_process(struct hif_opaque_softc *osc);
 #endif
 
+#ifdef WLAN_SUSPEND_RESUME_TEST
+typedef void (*hdd_fake_resume_callback)(uint32_t val);
+void hif_fake_apps_suspend(hdd_fake_resume_callback callback);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/hif/src/adrastea_reg_def.h b/hif/src/adrastea_reg_def.h
index f50659ca9ba1..a9cd309a3c21 100644
--- a/hif/src/adrastea_reg_def.h
+++ b/hif/src/adrastea_reg_def.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -1413,9 +1413,9 @@
 #define ADRASTEA_SR_BA_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW\
 				- ADRASTEA_CE0_BASE_ADDRESS)
 
-#define ADRASTEA_SR_BA_ADDRESS_HIGH_OFFSET \
-				(ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH \
-				- ADRASTEA_CE0_BASE_ADDRESS)
+#define ADRASTEA_SR_BA_HIGH_OFFSET \
+		(ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH \
+		 - ADRASTEA_CE0_BASE_ADDRESS)
 
 #define ADRASTEA_SR_SIZE_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE \
 					- ADRASTEA_CE0_BASE_ADDRESS)
@@ -1429,8 +1429,9 @@
 #define ADRASTEA_DR_BA_OFFSET       (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW\
 					- ADRASTEA_CE0_BASE_ADDRESS)
 
-#define ADRASTEA_DR_BA_ADDRESS_HIGH_OFFSET  (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH\
-						- ADRASTEA_CE0_BASE_ADDRESS)
+#define ADRASTEA_DR_BA_HIGH_OFFSET  \
+		(ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH\
+		 - ADRASTEA_CE0_BASE_ADDRESS)
 
 #define ADRASTEA_DR_SIZE_OFFSET     (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE\
 					- ADRASTEA_CE0_BASE_ADDRESS)
@@ -2216,10 +2217,12 @@ struct ce_reg_def adrastea_ce_targetdef = {
 	.d_HOST_IE_ADDRESS = ADRASTEA_HOST_IE_OFFSET,
 	.d_HOST_IE_COPY_COMPLETE_MASK = ADRASTEA_HOST_IE_COPY_COMPLETE_MASK,
 	.d_SR_BA_ADDRESS = ADRASTEA_SR_BA_OFFSET,
+	.d_SR_BA_ADDRESS_HIGH = ADRASTEA_SR_BA_HIGH_OFFSET,
 	.d_SR_SIZE_ADDRESS = ADRASTEA_SR_SIZE_OFFSET,
 	.d_CE_CTRL1_ADDRESS = ADRASTEA_CE_CTRL1_OFFSET,
 	.d_CE_CTRL1_DMAX_LENGTH_MASK = ADRASTEA_CE_CTRL1_DMAX_LENGTH_MASK,
 	.d_DR_BA_ADDRESS = ADRASTEA_DR_BA_OFFSET,
+	.d_DR_BA_ADDRESS_HIGH = ADRASTEA_DR_BA_HIGH_OFFSET,
 	.d_DR_SIZE_ADDRESS = ADRASTEA_DR_SIZE_OFFSET,
 	.d_CE_CMD_REGISTER = ADRASTEA_CE_CMD_REGISTER_OFFSET,
 	.d_CE_MSI_ADDRESS = MISSING_FOR_ADRASTEA,
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 60ff55618e98..7fd2b1c0d63a 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -2736,7 +2736,7 @@ int hif_dump_ce_registers(struct hif_softc *scn)
 {
 	struct hif_opaque_softc *hif_hdl = GET_HIF_OPAQUE_HDL(scn);
 	uint32_t ce_reg_address = CE0_BASE_ADDRESS;
-	uint32_t ce_reg_values[CE_COUNT_MAX][CE_USEFUL_SIZE >> 2];
+	uint32_t ce_reg_values[CE_USEFUL_SIZE >> 2];
 	uint32_t ce_reg_word_size = CE_USEFUL_SIZE >> 2;
 	uint16_t i;
 	QDF_STATUS status;
@@ -2748,7 +2748,7 @@ int hif_dump_ce_registers(struct hif_softc *scn)
 		}
 
 		status = hif_diag_read_mem(hif_hdl, ce_reg_address,
-					   (uint8_t *) &ce_reg_values[i][0],
+					   (uint8_t *) &ce_reg_values[0],
 					   ce_reg_word_size * sizeof(uint32_t));
 
 		if (status != QDF_STATUS_SUCCESS) {
@@ -2757,7 +2757,7 @@ int hif_dump_ce_registers(struct hif_softc *scn)
 		}
 		HIF_ERROR("CE%d Registers:", i);
 		qdf_trace_hex_dump(QDF_MODULE_ID_HIF, QDF_TRACE_LEVEL_DEBUG,
-				   (uint8_t *) &ce_reg_values[i][0],
+				   (uint8_t *) &ce_reg_values[0],
 				   ce_reg_word_size * sizeof(uint32_t));
 	}
 	return 0;
diff --git a/hif/src/ce/ce_reg.h b/hif/src/ce/ce_reg.h
index 9651f756d9b9..297e88f7c25b 100644
--- a/hif/src/ce/ce_reg.h
+++ b/hif/src/ce/ce_reg.h
@@ -351,14 +351,14 @@ unsigned int hif_get_dst_ring_read_index(struct hif_softc *scn,
 
 #define CE_SRC_RING_BYTE_SWAP_SET(scn, CE_ctrl_addr, n) \
 	A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_CTRL1_ADDRESS, \
-		       (A_TARGET_READ((targid), \
+		       (A_TARGET_READ(scn, \
 		       (CE_ctrl_addr) + CE_CTRL1_ADDRESS) \
 		       & ~CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK) | \
 		       CE_CTRL1_SRC_RING_BYTE_SWAP_EN_SET(n))
 
 #define CE_DEST_RING_BYTE_SWAP_SET(scn, CE_ctrl_addr, n) \
 	A_TARGET_WRITE(scn, (CE_ctrl_addr)+CE_CTRL1_ADDRESS, \
-		       (A_TARGET_READ((targid), \
+		       (A_TARGET_READ(scn, \
 		       (CE_ctrl_addr) + CE_CTRL1_ADDRESS) \
 		       & ~CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK) | \
 		       CE_CTRL1_DST_RING_BYTE_SWAP_EN_SET(n))
diff --git a/hif/src/ce/ce_tasklet.c b/hif/src/ce/ce_tasklet.c
index f393f3f7dae6..27bfba18b3ab 100644
--- a/hif/src/ce/ce_tasklet.c
+++ b/hif/src/ce/ce_tasklet.c
@@ -243,6 +243,61 @@ void ce_tasklet_kill(struct hif_softc *scn)
 	qdf_atomic_set(&scn->active_tasklet_cnt, 0);
 }
 
+#ifdef WLAN_SUSPEND_RESUME_TEST
+static bool g_hif_apps_fake_suspended;
+static hdd_fake_resume_callback hdd_fake_aps_resume;
+
+static void hif_wlan_resume_work_handler(struct work_struct *work)
+{
+	hdd_fake_aps_resume(0);
+}
+
+static DECLARE_WORK(hif_resume_work, hif_wlan_resume_work_handler);
+
+/**
+ * hif_fake_apps_suspend(): Suspend WLAN
+ *
+ * Set the fake suspend flag such that hif knows that it will need
+ * to fake the aps resume process using the hdd_fake_aps_resume
+ *
+ * Return: none
+ */
+void hif_fake_apps_suspend(hdd_fake_resume_callback callback)
+{
+	hdd_fake_aps_resume = callback;
+	g_hif_apps_fake_suspended = true;
+}
+
+/**
+ * hif_fake_aps_resume(): check if WLAN resume is needed
+ *
+ * Return: true if a fake apps resume has been been triggered
+ *         returns false if regular interrupt processing is needed
+ */
+static bool hif_fake_aps_resume(void)
+{
+	if (g_hif_apps_fake_suspended) {
+		g_hif_apps_fake_suspended = false;
+		schedule_work(&hif_resume_work);
+		return true;
+	} else {
+		return false;
+	}
+}
+
+#else
+
+/**
+ * hif_fake_aps_resume(): check if WLAN resume is needed
+ *
+ * Return: always false if WLAN_SUSPEND_RESUME_TEST is not defined
+ */
+static bool hif_fake_aps_resume(void)
+{
+	return false;
+}
+#endif /* End of WLAN_SUSPEND_RESUME_TEST */
+
 /**
  * hif_snoc_interrupt_handler() - hif_snoc_interrupt_handler
  * @irq: irq coming from kernel
@@ -341,6 +396,13 @@ irqreturn_t ce_dispatch_interrupt(int ce_id,
 	qdf_atomic_inc(&scn->active_tasklet_cnt);
 	hif_record_ce_desc_event(scn, ce_id, HIF_IRQ_EVENT, NULL, NULL, 0);
 	hif_ce_increment_interrupt_count(hif_ce_state, ce_id);
+
+	if (unlikely(hif_fake_aps_resume())) {
+		HIF_ERROR("received resume interrupt");
+		hif_irq_enable(scn, ce_id);
+		return IRQ_HANDLED;
+	}
+
 	if (hif_napi_enabled(hif_hdl, ce_id))
 		hif_napi_schedule(hif_hdl, ce_id);
 	else
diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c
index 59b919c1ed28..e28dab98b400 100644
--- a/hif/src/pcie/if_pci.c
+++ b/hif/src/pcie/if_pci.c
@@ -2910,16 +2910,17 @@ static void hif_fastpath_resume(struct hif_opaque_softc *hif_ctx)
 		return;
 
 	if (scn->fastpath_mode_on) {
-		if (Q_TARGET_ACCESS_BEGIN(scn)) {
-			ce_state = scn->ce_id_to_state[CE_HTT_H2T_MSG];
-			qdf_spin_lock_bh(&ce_state->ce_index_lock);
+		if (Q_TARGET_ACCESS_BEGIN(scn) < 0)
+			return;
 
-			/*war_ce_src_ring_write_idx_set */
-			CE_SRC_RING_WRITE_IDX_SET(scn, ce_state->ctrl_addr,
-					ce_state->src_ring->write_index);
-			qdf_spin_unlock_bh(&ce_state->ce_index_lock);
-			Q_TARGET_ACCESS_END(scn);
-		}
+		ce_state = scn->ce_id_to_state[CE_HTT_H2T_MSG];
+		qdf_spin_lock_bh(&ce_state->ce_index_lock);
+
+		/*war_ce_src_ring_write_idx_set */
+		CE_SRC_RING_WRITE_IDX_SET(scn, ce_state->ctrl_addr,
+				ce_state->src_ring->write_index);
+		qdf_spin_unlock_bh(&ce_state->ce_index_lock);
+		Q_TARGET_ACCESS_END(scn);
 	}
 }
 #else
diff --git a/hif/src/snoc/if_ahb.c b/hif/src/snoc/if_ahb.c
index 362584ff0aba..dc6077841894 100644
--- a/hif/src/snoc/if_ahb.c
+++ b/hif/src/snoc/if_ahb.c
@@ -298,7 +298,11 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
 		goto err_cleanup1;
 	}
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
+#else
+	ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+#endif
 	if (ret) {
 		HIF_ERROR("%s: failed to set dma mask error = %d",
 				__func__, ret);
@@ -306,7 +310,11 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
 	}
 
 	/* Arrange for access to Target SoC registers. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 	mem = devm_ioremap_resource(&pdev->dev, memres);
+#else
+	mem = devm_request_and_ioremap(&pdev->dev, memres);
+#endif
 	if (IS_ERR(mem)) {
 		HIF_INFO("ath: ioremap error\n");
 		ret = PTR_ERR(mem);
diff --git a/hif/src/snoc/if_ahb_reset.c b/hif/src/snoc/if_ahb_reset.c
index 5cb1040929cb..6901f4251fee 100644
--- a/hif/src/snoc/if_ahb_reset.c
+++ b/hif/src/snoc/if_ahb_reset.c
@@ -32,11 +32,13 @@
 #include "if_ahb.h"
 
 #include <linux/clk.h>
-#include <linux/reset.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
 #include <linux/of.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+#include <linux/reset.h>
+#endif
 
 /**
  * clk_enable_disable() -  Enable/disable clock
@@ -115,6 +117,7 @@ int hif_ahb_clk_enable_disable(struct device *dev, int enable)
  *
  * Return : zero on success, non-zero incase of error.
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 int hif_ahb_enable_radio(struct hif_pci_softc *sc,
 		struct platform_device *pdev,
 		const struct platform_device_id *id)
@@ -237,8 +240,17 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc,
 
 err_reset:
 	return -EIO;
-
 }
+#else
+int hif_ahb_enable_radio(struct hif_pci_softc *sc,
+		struct platform_device *pdev,
+		const struct platform_device_id *id)
+{
+	qdf_print("%s:%d:Reset routines not available in kernel version.\n",
+		  __func__, __LINE__);
+	return -EIO;
+}
+#endif
 
 /* "wifi_core_warm" is the other reset type */
 #define AHB_RESET_TYPE "wifi_core_cold"
@@ -252,6 +264,7 @@ err_reset:
  *
  * Return : n/a.
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 void hif_ahb_device_reset(struct hif_softc *scn)
 {
 	struct reset_control *resetctl = NULL;
@@ -367,6 +380,13 @@ void hif_ahb_device_reset(struct hif_softc *scn)
 	iounmap(mem_tcsr);
 	HIF_INFO("Reset complete for wifi core id : %d\n", wifi_core_id);
 }
+#else
+void hif_ahb_device_reset(struct hif_softc *scn)
+{
+	qdf_print("%s:%d:Reset routines not available in kernel version.\n",
+		  __func__, __LINE__);
+}
+#endif
 
 
 
diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c
index e0227251d0ef..df7937f62f5c 100644
--- a/hif/src/snoc/if_snoc.c
+++ b/hif/src/snoc/if_snoc.c
@@ -220,7 +220,11 @@ QDF_STATUS hif_snoc_enable_bus(struct hif_softc *ol_sc,
 	int ret;
 	int hif_type;
 	int target_type;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(37));
+#else
+	ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(37));
+#endif
 	if (ret) {
 		HIF_ERROR("%s: failed to set dma mask error = %d",
 				__func__, ret);
diff --git a/qdf/linux/src/i_qdf_types.h b/qdf/linux/src/i_qdf_types.h
index 0e9aafbb9272..74325b7b64f5 100644
--- a/qdf/linux/src/i_qdf_types.h
+++ b/qdf/linux/src/i_qdf_types.h
@@ -185,6 +185,9 @@ struct __qdf_device {
 	__qdf_os_intr func;
 	struct __qdf_mempool_ctxt *mem_pool[MAX_MEM_POOLS];
 	enum qdf_bus_type bus_type;
+#ifdef CONFIG_MCL
+	const struct hif_bus_id *bid;
+#endif
 };
 typedef struct __qdf_device *__qdf_device_t;
 
diff --git a/qdf/linux/src/qdf_mc_timer.c b/qdf/linux/src/qdf_mc_timer.c
index 8d10d09ad327..80143ea5888d 100644
--- a/qdf/linux/src/qdf_mc_timer.c
+++ b/qdf/linux/src/qdf_mc_timer.c
@@ -687,3 +687,17 @@ unsigned long qdf_mc_timer_get_system_time(void)
 	return tv.tv_sec * 1000 + tv.tv_usec / 1000;
 }
 EXPORT_SYMBOL(qdf_mc_timer_get_system_time);
+
+/**
+ * qdf_timer_module_deinit() - Deinitializes a QDF timer module.
+ *
+ * This API deinitializes the QDF timer module.
+ * Return: none
+ */
+void qdf_timer_module_deinit(void)
+{
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
+		  "De-Initializing the QDF MC timer module");
+	qdf_mutex_destroy(&persistent_timer_count_lock);
+}
+EXPORT_SYMBOL(qdf_timer_module_deinit);
diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h
index 1bd40a0325b0..8086231c5834 100644
--- a/wmi/inc/wmi_unified_api.h
+++ b/wmi/inc/wmi_unified_api.h
@@ -112,9 +112,19 @@ void *wmi_unified_attach(void *scn_handle,
 			 bool use_cookie, struct wmi_rx_ops *ops);
 
 
+/**
+ * wmi_mgmt_cmd_record() - Wrapper function for mgmt command logging macro
+ *
+ * @wmi_handle: wmi handle
+ * @cmd: mgmt command
+ * @header: pointer to 802.11 header
+ * @vdev_id: vdev id
+ * @chanfreq: channel frequency
+ *
+ * Return: none
+ */
 void wmi_mgmt_cmd_record(wmi_unified_t wmi_handle, WMI_CMD_ID cmd,
-			uint32_t type, uint32_t subtype,
-			uint32_t vdev_id, uint32_t chanfreq);
+			void *header, uint32_t vdev_id, uint32_t chanfreq);
 
 /**
  * detach for unified WMI
@@ -629,7 +639,7 @@ QDF_STATUS wmi_unified_nat_keepalive_en_cmd(void *wmi_hdl, uint8_t vdev_id);
 QDF_STATUS wmi_unified_csa_offload_enable(void *wmi_hdl, uint8_t vdev_id);
 
 QDF_STATUS wmi_unified_start_oem_data_cmd(void *wmi_hdl,
-			  uint8_t data_len,
+			  uint32_t data_len,
 			  uint8_t *data);
 
 QDF_STATUS wmi_unified_dfs_phyerr_filter_offload_en_cmd(void *wmi_hdl,
diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h
index 69c16abc5825..bae209b3a7a3 100644
--- a/wmi/inc/wmi_unified_priv.h
+++ b/wmi/inc/wmi_unified_priv.h
@@ -518,7 +518,7 @@ QDF_STATUS (*send_wow_sta_ra_filter_cmd)(wmi_unified_t wmi_handle,
 QDF_STATUS (*send_nat_keepalive_en_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
 QDF_STATUS (*send_start_oem_data_cmd)(wmi_unified_t wmi_handle,
-			  uint8_t data_len,
+			  uint32_t data_len,
 			  uint8_t *data);
 
 QDF_STATUS
diff --git a/wmi/inc/wmi_unified_tlv.h b/wmi/inc/wmi_unified_tlv.h
index aa5a959a9c0e..5de7bae37952 100644
--- a/wmi/inc/wmi_unified_tlv.h
+++ b/wmi/inc/wmi_unified_tlv.h
@@ -364,7 +364,7 @@ QDF_STATUS send_csa_offload_enable_cmd_tlv(wmi_unified_t wmi_handle,
 			uint8_t vdev_id);
 
 QDF_STATUS send_start_oem_data_cmd_tlv(wmi_unified_t wmi_handle,
-			  uint8_t data_len,
+			  uint32_t data_len,
 			  uint8_t *data);
 
 QDF_STATUS
diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c
index fe17c5974678..fa51a843e4e6 100644
--- a/wmi/src/wmi_unified.c
+++ b/wmi/src/wmi_unified.c
@@ -892,20 +892,21 @@ static QDF_STATUS wmi_debugfs_init(wmi_unified_t wmi_handle)
  *
  * @wmi_handle: wmi handle
  * @cmd: mgmt command
- * @type: 802.11 frame type
- * @subtype: 802.11 fram subtype
+ * @header: pointer to 802.11 header
  * @vdev_id: vdev id
  * @chanfreq: channel frequency
  *
  * Return: none
  */
 void wmi_mgmt_cmd_record(wmi_unified_t wmi_handle, WMI_CMD_ID cmd,
-				uint32_t type, uint32_t subtype,
-				uint32_t vdev_id, uint32_t chanfreq)
+			void *header, uint32_t vdev_id, uint32_t chanfreq)
 {
 	qdf_spin_lock_bh(&wmi_handle->log_info.wmi_record_lock);
 
-	WMI_MGMT_COMMAND_RECORD(cmd, type, subtype, vdev_id, chanfreq);
+	WMI_MGMT_COMMAND_RECORD(cmd,
+				((struct wmi_command_header *)header)->type,
+				((struct wmi_command_header *)header)->sub_type,
+				vdev_id, chanfreq);
 
 	qdf_spin_unlock_bh(&wmi_handle->log_info.wmi_record_lock);
 }
@@ -920,8 +921,7 @@ void wmi_mgmt_cmd_record(wmi_unified_t wmi_handle, WMI_CMD_ID cmd,
  */
 static void wmi_debugfs_remove(wmi_unified_t wmi_handle) { }
 void wmi_mgmt_cmd_record(wmi_unified_t wmi_handle, WMI_CMD_ID cmd,
-				uint32_t type, uint32_t subtype,
-				uint32_t vdev_id, uint32_t chanfreq) { }
+			void *header, uint32_t vdev_id, uint32_t chanfreq) { }
 #endif /*WMI_INTERFACE_EVENT_LOGGING */
 
 int wmi_get_host_credits(wmi_unified_t wmi_handle);
@@ -1581,6 +1581,8 @@ static uint8_t *wmi_id_to_name(WMI_CMD_ID wmi_command)
 		CASE_RETURN_STRING(WMI_PDEV_SET_REORDER_TIMEOUT_VAL_CMDID);
 		CASE_RETURN_STRING(WMI_PEER_SET_RX_BLOCKSIZE_CMDID);
 		CASE_RETURN_STRING(WMI_PDEV_SET_WAKEUP_CONFIG_CMDID);
+		CASE_RETURN_STRING(WMI_PDEV_GET_ANTDIV_STATUS_CMDID);
+		CASE_RETURN_STRING(WMI_PEER_ANTDIV_INFO_REQ_CMDID);
 	}
 
 	return "Invalid WMI cmd";
@@ -2219,7 +2221,6 @@ void wmi_unified_detach(struct wmi_unified *wmi_handle)
 
 	wmi_debugfs_remove(wmi_handle);
 
-	qdf_spin_lock_bh(&wmi_handle->eventq_lock);
 	buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue);
 	while (buf) {
 		qdf_nbuf_free(buf);
@@ -2230,7 +2231,6 @@ void wmi_unified_detach(struct wmi_unified *wmi_handle)
 	wmi_log_buffer_free(wmi_handle);
 #endif
 
-	qdf_spin_unlock_bh(&wmi_handle->eventq_lock);
 	qdf_spinlock_destroy(&wmi_handle->eventq_lock);
 	qdf_spinlock_destroy(&wmi_handle->ctx_lock);
 	OS_FREE(wmi_handle);
diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c
index 462f4f6945c8..f9b5884d97d9 100644
--- a/wmi/src/wmi_unified_api.c
+++ b/wmi/src/wmi_unified_api.c
@@ -2264,7 +2264,7 @@ QDF_STATUS wmi_unified_csa_offload_enable(void *wmi_hdl, uint8_t vdev_id)
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
  */
 QDF_STATUS wmi_unified_start_oem_data_cmd(void *wmi_hdl,
-			  uint8_t data_len,
+			  uint32_t data_len,
 			  uint8_t *data)
 {
 	wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index ba67a6ecf47c..c9f0b0da7ca8 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -1641,9 +1641,7 @@ QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle,
 	cmd->buf_len = bufp_len;
 
 	wmi_mgmt_cmd_record(wmi_handle, WMI_MGMT_TX_SEND_CMDID,
-			((struct wmi_command_header *)bufp)->type,
-			((struct wmi_command_header *)bufp)->sub_type,
-			cmd->vdev_id, cmd->chanfreq);
+			bufp, cmd->vdev_id, cmd->chanfreq);
 
 	if (wmi_unified_cmd_send(wmi_handle, buf, cmd_len,
 				      WMI_MGMT_TX_SEND_CMDID)) {
@@ -6774,7 +6772,7 @@ QDF_STATUS send_csa_offload_enable_cmd_tlv(wmi_unified_t wmi_handle,
  * Return: CDF status
  */
 QDF_STATUS send_start_oem_data_cmd_tlv(wmi_unified_t wmi_handle,
-			  uint8_t data_len,
+			  uint32_t data_len,
 			  uint8_t *data)
 {
 	wmi_buf_t buf;