diff --git a/package/qca-nss/qca-nss-clients/Makefile b/package/qca-nss/qca-nss-clients/Makefile
index 3ba0349b40..d76b67e3fe 100644
--- a/package/qca-nss/qca-nss-clients/Makefile
+++ b/package/qca-nss/qca-nss-clients/Makefile
@@ -38,21 +38,21 @@ define KernelPackage/qca-nss-drv-tun6rd/description
 Kernel modules for NSS connection manager - Support for 6rd tunnel
 endef
 
-define KernelPackage/qca-nss-drv-l2tpv2
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - l2tp
-  DEPENDS:=+@NSS_DRV_L2TP_ENABLE +kmod-ppp +kmod-l2tp \
-		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
-  FILES:=$(PKG_BUILD_DIR)/l2tp/l2tpv2/qca-nss-l2tpv2.ko
-  KCONFIG:=CONFIG_L2TP=y
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-l2tpv2)
-endef
+#define KernelPackage/qca-nss-drv-l2tpv2
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  TITLE:=Kernel driver for NSS (connection manager) - l2tp
+#  DEPENDS:=+@NSS_DRV_L2TP_ENABLE +kmod-ppp +kmod-l2tp \
+#		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
+#  FILES:=$(PKG_BUILD_DIR)/l2tp/l2tpv2/qca-nss-l2tpv2.ko
+#  KCONFIG:=CONFIG_L2TP=y
+#  AUTOLOAD:=$(call AutoLoad,51,qca-nss-l2tpv2)
+#endef
 
-define KernelPackage/qca-nss-drv-l2tp/description
-Kernel modules for NSS connection manager - Support for l2tp tunnel
-endef
+#define KernelPackage/qca-nss-drv-l2tp/description
+#Kernel modules for NSS connection manager - Support for l2tp tunnel
+#endef
 
 define KernelPackage/qca-nss-drv-pptp
   SECTION:=kernel
@@ -85,21 +85,21 @@ define KernelPackage/qca-nss-drv-pppoe/description
 Kernel modules for NSS connection manager - Support for PPPoE
 endef
 
-define KernelPackage/qca-nss-drv-gre
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - GRE
-  DEPENDS:=@TARGET_ipq_ipq806x||TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64 \
-	   +@NSS_DRV_GRE_ENABLE +kmod-gre6 \
-	   +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
-  FILES:=$(PKG_BUILD_DIR)/gre/qca-nss-gre.ko $(PKG_BUILD_DIR)/gre/test/qca-nss-gre-test.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-gre)
-endef
+#define KernelPackage/qca-nss-drv-gre
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  TITLE:=Kernel driver for NSS (connection manager) - GRE
+#  DEPENDS:=@TARGET_ipq_ipq806x||TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64 \
+#	   +@NSS_DRV_GRE_ENABLE +kmod-gre6 \
+#	   +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
+#  FILES:=$(PKG_BUILD_DIR)/gre/qca-nss-gre.ko $(PKG_BUILD_DIR)/gre/test/qca-nss-gre-test.ko
+#  AUTOLOAD:=$(call AutoLoad,51,qca-nss-gre)
+#endef
 
-define KernelPackage/qca-nss-drv-gre/description
-Kernel modules for NSS connection manager - Support for GRE
-endef
+#define KernelPackage/qca-nss-drv-gre/description
+#Kernel modules for NSS connection manager - Support for GRE
+#endef
 
 define KernelPackage/qca-nss-drv-tunipip6
   SECTION:=kernel
@@ -131,62 +131,62 @@ define KernelPackage/qca-nss-drv-profile/description
 This package contains a NSS driver profiler for QCA chipset
 endef
 
-define KernelPackage/qca-nss-drv-portifmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (qca-nss-drv-portifmgr)
-  DEPENDS:=+@NSS_DRV_PORTID_ENABLE +kmod-qca-nss-gmac \
-		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
-  FILES:=$(PKG_BUILD_DIR)/portifmgr/qca-nss-portifmgr.ko
-endef
+#define KernelPackage/qca-nss-drv-portifmgr
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  TITLE:=Kernel driver for NSS (qca-nss-drv-portifmgr)
+#  DEPENDS:=+@NSS_DRV_PORTID_ENABLE +kmod-qca-nss-gmac \
+#		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
+#  FILES:=$(PKG_BUILD_DIR)/portifmgr/qca-nss-portifmgr.ko
+#endef
 
