diff --git a/qca-nss-clients/Makefile b/qca-nss-clients/Makefile
index 3080ab1..f6c191f 100644
--- a/qca-nss-clients/Makefile
+++ b/qca-nss-clients/Makefile
@@ -369,15 +369,11 @@ define KernelPackage/qca-nss-drv-lag-mgr
   SUBMENU:=Network Devices
   TITLE:=NSS LAG (link aggregation) 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_qualcommax: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_ipq807x:kmod-qca-nss-drv-vlan-mgr \
 		   +TARGET_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
 		   +kmod-qca-nss-drv \
-		   +PACKAGE_kmod-bonding:kmod-bonding
+		   +kmod-bonding
   FILES:=$(PKG_BUILD_DIR)/lag/qca-nss-lag-mgr.ko
   AUTOLOAD:=$(call AutoLoad,51,qca-nss-lag-mgr)
 endef
diff --git a/qca-nss-clients/patches-11.4/0016-vxlanmgr-fix-compile-error-in-5.15.patch b/qca-nss-clients/patches-11.4/0016-vxlanmgr-fix-compile-error-in-5.15.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/qca-nss-clients/patches-11.4/0018-kernel-6.1-support.patch b/qca-nss-clients/patches-11.4/0018-kernel-6.1-support.patch
index fb9a27a..f0a465c 100644
--- a/qca-nss-clients/patches-11.4/0018-kernel-6.1-support.patch
+++ b/qca-nss-clients/patches-11.4/0018-kernel-6.1-support.patch
@@ -281,6 +281,17 @@
  	memset(dev->broadcast, 0xff, dev->addr_len);
  	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
  }
+--- a/clmapmgr/nss_clmapmgr.c
++++ b/clmapmgr/nss_clmapmgr.c
+@@ -103,7 +103,7 @@ static struct rtnl_link_stats64 *nss_clm
+ 	 * Netdev seems to be incrementing rx_dropped because we don't give IP header.
+ 	 * So reset it as it's of no use for us.
+ 	 */
+-	atomic_long_set(&dev->rx_dropped, 0);
++	atomic_long_set(&(dev)->stats.__rx_dropped, 0);
+ 	priv = netdev_priv(dev);
+ 	memset(stats, 0, sizeof(struct rtnl_link_stats64));
+ 	memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64));
 --- a/tls/nss_tlsmgr_tun.c
 +++ b/tls/nss_tlsmgr_tun.c
 @@ -185,7 +185,7 @@ static void nss_tlsmgr_tun_setup(struct
diff --git a/qca-nss-clients/patches-11.4/0025-pvxlanmgr-fix-compile-error-in-6.1.patch b/qca-nss-clients/patches-11.4/0025-pvxlanmgr-fix-compile-error-in-6.1.patch
deleted file mode 100644
index e15a4de..0000000
--- a/qca-nss-clients/patches-11.4/0025-pvxlanmgr-fix-compile-error-in-6.1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/pvxlanmgr/nss_pvxlanmgr.c
-+++ b/pvxlanmgr/nss_pvxlanmgr.c
-@@ -18,6 +18,7 @@
-  * nss_pvxlanmgr.c
-  *	NSS to HLOS Pvxlan manager
-  */
-+#include "nss_pvxlanmgr.h"
- #include "nss_pvxlanmgr_priv.h"
- 
- /*
-@@ -431,19 +432,19 @@ EXPORT_SYMBOL(nss_pvxlanmgr_netdev_disab
- nss_pvxlanmgr_status_t nss_pvxlanmgr_netdev_enable(struct net_device *dev)
- {
- 	struct nss_pvxlanmgr_priv *priv;
--	nss_tx_status_t ret;
-+	nss_pvxlanmgr_status_t ret;
- 
- 	dev_hold(dev);
- 	priv = netdev_priv(dev);
- 	nss_pvxlanmgr_info("%px: tunnel enable is being called\n", dev);
--	ret = nss_pvxlanmgr_tunnel_tx_msg_enable(priv->pvxlan_ctx, priv->if_num_host_inner, priv->if_num_outer);
-+	ret = (nss_pvxlanmgr_status_t)nss_pvxlanmgr_tunnel_tx_msg_enable(priv->pvxlan_ctx, priv->if_num_host_inner, priv->if_num_outer);
- 	if (ret != NSS_TX_SUCCESS) {
- 		nss_pvxlanmgr_warn("%px: Tunnel enable failed: %d\n", dev, ret);
- 		dev_put(dev);
- 		return ret;
- 	}
- 
--	ret = nss_pvxlanmgr_tunnel_tx_msg_enable(priv->pvxlan_ctx, priv->if_num_outer, priv->if_num_host_inner);
-+	ret = (nss_pvxlanmgr_status_t)nss_pvxlanmgr_tunnel_tx_msg_enable(priv->pvxlan_ctx, priv->if_num_outer, priv->if_num_host_inner);
- 	if (ret != NSS_TX_SUCCESS) {
- 		nss_pvxlanmgr_warn("%px: Tunnel enable failed: %d\n", dev, ret);
- 		nss_pvxlanmgr_tunnel_tx_msg_disable(priv->pvxlan_ctx, priv->if_num_host_inner);
-@@ -524,7 +525,7 @@ EXPORT_SYMBOL(nss_pvxlanmgr_netdev_destr
-  * nss_pvxlanmgr_netdev_create()
-  *	API to create a Pvxlan netdev
-  */
--struct net_device *nss_pvxlanmgr_netdev_create()
-+struct net_device *nss_pvxlanmgr_netdev_create(void)
- {
- 	struct nss_pvxlanmgr_priv *priv;
- 	struct net_device *dev;
diff --git a/qca-nss-clients/patches-11.4/0026-meshmgr-backport-12.4.patch b/qca-nss-clients/patches-11.4/0026-meshmgr-backport-12.4.patch
deleted file mode 100644
index e69de29..0000000