diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 0f3af633996f..28e223aea0ee 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -1734,8 +1734,6 @@ ol_txrx_vdev_attach(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	TAILQ_INIT(&vdev->peer_list);
 	vdev->last_real_peer = NULL;
 
-	ol_txrx_hl_tdls_flag_reset(soc_hdl, vdev_id, false);
-
 #ifdef QCA_IBSS_SUPPORT
 	vdev->ibss_peer_num = 0;
 	vdev->ibss_peer_heart_beat_timer = 0;
@@ -1791,6 +1789,8 @@ ol_txrx_vdev_attach(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
 	if (QDF_GLOBAL_MONITOR_MODE == cds_get_conparam())
 		pdev->monitor_vdev = vdev;
 
+	ol_txrx_hl_tdls_flag_reset(soc_hdl, vdev_id, false);
+
 	ol_txrx_dbg(
 		   "Created vdev %pK ("QDF_MAC_ADDR_STR")\n",
 		   vdev,
diff --git a/core/pld/src/pld_pcie.h b/core/pld/src/pld_pcie.h
index fd80ebecef9d..0a315f358c23 100644
--- a/core/pld/src/pld_pcie.h
+++ b/core/pld/src/pld_pcie.h
@@ -37,7 +37,7 @@
 
 #endif
 
-#ifndef CONFIG_PLD_PCIE_CNSS
+#if !defined(HIF_PCI) || defined(CONFIG_PLD_PCIE_FW_SIM)
 static inline int pld_pcie_register_driver(void)
 {
 	return 0;