-define KernelPackage/qca-nss-drv-portifmgr/Description
-NSS Kernel module for Port interface manager
-endef
+#define KernelPackage/qca-nss-drv-portifmgr/Description
+#NSS Kernel module for Port interface manager
+#endef
 
-define KernelPackage/qca-nss-drv-bridge-mgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS bridge manager
-  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx \
-		+TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq_ipq807x_64:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq_ipq60xx_64:kmod-qca-nss-drv-vlan-mgr \
-		+PACKAGE_kmod-bonding:kmod-bonding \
-		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
-		+@NSS_DRV_BRIDGE_ENABLE
-ifneq ($(CONFIG_PACKAGE_kmod-qca-ovsmgr),)
-  DEPENDS+=kmod-qca-ovsmgr
-endif
-  FILES:=$(PKG_BUILD_DIR)/bridge/qca-nss-bridge-mgr.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-bridge-mgr)
-endef
+#define KernelPackage/qca-nss-drv-bridge-mgr
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  TITLE:=Kernel driver for NSS bridge manager
+#  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx \
+#		+TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \
+#		+TARGET_ipq_ipq807x_64:kmod-qca-nss-drv-vlan-mgr \
+#		+TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \
+#		+TARGET_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
+#		+TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
+#		+TARGET_ipq_ipq60xx_64:kmod-qca-nss-drv-vlan-mgr \
+#		+PACKAGE_kmod-bonding:kmod-bonding \
+#		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
+#		+@NSS_DRV_BRIDGE_ENABLE
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-ovsmgr),)
+#  DEPENDS+=kmod-qca-ovsmgr
+#endif
+#  FILES:=$(PKG_BUILD_DIR)/bridge/qca-nss-bridge-mgr.ko
+#  AUTOLOAD:=$(call AutoLoad,51,qca-nss-bridge-mgr)
+#endef
 
-define KernelPackage/qca-nss-drv-bridge-mgr/description
-Kernel modules for NSS bridge manager
-endef
+#define KernelPackage/qca-nss-drv-bridge-mgr/description
+#Kernel modules for NSS bridge manager
+#endef
 
-define KernelPackage/qca-nss-drv-vlan-mgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS vlan manager
-  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq806x||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx \
-		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
-	   +@NSS_DRV_VLAN_ENABLE \
-	   +PACKAGE_kmod-bonding:kmod-bonding
-  FILES:=$(PKG_BUILD_DIR)/vlan/qca-nss-vlan.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-vlan)
-endef
+#define KernelPackage/qca-nss-drv-vlan-mgr
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  TITLE:=Kernel driver for NSS vlan manager
+#  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq806x||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx \
+#		+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
+#	   +@NSS_DRV_VLAN_ENABLE \
+#	   +PACKAGE_kmod-bonding:kmod-bonding
+#  FILES:=$(PKG_BUILD_DIR)/vlan/qca-nss-vlan.ko
+#  AUTOLOAD:=$(call AutoLoad,51,qca-nss-vlan)
+#endef
 
-define KernelPackage/qca-nss-drv-vlan-mgr/description
-Kernel modules for NSS vlan manager
-endef
+#define KernelPackage/qca-nss-drv-vlan-mgr/description
+#Kernel modules for NSS vlan manager
+#endef
 
 define KernelPackage/qca-nss-drv-qdisc
   SECTION:=kernel
@@ -219,27 +219,27 @@ define KernelPackage/qca-nss-drv-igs/description
 Linux action that helps in offloading traffic to an IFB interface to perform ingress shaping.
 endef
 
-define KernelPackage/qca-nss-drv-lag-mgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS LAG manager
-  DEPENDS:=+@NSS_DRV_LAG_ENABLE \
-	   +TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-	   +TARGET_ipq_ipq807x_64:kmod-qca-nss-drv-vlan-mgr \
-	   +TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-	   +TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
-	   +TARGET_ipq_ipq60xx_64:kmod-qca-nss-drv-vlan-mgr \
-	   +TARGET_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
-	   +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
-	   +kmod-bonding
-  FILES:=$(PKG_BUILD_DIR)/lag/qca-nss-lag-mgr.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-lag-mgr)
-endef
+#define KernelPackage/qca-nss-drv-lag-mgr
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  TITLE:=Kernel driver for NSS LAG manager
+#  DEPENDS:=+@NSS_DRV_LAG_ENABLE \
+#	   +TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \
+#	   +TARGET_ipq_ipq807x_64:kmod-qca-nss-drv-vlan-mgr \
+#	   +TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \
+#	   +TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
+#	   +TARGET_ipq_ipq60xx_64:kmod-qca-nss-drv-vlan-mgr \
+#	   +TARGET_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
+#	   +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
+#	   +kmod-bonding
+#  FILES:=$(PKG_BUILD_DIR)/lag/qca-nss-lag-mgr.ko
+#  AUTOLOAD:=$(call AutoLoad,51,qca-nss-lag-mgr)
+#endef
 
