diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h
index 432b2f6ec2..476d90683e 100644
--- a/umac/cmn_services/inc/wlan_cmn.h
+++ b/umac/cmn_services/inc/wlan_cmn.h
@@ -285,6 +285,7 @@
  * @WLAN_UMAC_COMP_IF_MGR:        Interface manager component
  * @WLAN_UMAC_COMP_GPIO:          GPIO Configuration
  * @WLAN_UMAC_COMP_MLO_MGR:       MLO manager
+ * @WLAN_UMAC_COMP_REPEATER:      Repeater component
  * @WLAN_UMAC_COMP_ID_MAX:        Maximum components in UMAC
  *
  * This id is static.
@@ -332,6 +333,7 @@ enum wlan_umac_comp_id {
 	WLAN_UMAC_COMP_IF_MGR             = 38,
 	WLAN_UMAC_COMP_GPIO               = 39,
 	WLAN_UMAC_COMP_MLO_MGR            = 40,
+	WLAN_UMAC_COMP_REPEATER           = 41,
 	WLAN_UMAC_COMP_ID_MAX,
 };
 
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h
index caf778ba93..1caac242fe 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -79,8 +79,6 @@
 #define WLAN_PDEV_F_STRICT_PSCAN_EN         0x02000000
   /* dupie (ANA,pre ANA ) */
 /*#define WLAN_PDEV_F_DUPIE                 0x00200000*/
- /* QWRAP enable flag */
-#define WLAN_PDEV_F_WRAP_EN                 0x04000000
 /* Chan concurrency enabled */
 #define WLAN_PDEV_F_CHAN_CONCURRENCY        0x08000000
 /* Multivdev restart enabled */
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
index 58886217ed..de0c800539 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
@@ -190,8 +190,6 @@
 #define WLAN_SOC_F_DOT11D              0x00020000
 	/* Beacon offload */
 #define WLAN_SOC_F_BCN_OFFLOAD         0x00040000
-	/* QWRAP enable */
-#define WLAN_SOC_F_QWRAP_ENABLE        0x00080000
 	/* LTEU support */
 #define WLAN_SOC_F_LTEU_SUPPORT        0x00100000
 	/* BT coext support */
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
index a5ea280bff..a6c3d49072 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
@@ -67,8 +67,6 @@
 #define WLAN_VDEV_F_NOBRIDGE             0x00000800
 	/* STATUS: update beacon wme */
 #define WLAN_VDEV_F_WMEUPDATE            0x00001000
-	/* CONF: 4 addr allowed */
-#define WLAN_VDEV_F_WDS                  0x00002000
 	/* CONF: enable U-APSD */
 #define WLAN_VDEV_F_UAPSD                0x00004000
 	/* STATUS: sleeping */
@@ -85,8 +83,6 @@
 #define WLAN_VDEV_F_PUREB                0x00100000
 	/* disable HT rates */
 #define WLAN_VDEV_F_HTRATES              0x00200000
-	/* Extender AP */
-#define WLAN_VDEV_F_AP                   0x00400000
 	/* CONF: deliver rx frames with 802.11 header */
 #define WLAN_VDEV_F_DELIVER_80211        0x00800000
 	/* CONF: os sends down tx frames with 802.11 header */
@@ -159,16 +155,6 @@
 #define WLAN_VDEV_FEXT_SON_INFO_UPDATE      0x01000000
 	/* CONF: A-MSDU supported */
 #define WLAN_VDEV_FEXT_AMSDU                0x02000000
-	/* VDEV is PSTA*/
-#define WLAN_VDEV_FEXT_PSTA                 0x04000000
-	/* VDEV is MPSTA*/
-#define WLAN_VDEV_FEXT_MPSTA                0x08000000
-	/* VDEV is WRAP*/
-#define WLAN_VDEV_FEXT_WRAP                 0x10000000
-	/* VDEV has MAT enabled*/
-#define WLAN_VDEV_FEXT_MAT                  0x20000000
-	/* VDEV is wired PSTA*/
-#define WLAN_VDEV_FEXT_WIRED_PSTA           0x40000000
 	/* Fils discovery on 6G SAP*/
 #define WLAN_VDEV_FEXT_FILS_DISC_6G_SAP     0x80000000