diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 412aba16cb33..09147faeca9d 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -4826,7 +4826,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 	{
 		hdd_info("****eCSR_ROAM_DISASSOCIATED****");
 		hdd_napi_serialize(0);
-		cds_set_connection_in_progress(false);
+		hdd_set_connection_in_progress(false);
 		hdd_set_roaming_in_progress(false);
 		pAdapter->defer_disconnect = 0;
 
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 7ef2d41d07ad..0deeed7bcce8 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -858,7 +858,7 @@ static void hdd_update_hw_dbs_capable(hdd_context_t *hdd_ctx)
 	uint8_t hw_dbs_capable = 0;
 
 	if ((!cfg_ini->dual_mac_feature_disable)
-	    && wma_is_hw_dbs_capable())
+	    && policy_mgr_is_hw_dbs_capable(hdd_ctx->hdd_psoc))
 		hw_dbs_capable = 1;
 
 	sme_update_hw_dbs_capable(hdd_ctx->hHal, hw_dbs_capable);
@@ -11013,10 +11013,15 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 			}
 			return true;
 		}
-		if ((QDF_STA_MODE == adapter->device_mode) &&
-				sme_neighbor_middle_of_roaming(
-					WLAN_HDD_GET_HAL_CTX(adapter),
-					adapter->sessionId)) {
+		/*
+		 * sme_neighbor_middle_of_roaming is for LFR2
+		 * hdd_is_roaming_in_progress is for LFR3
+		 */
+		if (((QDF_STA_MODE == adapter->device_mode) &&
+		     sme_neighbor_middle_of_roaming(
+			     WLAN_HDD_GET_HAL_CTX(adapter),
+			     adapter->sessionId)) ||
+		    hdd_is_roaming_in_progress(adapter)) {
 			hdd_err("%p(%d) Reassociation in progress",
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter),
 				adapter->sessionId);