-define KernelPackage/qca-nss-drv-lag-mgr/description
-Kernel modules for NSS LAG manager
-endef
+#define KernelPackage/qca-nss-drv-lag-mgr/description
+#Kernel modules for NSS LAG manager
+#endef
 
 define KernelPackage/qca-nss-drv-netlink
   SECTION:=kernel
@@ -256,44 +256,44 @@ define KernelPackage/qca-nss-drv-netlink/description
 Kernel module for NSS netlink manager
 endef
 
-define KernelPackage/qca-nss-drv-pvxlanmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_PVXLAN_ENABLE +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
-  TITLE:=NSS PVXLAN Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/pvxlanmgr/qca-nss-pvxlanmgr.ko
-endef
+#define KernelPackage/qca-nss-drv-pvxlanmgr
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  DEPENDS:=+@NSS_DRV_PVXLAN_ENABLE +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
+#  TITLE:=NSS PVXLAN Manager for QCA NSS driver
+#  FILES:=$(PKG_BUILD_DIR)/pvxlanmgr/qca-nss-pvxlanmgr.ko
+#endef
 
-define KernelPackage/qca-nss-drv-pvxlanmgr/description
-Kernel module for managing NSS PVxLAN
-endef
+#define KernelPackage/qca-nss-drv-pvxlanmgr/description
+#Kernel module for managing NSS PVxLAN
+#endef
 
-define KernelPackage/qca-nss-drv-eogremgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_GRE_ENABLE +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv +kmod-qca-nss-drv-gre
-  TITLE:=NSS EOGRE Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/eogremgr/qca-nss-eogremgr.ko
-endef
+#define KernelPackage/qca-nss-drv-eogremgr
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  DEPENDS:=+@NSS_DRV_GRE_ENABLE +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv +kmod-qca-nss-drv-gre
+#  TITLE:=NSS EOGRE Manager for QCA NSS driver
+#  FILES:=$(PKG_BUILD_DIR)/eogremgr/qca-nss-eogremgr.ko
+#endef
 
-define KernelPackage/qca-nss-drv-eogremgr/description
-Kernel module for managing NSS EoGRE
-endef
+#define KernelPackage/qca-nss-drv-eogremgr/description
+#Kernel module for managing NSS EoGRE
+#endef
 
-define KernelPackage/qca-nss-drv-clmapmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+@NSS_DRV_CLMAP_ENABLE +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv +kmod-qca-nss-drv-eogremgr
-  TITLE:=NSS clmap Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/clmapmgr/qca-nss-clmapmgr.ko
-endef
+#define KernelPackage/qca-nss-drv-clmapmgr
+#  SECTION:=kernel
+#  CATEGORY:=Kernel modules
+#  SUBMENU:=Network Devices
+#  DEPENDS:=+@NSS_DRV_CLMAP_ENABLE +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv +kmod-qca-nss-drv-eogremgr
+#  TITLE:=NSS clmap Manager for QCA NSS driver
+#  FILES:=$(PKG_BUILD_DIR)/clmapmgr/qca-nss-clmapmgr.ko
+#endef
 
-define KernelPackage/qca-nss-drv-clmapmgr/description
-Kernel module for managing NSS clmap
-endef
+#define KernelPackage/qca-nss-drv-clmapmgr/description
+#Kernel module for managing NSS clmap
+#endef
 
 # define KernelPackage/qca-nss-drv-vxlanmgr
 #   SECTION:=kernel
@@ -374,10 +374,10 @@ EXTRA_CFLAGS+= \
 	-I$(STAGING_DIR)/usr/include/qca-ssdk/fal 
 
 # Build individual packages if selected
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-portifmgr),)
-MAKE_OPTS+=portifmgr=y
-EXTRA_CFLAGS += -DNSS_PORTIFMGR_REF_AP148 -I$(PKG_BUILD_DIR)/portifmgr
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-portifmgr),)
+#MAKE_OPTS+=portifmgr=y
+#EXTRA_CFLAGS += -DNSS_PORTIFMGR_REF_AP148 -I$(PKG_BUILD_DIR)/portifmgr
+#endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-profile),)
 MAKE_OPTS+=profile=y
