diff --git a/Kbuild b/Kbuild
index 90abcd3790..aca4035533 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2103,10 +2103,6 @@ TXRX3.0_OBJS += $(TXRX3.0_DIR)/dp_fisa_rx.o
 TXRX3.0_OBJS += $(TXRX3.0_DIR)/dp_rx_fst.o
 endif
 
-ifeq ($(CONFIG_DP_SWLM), y)
-TXRX3.0_OBJS += $(TXRX3.0_DIR)/dp_swlm.o
-endif
-
 endif #LITHIUM
 
 $(call add-wlan-objs,txrx30,$(TXRX3.0_OBJS))
@@ -2538,6 +2534,10 @@ ifeq ($(CONFIG_WLAN_FEATURE_PERIODIC_STA_STATS), y)
 WLAN_DP_COMP_OBJS += $(DP_COMP_CORE_DIR)/wlan_dp_periodic_sta_stats.o
 endif
 
+ifeq ($(CONFIG_DP_SWLM), y)
+WLAN_DP_COMP_OBJS += $(DP_COMP_CORE_DIR)/wlan_dp_swlm.o
+endif
+
 $(call add-wlan-objs,dp_comp,$(WLAN_DP_COMP_OBJS))
 
 #######################################################
diff --git a/core/dp/txrx3.0/dp_swlm.h b/components/dp/core/inc/wlan_dp_swlm.h
similarity index 99%
rename from core/dp/txrx3.0/dp_swlm.h
rename to components/dp/core/inc/wlan_dp_swlm.h
index 3a098e448a..e111d0bea2 100644
--- a/core/dp/txrx3.0/dp_swlm.h
+++ b/components/dp/core/inc/wlan_dp_swlm.h
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _DP_SWLM_H_
-#define _DP_SWLM_H_
+#ifndef _WLAN_DP_SWLM_H_
+#define _WLAN_DP_SWLM_H_
 
 #ifdef WLAN_DP_FEATURE_SW_LATENCY_MGR
 
diff --git a/core/dp/txrx3.0/dp_swlm.c b/components/dp/core/src/wlan_dp_swlm.c
similarity index 98%
rename from core/dp/txrx3.0/dp_swlm.c
rename to components/dp/core/src/wlan_dp_swlm.c
index d9ced24598..431e2d4836 100644
--- a/core/dp/txrx3.0/dp_swlm.c
+++ b/components/dp/core/src/wlan_dp_swlm.c
@@ -20,7 +20,14 @@
 #include <dp_types.h>
 #include <dp_internal.h>
 #include <wlan_cfg.h>
-#include "dp_swlm.h"
+#include "wlan_dp_swlm.h"
+#include "qdf_time.h"
+#include "qdf_util.h"
+#include "hal_internal.h"
+#include "hal_api.h"
+#include "hif.h"
+#include <qdf_status.h>
+#include <qdf_nbuf.h>
 
 /**
  * dp_swlm_is_tput_thresh_reached() - Calculate the current tx and rx TPUT
@@ -196,8 +203,6 @@ static void dp_swlm_tcl_flush_timer(void *arg)
 
 fail:
 	DP_STATS_INC(swlm, tcl[tcl->ring_id].timer_flush_fail, 1);
-
-	return;
 }
 
 /**