@@ -387,10 +387,10 @@ ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tun6rd),)
 MAKE_OPTS+=tun6rd=m
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
-MAKE_OPTS+=l2tpv2=y
-EXTRA_CFLAGS += -DNSS_L2TPV2_ENABLED
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
+#MAKE_OPTS+=l2tpv2=y
+#EXTRA_CFLAGS += -DNSS_L2TPV2_ENABLED
+#endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pptp),)
 MAKE_OPTS+=pptp=y
@@ -409,27 +409,27 @@ MAKE_OPTS+=igs=y
 EXTRA_CFLAGS+=-DNSS_IGS_DEBUG_LEVEL=4
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-bridge-mgr),)
-MAKE_OPTS+=bridge-mgr=y
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-bridge-mgr),)
+#MAKE_OPTS+=bridge-mgr=y
 #enable OVS bridge if ovsmgr is enabled
-ifneq ($(CONFIG_PACKAGE_kmod-qca-ovsmgr),)
-MAKE_OPTS+= NSS_BRIDGE_MGR_OVS_ENABLE=y
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-ovsmgr
-endif
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-ovsmgr),)
+#MAKE_OPTS+= NSS_BRIDGE_MGR_OVS_ENABLE=y
+#EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-ovsmgr
+#endif
+#endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr),)
-MAKE_OPTS+=vlan-mgr=y
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr),)
+#MAKE_OPTS+=vlan-mgr=y
+#endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-lag-mgr),)
-MAKE_OPTS+=lag-mgr=y
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-lag-mgr),)
+#MAKE_OPTS+=lag-mgr=y
+#endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-gre),)
-EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports
-MAKE_OPTS+=gre=y
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-gre),)
+#EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports
+#MAKE_OPTS+=gre=y
+#endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pppoe),)
 MAKE_OPTS+=pppoe=y
@@ -445,17 +445,17 @@ EXTRA_CFLAGS+= -DNSS_NETLINK_UDP_ST_NO_RMNET_SUPPORT
 endif
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pvxlanmgr),)
-MAKE_OPTS+=pvxlanmgr=y
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pvxlanmgr),)
+#MAKE_OPTS+=pvxlanmgr=y
+#endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-eogremgr),)
-MAKE_OPTS+=eogremgr=y
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-eogremgr),)
+#MAKE_OPTS+=eogremgr=y
+#endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-clmapmgr),)
-MAKE_OPTS+=clmapmgr=y
-endif
+#ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-clmapmgr),)
+#MAKE_OPTS+=clmapmgr=y
+#endif
 
 # ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vxlanmgr),)
 # MAKE_OPTS+=vxlanmgr=y
@@ -476,18 +476,18 @@ endef
 
 $(eval $(call KernelPackage,qca-nss-drv-profile))
 $(eval $(call KernelPackage,qca-nss-drv-tun6rd))
-$(eval $(call KernelPackage,qca-nss-drv-l2tpv2))
+#$(eval $(call KernelPackage,qca-nss-drv-l2tpv2))
 $(eval $(call KernelPackage,qca-nss-drv-pptp))
 $(eval $(call KernelPackage,qca-nss-drv-pppoe))
 $(eval $(call KernelPackage,qca-nss-drv-tunipip6))
 $(eval $(call KernelPackage,qca-nss-drv-qdisc))
 $(eval $(call KernelPackage,qca-nss-drv-igs))
-$(eval $(call KernelPackage,qca-nss-drv-portifmgr))
+#$(eval $(call KernelPackage,qca-nss-drv-portifmgr))
 $(eval $(call KernelPackage,qca-nss-drv-netlink))
-$(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
-$(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
-$(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
-$(eval $(call KernelPackage,qca-nss-drv-gre))
-$(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
-$(eval $(call KernelPackage,qca-nss-drv-eogremgr))
-$(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
+#$(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
+#$(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
+#$(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
+#$(eval $(call KernelPackage,qca-nss-drv-gre))
+#$(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
+#$(eval $(call KernelPackage,qca-nss-drv-eogremgr))
+#$(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
diff --git a/package/qca-nss/qca-nss-drv/Config.in b/package/qca-nss/qca-nss-drv/Config.in
index 1438627de1..876bed2d92 100644
--- a/package/qca-nss/qca-nss-drv/Config.in
+++ b/package/qca-nss/qca-nss-drv/Config.in
@@ -3,56 +3,56 @@ menu "Configuration"
 
 comment "Build Options"
 
-config NSS_DRV_BRIDGE_ENABLE
-	bool
-	default n
-	prompt "Enable BRIDGE"
-config NSS_DRV_C2C_ENABLE
-	bool
-	default n
-	prompt "Enable C2C"
-config NSS_DRV_CAPWAP_ENABLE
-	bool
-	default n
-	prompt "Enable CAPWAP"
-config NSS_DRV_CLMAP_ENABLE
-	bool
-	default n
-	prompt "Enable CLMAP"
-config NSS_DRV_CRYPTO_ENABLE
-	bool
-	default n
-	prompt "Enable CRYPTO"
-config NSS_DRV_DTLS_ENABLE
-	bool
-	default n
-	prompt "Enable DTLS"
-config NSS_DRV_EDMA_ENABLE
-	bool
-	default n
-	prompt "Enable EDMA"
-config NSS_DRV_GRE_ENABLE
-	bool
-	default n
-	prompt "Enable GRE"
-config NSS_DRV_GRE_REDIR_ENABLE
-	bool
-	default n
-	depends on NSS_DRV_GRE_ENABLE
-	prompt "Enable GRE_REDIR"
-config NSS_DRV_GRE_TUNNEL_ENABLE
-	bool
-	default n
-	depends on NSS_DRV_GRE_ENABLE
-	prompt "Enable GRE_TUNNEL"
+#config NSS_DRV_BRIDGE_ENABLE
+#	bool
+#	default n
+#	prompt "Enable BRIDGE"
+#config NSS_DRV_C2C_ENABLE
+#	bool
+#	default n
+#	prompt "Enable C2C"
+#config NSS_DRV_CAPWAP_ENABLE
+#	bool
+#	default n
+#	prompt "Enable CAPWAP"
+#config NSS_DRV_CLMAP_ENABLE
+#	bool
+#	default n
+#	prompt "Enable CLMAP"
+#config NSS_DRV_CRYPTO_ENABLE
+#	bool
+#	default n
+#	prompt "Enable CRYPTO"
+#config NSS_DRV_DTLS_ENABLE
+#	bool
+#	default n
+#	prompt "Enable DTLS"
+#config NSS_DRV_EDMA_ENABLE
+#	bool
+#	default n
+#	prompt "Enable EDMA"
+#config NSS_DRV_GRE_ENABLE
+#	bool
+#	default n
+#	prompt "Enable GRE"
+#config NSS_DRV_GRE_REDIR_ENABLE
+#	bool
+#	default n
+#	depends on NSS_DRV_GRE_ENABLE
+#	prompt "Enable GRE_REDIR"
+#config NSS_DRV_GRE_TUNNEL_ENABLE
+#	bool
+#	default n
+#	depends on NSS_DRV_GRE_ENABLE
+#	prompt "Enable GRE_TUNNEL"
 config NSS_DRV_IGS_ENABLE
 	bool
 	default n
 	prompt "Enable IGS"
-config NSS_DRV_IPSEC_ENABLE
-	bool
-	default n
-	prompt "Enable IPSEC"
+#config NSS_DRV_IPSEC_ENABLE
+#	bool
+#	default n
+#	prompt "Enable IPSEC"
 config NSS_DRV_IPV4_REASM_ENABLE
 	bool
 	default n
@@ -65,38 +65,38 @@ config NSS_DRV_IPV6_REASM_ENABLE
 	bool
 	default n
 	prompt "Enable IPV6_REASM"
-config NSS_DRV_L2TP_ENABLE
-	bool
-	default n
-	prompt "Enable L2TP"
-config NSS_DRV_LAG_ENABLE
-	bool
-	default n
-	prompt "Enable LAG"
-config NSS_DRV_MAPT_ENABLE
-	bool
-	default n
-	prompt "Enable MAPT"
-config NSS_DRV_MATCH_ENABLE
-	bool
-	default n
-	prompt "Enable MATCH"
-config NSS_DRV_MIRROR_ENABLE
-	bool
-	default n
-	prompt "Enable MIRROR"
-config NSS_DRV_OAM_ENABLE
-	bool
-	default n
-	prompt "Enable OAM"
-config NSS_DRV_PORTID_ENABLE
-	bool
-	default n
-	prompt "Enable PORTID"
-config NSS_DRV_PPE_ENABLE
-	bool
-	default n
-	prompt "Enable PPE"
+#config NSS_DRV_L2TP_ENABLE
+#	bool
+#	default n
+#	prompt "Enable L2TP"
+#config NSS_DRV_LAG_ENABLE
+#	bool
+#	default n
+#	prompt "Enable LAG"
+#config NSS_DRV_MAPT_ENABLE
+#	bool
+#	default n
+#	prompt "Enable MAPT"
+#config NSS_DRV_MATCH_ENABLE
+#	bool
+#	default n
+#	prompt "Enable MATCH"
+#config NSS_DRV_MIRROR_ENABLE
+#	bool
+#	default n
+#	prompt "Enable MIRROR"
+#config NSS_DRV_OAM_ENABLE
+#	bool
+#	default n
+#	prompt "Enable OAM"
+#config NSS_DRV_PORTID_ENABLE
+#	bool
+#	default n
+#	prompt "Enable PORTID"
+#config NSS_DRV_PPE_ENABLE
+#	bool
+#	default n
+#	prompt "Enable PPE"
 config NSS_DRV_PPPOE_ENABLE
 	bool
 	default n
@@ -105,38 +105,38 @@ config NSS_DRV_PPTP_ENABLE
 	bool
 	default y
 	prompt "Enable PPTP"
-config NSS_DRV_PVXLAN_ENABLE
-	bool
-	default n
-	prompt "Enable PVXLAN"
-config NSS_DRV_QRFS_ENABLE
-	bool
-	default n
-	prompt "Enable QRFS"
-config NSS_DRV_QVPN_ENABLE
-	bool
-	default n
-	prompt "Enable QVPN"
-config NSS_DRV_RMNET_ENABLE
-	bool
-	default n
-	prompt "Enable RMNET"
+#config NSS_DRV_PVXLAN_ENABLE
+#	bool
+#	default n
+#	prompt "Enable PVXLAN"
+#config NSS_DRV_QRFS_ENABLE
+#	bool
+#	default n
+#	prompt "Enable QRFS"
+#config NSS_DRV_QVPN_ENABLE
+#	bool
+#	default n
+#	prompt "Enable QVPN"
+#config NSS_DRV_RMNET_ENABLE
+#	bool
+#	default n
+#	prompt "Enable RMNET"
 config NSS_DRV_SHAPER_ENABLE
 	bool
 	default n
 	prompt "Enable SHAPER"
-config NSS_DRV_SJACK_ENABLE
-	bool
-	default n
-	prompt "Enable SJACK (ipq807x)"
-config NSS_DRV_TLS_ENABLE
-	bool
-	default n
-	prompt "Enable TLS"
-config NSS_DRV_TRUSTSEC_ENABLE
-	bool
-	default n
-	prompt "Enable TRUSTSEC"
+#config NSS_DRV_SJACK_ENABLE
+#	bool
+#	default n
+#	prompt "Enable SJACK (ipq807x)"
+#config NSS_DRV_TLS_ENABLE
+#	bool
+#	default n
+#	prompt "Enable TLS"
+#config NSS_DRV_TRUSTSEC_ENABLE
+#	bool
+#	default n
+#	prompt "Enable TRUSTSEC"
 config NSS_DRV_TSTAMP_ENABLE
 	bool
 	default n
@@ -153,14 +153,14 @@ config NSS_DRV_VIRT_IF_ENABLE
 	bool
 	default y
 	prompt "Enable VIRT_IF"
-config NSS_DRV_VLAN_ENABLE
-	bool
-	default n
-	prompt "Enable VLAN (ipq807x)"
-config NSS_DRV_VXLAN_ENABLE
-	bool
-	default n
-	prompt "Enable VXLAN (ipq807x)"
+#config NSS_DRV_VLAN_ENABLE
+#	bool
+#	default n
+#	prompt "Enable VLAN (ipq807x)"
+#config NSS_DRV_VXLAN_ENABLE
+#	bool
+#	default n
+#	prompt "Enable VXLAN (ipq807x)"
 config NSS_DRV_WIFI_ENABLE
 	bool
 	default n