qca-nss-clients: add more drivers and mgrs

2025-12-16 08:44:52 +00:00 · 2023-02-08 05:37:51 +02:00 · 2023-02-08 05:37:51 +02:00 · 779523dcc6
commit 779523dcc6
parent 2f41c0773e
17 changed files with 923 additions and 6 deletions
--- a/qca/qca-nss-clients/Makefile
+++ b/qca/qca-nss-clients/Makefile
@ -14,6 +14,67 @@ PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk

+ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+  SOC="ipq807x_64"
+  subtarget:=$(CONFIG_TARGET_BOARD)
+else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
+  SOC="ipq60xx_64"
+  subtarget:=$(SUBTARGET)
+endif
+
+ifneq (, $(findstring $(subtarget), "ipq807x" "ipq807x_64" "ipq60xx" "ipq60xx_64"))
+# DTLS Manager v2.0 for Hawkeye/Cypress
+  DTLSMGR_DIR:=v2.0
+# IPsec Manager v2.0 for Hawkeye/Cypress
+  IPSECMGR_DIR:=v2.0
+# KLIPS plugin
+  IPSECMGR_KLIPS:= $(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/plugins/klips/qca-nss-ipsec-klips.ko
+endif
+
+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 \
+	   +kmod-qca-nss-drv +kmod-gre6
+  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-l2tpv2
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - l2tp
+  DEPENDS:=+kmod-qca-nss-drv +kmod-ppp +kmod-l2tp
+  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-pptp
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - PPTP
+  DEPENDS:=+kmod-qca-nss-drv +kmod-pptp
+  FILES:=$(PKG_BUILD_DIR)/pptp/qca-nss-pptp.ko
+  AUTOLOAD:=$(call AutoLoad,51,qca-nss-pptp)
+endef
+
+define KernelPackage/qca-nss-drv-pptp/description
+Kernel modules for NSS connection manager - Support for PPTP tunnel
+endef
+
 define KernelPackage/qca-nss-drv-pppoe
  SECTION:=kernel
  CATEGORY:=Kernel modules
@ -28,6 +89,49 @@ define KernelPackage/qca-nss-drv-pppoe/Description
 Kernel modules for NSS connection manager - Support for PPPoE
 endef

+define KernelPackage/qca-nss-drv-map-t
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - MAP-T
+  DEPENDS:=+kmod-qca-nss-drv +kmod-nat46
+  FILES:=$(PKG_BUILD_DIR)/map/map-t/qca-nss-map-t.ko
+  AUTOLOAD:=$(call AutoLoad,51,qca-nss-map-t)
+endef
+
+define KernelPackage/qca-nss-drv-map-t/description
+Kernel modules for NSS connection manager - Support for MAP-T
+endef
+
+define KernelPackage/qca-nss-drv-tun6rd
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - tun6rd
+  DEPENDS:=+kmod-qca-nss-drv +kmod-sit +6rd
+  FILES:=$(PKG_BUILD_DIR)/qca-nss-tun6rd.ko
+  AUTOLOAD:=$(call AutoLoad,60,qca-nss-tun6rd)
+endef
+
+define KernelPackage/qca-nss-drv-tun6rd/description
+Kernel modules for NSS connection manager - Support for 6rd tunnel
+endef
+
+define KernelPackage/qca-nss-drv-tunipip6
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - DS-lite and ipip6 Tunnel
+  DEPENDS:=+kmod-qca-nss-drv +kmod-iptunnel6 +kmod-ip6-tunnel
+  FILES:=$(PKG_BUILD_DIR)/tunipip6/qca-nss-tunipip6.ko
+  AUTOLOAD:=$(call AutoLoad,60,qca-nss-tunipip6)
+endef
+
+define KernelPackage/qca-nss-drv-tunipip6/description
+Kernel modules for NSS connection manager
+Add support for DS-lite and ipip6 tunnel
+endef
+
 define KernelPackage/qca-nss-drv-bridge-mgr
  SECTION:=kernel
  CATEGORY:=Kernel modules
@ -42,6 +146,165 @@ define KernelPackage/qca-nss-drv-bridge-mgr/Description
 Kernel modules for NSS bridge manager
 endef

+define KernelPackage/qca-nss-drv-clmapmgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  DEPENDS:=+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-dtlsmgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - dtlsmgr
+  DEPENDS:=+kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi
+  FILES:=$(PKG_BUILD_DIR)/dtls/$(DTLSMGR_DIR)/qca-nss-dtlsmgr.ko
+endef
+
+define KernelPackage/qca-nss-drv-dtls/description
+Kernel modules for NSS connection manager - Support for DTLS sessions
+endef
+
+define KernelPackage/qca-nss-drv-tlsmgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - tlsmgr
+  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64 +kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi
+  FILES:=$(PKG_BUILD_DIR)/tls/qca-nss-tlsmgr.ko
+endef
+
+define KernelPackage/qca-nss-drv-tls/description
+Kernel modules for NSS connection manager - Support for TLS sessions
+endef
+
+define KernelPackage/qca-nss-drv-ipsecmgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (ipsec manager) - ipsecmgr
+  DEPENDS:=@TARGET_ipq806x||TARGET_ipq_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64 \
+		       +kmod-qca-nss-drv +kmod-qca-nss-ecm +kmod-qca-nss-cfi-cryptoapi
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
+  DEPENDS+=+kmod-qca-nss-drv-l2tpv2
+endif
+  FILES:=$(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/qca-nss-ipsecmgr.ko $(IPSECMGR_KLIPS)
+  AUTOLOAD:=$(call AutoLoad,60,qca-nss-ipsecmgr)
+endef
+
+define KernelPackage/qca-nss-drv-ipsecmgr/description
+Kernel module for NSS IPsec offload manager
+endef
+
+define KernelPackage/qca-nss-drv-ovpn-mgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS OpenVPN manager
+  DEPENDS:=+kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi +kmod-tun +kmod-ipt-conntrack \
+	  @TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64
+  FILES:=$(PKG_BUILD_DIR)/openvpn/src/qca-nss-ovpn-mgr.ko
+endef
+
+define KernelPackage/qca-nss-drv-ovpn-mgr/description
+Kernel module for NSS OpenVPN manager
+endef
+
+define KernelPackage/qca-nss-drv-ovpn-link
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for interfacing NSS OpenVPN manager with ECM
+  DEPENDS:=+kmod-qca-nss-drv-ovpn-mgr +@PACKAGE_kmod-qca-nss-ecm \
+	  @TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64
+  FILES:=$(PKG_BUILD_DIR)/openvpn/plugins/qca-nss-ovpn-link.ko
+endef
+
+define KernelPackage/qca-nss-drv-ovpn-link/description
+This module registers with ECM and communicates with NSS OpenVPN manager for supporting OpenVPN offload.
+endef
+
+define KernelPackage/qca-nss-drv-pvxlanmgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  DEPENDS:=+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-eogremgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  DEPENDS:=+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-clmapmgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  DEPENDS:=+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-lag-mgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS LAG manager
+  DEPENDS:=@!TARGET_ipq95xx +kmod-qca-nss-drv \
+	   +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 \
+	   +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-vxlanmgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  DEPENDS:=+kmod-qca-nss-drv +kmod-vxlan
+  TITLE:=NSS VxLAN Manager for QCA NSS driver
+  FILES:=$(PKG_BUILD_DIR)/vxlanmgr/qca-nss-vxlanmgr.ko
+  AUTOLOAD:=$(call AutoLoad,51,qca-nss-vxlanmgr)
+endef
+
+define KernelPackage/qca-nss-drv-vxlanmgr/description
+Kernel module for managing NSS VxLAN
+endef
+
 define KernelPackage/qca-nss-drv-vlan-mgr
  SECTION:=kernel
  CATEGORY:=Kernel modules
@ -56,12 +319,52 @@ define KernelPackage/qca-nss-drv-vlan-mgr/Description
 Kernel modules for NSS vlan manager
 endef

+define KernelPackage/qca-nss-drv-igs
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Support
+  TITLE:=Action for offloading traffic to an IFB interface to perform ingress shaping.
+  DEPENDS:=@TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64 \
+	+kmod-qca-nss-drv +kmod-sched-core +kmod-ifb +kmod-qca-nss-drv-qdisc
+  FILES:=$(PKG_BUILD_DIR)/nss_qdisc/igs/act_nssmirred.ko
+endef
+
+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-match
+ SECTION:=kernel
+ CATEGORY:=Kernel modules
+ SUBMENU:=Network Devices
+ DEPENDS:=+kmod-qca-nss-drv
+ TITLE:=NSS Match for QCA NSS driver
+ FILES:=$(PKG_BUILD_DIR)/match/qca-nss-match.ko
+endef
+
+define KernelPackage/qca-nss-drv-match/description
+Kernel module for managing NSS Match
+endef
+
+define KernelPackage/qca-nss-drv-mirror
+ SECTION:=kernel
+ CATEGORY:=Kernel modules
+ SUBMENU:=Network Support
+ TITLE:=Module for mirroring packets from NSS to host.
+ DEPENDS:=@!TARGET_ipq95xx +kmod-qca-nss-drv
+ FILES:=$(PKG_BUILD_DIR)/mirror/qca-nss-mirror.ko
+endef
+
+define KernelPackage/qca-nss-drv-mirror/Description
+Kernel module for managing NSS Mirror
+endef
+
 define KernelPackage/qca-nss-drv-netlink
  SECTION:=kernel
  CATEGORY:=Kernel modules
  SUBMENU:=Network Devices
  TITLE:=NSS NETLINK Manager for QCA NSS driver
-  DEPENDS:=@TARGET_ipq807x +kmod-qca-nss-drv +kmod-pppoe
+  DEPENDS:=@TARGET_ipq807x +kmod-qca-nss-drv +kmod-pppoe +kmod-qca-nss-drv-dtlsmgr
  FILES:=$(PKG_BUILD_DIR)/netlink/qca-nss-netlink.ko
 endef

@ -90,15 +393,59 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-clients/
 endef

+define KernelPackage/qca-nss-drv-ovpn-mgr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/qca-nss-ovpn.init $(1)/etc/init.d/qca-nss-ovpn
+endef
+
+define KernelPackage/qca-nss-drv-ipsecmgr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/qca-nss-ipsec $(1)/etc/init.d/qca-nss-ipsec
+endef
+
+define KernelPackage/qca-nss-drv-igs/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/qca-nss-mirred.init $(1)/etc/init.d/qca-nss-mirred
+endef
+
+define KernelPackage/qca-nss-drv-netlink/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/qca-nss-netlink.init $(1)/etc/init.d/qca-nss-netlink
+endef
+
 EXTRA_CFLAGS+= \
 	-I$(STAGING_DIR)/usr/include/qca-nss-drv \
 	-I$(STAGING_DIR)/usr/include/qca-nss-crypto \
 	-I$(STAGING_DIR)/usr/include/qca-nss-cfi \
-	-I$(STAGING_DIR)/usr/include/qca-nss-gmac \
+  -I$(STAGING_DIR)/usr/include/qca-nss-ecm \
 	-I$(STAGING_DIR)/usr/include/qca-ssdk \
 	-I$(STAGING_DIR)/usr/include/qca-ssdk/fal \
 	-I$(STAGING_DIR)/usr/include/nat46

+# Build individual packages if selected
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tun6rd),)
+NSS_CLIENTS_MAKE_OPTS+=tun6rd=m
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-dtlsmgr),)
+NSS_CLIENTS_MAKE_OPTS+=dtlsmgr=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tlsmgr),)
+EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports
+NSS_CLIENTS_MAKE_OPTS+=tlsmgr=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
+NSS_CLIENTS_MAKE_OPTS+=l2tpv2=y
+EXTRA_CFLAGS += -DNSS_L2TPV2_ENABLED
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-gre),)
+EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports
+NSS_CLIENTS_MAKE_OPTS+=gre=y
+endif
+
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pppoe),)
 NSS_CLIENTS_MAKE_OPTS+=pppoe=y
 endif
@ -112,10 +459,61 @@ EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-ovsmgr
 endif
 endif

+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-ipsecmgr),)
+EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports \
+		           -I$(STAGING_DIR)/usr/include/qca-nss-ecm
+NSS_CLIENTS_MAKE_OPTS+=ipsecmgr=y
+endif
+
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr),)
 NSS_CLIENTS_MAKE_OPTS+=vlan-mgr=y
 endif

+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-lag-mgr),)
+NSS_CLIENTS_MAKE_OPTS+=lag-mgr=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pvxlanmgr),)
+NSS_CLIENTS_MAKE_OPTS+=pvxlanmgr=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-clmapmgr),)
+NSS_CLIENTS_MAKE_OPTS+=clmapmgr=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-eogremgr),)
+NSS_CLIENTS_MAKE_OPTS+=eogremgr=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr),)
+NSS_CLIENTS_MAKE_OPTS+=vlan-mgr=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vxlanmgr),)
+NSS_CLIENTS_MAKE_OPTS+=vxlanmgr=y
+EXTRA_CFLAGS += -DNSS_VXLAN_ENABLED
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pptp),)
+NSS_CLIENTS_MAKE_OPTS+=pptp=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-map-t),)
+NSS_CLIENTS_MAKE_OPTS+=map-t=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-ovpn-link),)
+NSS_CLIENTS_MAKE_OPTS+=ovpn-link=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tunipip6),)
+NSS_CLIENTS_MAKE_OPTS+=tunipip6=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-igs),)
+NSS_CLIENTS_MAKE_OPTS+=igs=y
+endif
+
 ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-netlink),)
 NSS_CLIENTS_MAKE_OPTS+=netlink=y
 endif
@ -124,10 +522,8 @@ ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-qdisc),)
 NSS_CLIENTS_MAKE_OPTS+=qdisc=y
 endif

-ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
-    SOC="ipq807x_64"
-else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
-    SOC="ipq60xx_64"
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-match),)
+NSS_CLIENTS_MAKE_OPTS+=match=y
 endif

 define Build/Compile
@ -136,13 +532,33 @@ define Build/Compile
      ARCH="$(LINUX_KARCH)" \
      M="$(PKG_BUILD_DIR)" \
      EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+      DTLSMGR_DIR="$(DTLSMGR_DIR)" \
+	    IPSECMGR_DIR="$(IPSECMGR_DIR)" \
      SoC=$(SOC) \
      $(KERNEL_MAKE_FLAGS) \
      modules
 endef

+$(eval $(call KernelPackage,qca-nss-drv-gre))
+$(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-ipsecmgr))
 $(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
+$(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
+$(eval $(call KernelPackage,qca-nss-drv-eogremgr))
+$(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
 $(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
+$(eval $(call KernelPackage,qca-nss-drv-vxlanmgr))
+$(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
+$(eval $(call KernelPackage,qca-nss-drv-ovpn-mgr))
+$(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
+$(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
+$(eval $(call KernelPackage,qca-nss-drv-ovpn-link))
+$(eval $(call KernelPackage,qca-nss-drv-match))
+$(eval $(call KernelPackage,qca-nss-drv-map-t))
+$(eval $(call KernelPackage,qca-nss-drv-tunipip6))
+$(eval $(call KernelPackage,qca-nss-drv-tun6rd))
 $(eval $(call KernelPackage,qca-nss-drv-qdisc))
+$(eval $(call KernelPackage,qca-nss-drv-igs))
 $(eval $(call KernelPackage,qca-nss-drv-netlink))
--- a/qca/qca-nss-clients/patches/0002-kernel-5.4-support-gre.patch
+++ b/qca/qca-nss-clients/patches/0002-kernel-5.4-support-gre.patch
@ -0,0 +1,31 @@
+--- a/gre/nss_connmgr_gre_v6.c
+++ b/gre/nss_connmgr_gre_v6.c
+@@ -95,7 +95,8 @@ static int nss_connmgr_gre_v6_get_mac_ad
+ 	/*
+ 	 * Find src MAC address
+ 	 */
+-	local_dev = (struct net_device *)ipv6_dev_find(&init_net, &src_addr, 1);
+	local_dev = NULL;
+	local_dev = (struct net_device *)ipv6_dev_find(&init_net, &src_addr, local_dev);
+ 	if (!local_dev) {
+ 		nss_connmgr_gre_warning("Unable to find local dev for %pI6", src_ip);
+ 		return GRE_ERR_NO_LOCAL_NETDEV;
+--- a/gre/test/nss_connmgr_gre_test.c
+++ b/gre/test/nss_connmgr_gre_test.c
+@@ -229,10 +229,12 @@ static int nss_connmgr_gre_test_open_pro
+ /*
+  * Proc ops
+  */
+-static const struct file_operations nss_connmgr_gre_test_proc_ops =  {
+-	.open =  nss_connmgr_gre_test_open_proc,
+-	.write = nss_connmgr_gre_test_write_proc,
+-	.read = seq_read,
+static const struct proc_ops nss_connmgr_gre_test_proc_ops =  {
+	.proc_open	= nss_connmgr_gre_test_open_proc,
+	.proc_read	= seq_read,
+	.proc_lseek	= seq_lseek,
+	.proc_release	= single_release,
+	.proc_write	= nss_connmgr_gre_test_write_proc,
+ };
+
+ /*
--- a/qca/qca-nss-clients/patches/0003-kernel-5.4-support-ipsec.patch
+++ b/qca/qca-nss-clients/patches/0003-kernel-5.4-support-ipsec.patch
@ -0,0 +1,29 @@
+--- a/ipsecmgr/v1.0/nss_ipsecmgr.c
+++ b/ipsecmgr/v1.0/nss_ipsecmgr.c
+@@ -377,7 +377,7 @@ free:
+  * nss_ipsecmgr_tunnel_stats()
+  * 	get tunnel statistics
+  */
+-static struct rtnl_link_stats64 *nss_ipsecmgr_tunnel_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
+void nss_ipsecmgr_tunnel_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
+ {
+ 	struct nss_ipsecmgr_priv *priv = netdev_priv(dev);
+
+@@ -389,8 +389,6 @@ static struct rtnl_link_stats64 *nss_ips
+ 	read_lock_bh(&ipsecmgr_ctx->lock);
+ 	memcpy(stats, &priv->stats, sizeof(struct rtnl_link_stats64));
+ 	read_unlock_bh(&ipsecmgr_ctx->lock);
+-
+-	return stats;
+ }
+
+ /*
+@@ -442,7 +440,7 @@ static void nss_ipsecmgr_tunnel_setup(st
+ 	dev->header_ops = NULL;
+ 	dev->netdev_ops = &nss_ipsecmgr_tunnel_ops;
+
+-	dev->destructor = nss_ipsecmgr_tunnel_free;
+	dev->priv_destructor = nss_ipsecmgr_tunnel_free;
+
+ 	/*
+ 	 * get the MAC address from the ethernet device
--- a/qca/qca-nss-clients/patches/0004-kernel-5.4-support-dtls.patch
+++ b/qca/qca-nss-clients/patches/0004-kernel-5.4-support-dtls.patch
@ -0,0 +1,11 @@
+--- a/dtls/v1.0/nss_connmgr_dtls_netdev.c
+++ b/dtls/v1.0/nss_connmgr_dtls_netdev.c
+@@ -160,7 +160,7 @@ static void nss_dtlsmgr_dev_setup(struct
+ 	dev->ethtool_ops = NULL;
+ 	dev->header_ops = NULL;
+ 	dev->netdev_ops = &nss_dtlsmgr_session_ops;
+-	dev->destructor = NULL;
+	dev->priv_destructor = NULL;
+
+ 	memcpy(dev->dev_addr, "\xaa\xbb\xcc\xdd\xee\xff", dev->addr_len);
+ 	memset(dev->broadcast, 0xff, dev->addr_len);
--- a/qca/qca-nss-clients/patches/0005-vlanmgr-fix-compile-error.patch
+++ b/qca/qca-nss-clients/patches/0005-vlanmgr-fix-compile-error.patch
@ -0,0 +1,59 @@
+--- a/vlan/nss_vlan_mgr.c
+++ b/vlan/nss_vlan_mgr.c
+@@ -821,8 +821,10 @@ static struct nss_vlan_pvt *nss_vlan_mgr
+  */
+ static void nss_vlan_mgr_instance_free(struct nss_vlan_pvt *v)
+ {
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
+ 	int32_t i;
+ 	int ret = 0;
+#endif
+
+ 	spin_lock(&vlan_mgr_ctx.lock);
+ 	BUG_ON(--v->refs);
+@@ -980,8 +982,11 @@ static int nss_vlan_mgr_register_event(s
+ 	int ret;
+ #endif
+ 	uint32_t vlan_tag;
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
+ 	struct net_device *slave;
+-	int32_t port, port_if;
+	int32_t port;
+#endif
+	int32_t port_if;
+ 	struct vlan_dev_priv *vlan;
+ 	struct net_device *real_dev;
+ 	bool is_bond_master = false;
+@@ -1355,8 +1360,10 @@ return_with_error:
+ int nss_vlan_mgr_join_bridge(struct net_device *dev, uint32_t bridge_vsi)
+ {
+ 	struct nss_vlan_pvt *v = nss_vlan_mgr_instance_find_and_ref(dev);
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
+ 	struct net_device *real_dev;
+ 	int ret;
+#endif
+
+ 	if (!v)
+ 		return 0;
+@@ -1416,8 +1423,10 @@ EXPORT_SYMBOL(nss_vlan_mgr_join_bridge);
+ int nss_vlan_mgr_leave_bridge(struct net_device *dev, uint32_t bridge_vsi)
+ {
+ 	struct nss_vlan_pvt *v = nss_vlan_mgr_instance_find_and_ref(dev);
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
+ 	struct net_device *real_dev;
+ 	int ret;
+#endif
+
+ 	if (!v)
+ 		return 0;
+--- a/vlan/Makefile
+++ b/vlan/Makefile
+@@ -8,7 +8,7 @@ ifeq ($(SoC),$(filter $(SoC),ipq807x ipq
+ ccflags-y += -DNSS_VLAN_MGR_PPE_SUPPORT
+ endif
+
+-ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=0
+ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=4
+ ccflags-y += -Wall -Werror
+
+ ifneq (,$(filter $(CONFIG_BONDING),y m))
--- a/qca/qca-nss-clients/patches/0006-match-fix-compile-error.patch
+++ b/qca/qca-nss-clients/patches/0006-match-fix-compile-error.patch
@ -0,0 +1,25 @@
+--- a/match/nss_match_priv.h
+++ b/match/nss_match_priv.h
+@@ -29,19 +29,19 @@
+ /*
+  * Statically compile messages at different levels
+  */
+-#if (NSS_match_DEBUG_LEVEL < 2)
+#if (NSS_MATCH_DEBUG_LEVEL < 2)
+ #define nss_match_warn(s, ...)
+ #else
+ #define nss_match_warn(s, ...) pr_warn("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+ #endif
+
+-#if (NSS_match_DEBUG_LEVEL < 3)
+#if (NSS_MATCH_DEBUG_LEVEL < 3)
+ #define nss_match_info(s, ...)
+ #else
+ #define nss_match_info(s, ...)   pr_notice("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+ #endif
+
+-#if (NSS_match_DEBUG_LEVEL < 4)
+#if (NSS_MATCH_DEBUG_LEVEL < 4)
+ #define nss_match_trace(s, ...)
+ #else
+ #define nss_match_trace(s, ...)  pr_info("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
--- a/qca/qca-nss-clients/patches/0007-bridge-fix-compile-error.patch
+++ b/qca/qca-nss-clients/patches/0007-bridge-fix-compile-error.patch
@ -0,0 +1,29 @@
+--- a/bridge/nss_bridge_mgr.c
+++ b/bridge/nss_bridge_mgr.c
+@@ -1062,8 +1062,10 @@ int nss_bridge_mgr_register_br(struct ne
+ 	 */
+ 	b_pvt->ifnum = ifnum;
+ 	b_pvt->mtu = dev->mtu;
+#if defined(NSS_BRIDGE_MGR_PPE_SUPPORT)
+ 	b_pvt->wan_if_num = -1;
+ 	b_pvt->wan_if_enabled = false;
+#endif
+ 	ether_addr_copy(b_pvt->dev_addr, dev->dev_addr);
+ 	spin_lock(&br_mgr_ctx.lock);
+ 	list_add(&b_pvt->list, &br_mgr_ctx.list);
+@@ -1125,6 +1127,7 @@ static int nss_bridge_mgr_bond_slave_cha
+ 		return NOTIFY_DONE;
+ 	}
+
+#if defined(NSS_BRIDGE_MGR_PPE_SUPPORT)
+ 	/*
+ 	 * Add or remove the slave based based on linking event
+ 	 */
+@@ -1139,6 +1142,7 @@ static int nss_bridge_mgr_bond_slave_cha
+ 					cu_info->upper_dev->name, master->name);
+ 		}
+ 	}
+#endif
+
+ 	return NOTIFY_DONE;
+ }
--- a/qca/qca-nss-clients/patches/0008-profiler-fix-compile-error.patch
+++ b/qca/qca-nss-clients/patches/0008-profiler-fix-compile-error.patch
@ -0,0 +1,61 @@
+--- a/profiler/profile.c
+++ b/profiler/profile.c
+@@ -31,6 +31,7 @@
+ #include <linux/fs.h>
+ #include <linux/page-flags.h>
+ #include <linux/sched.h>
+#include <linux/version.h>
+ #include <asm/uaccess.h>
+ #include <asm/page.h>
+ #include <asm/thread_info.h>
+@@ -937,12 +938,26 @@ static ssize_t debug_if(struct file *fil
+ 	return	count;
+ }
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
+#define HAVE_PROC_OPS
+#endif
+
+#ifdef HAVE_PROC_OPS
+static const struct proc_ops profile_fops = {
+  .proc_open = profile_open,
+  .proc_read = profile_read,
+  .proc_lseek = seq_lseek,
+  .proc_release = profile_release,
+  .proc_write = debug_if,
+};
+#else
+ static const struct file_operations profile_fops = {
+ 	.open		= profile_open,
+ 	.read		= profile_read,
+ 	.release	= profile_release,
+ 	.write		= debug_if,
+ };
+#endif
+
+ /*
+  * showing sample status on Linux console
+@@ -971,6 +986,15 @@ static ssize_t profile_rate_write(struct
+ 	return 0;
+ }
+
+#ifdef HAVE_PROC_OPS
+static const struct proc_ops profile_rate_fops = {
+  .proc_open = profile_rate_open,
+  .proc_read = seq_read,
+  .proc_lseek = seq_lseek,
+  .proc_release = single_release,
+  .proc_write = profile_rate_write,
+};
+#else
+ static const struct file_operations profile_rate_fops = {
+ 	.open		= profile_rate_open,
+ 	.read		= seq_read,
+@@ -978,6 +1002,7 @@ static const struct file_operations prof
+ 	.release	= single_release,
+ 	.write		= profile_rate_write,
+ };
+#endif
+
+ /*
+  * hexdump
--- a/qca/qca-nss-clients/patches/0009-gre-fix-compile-error.patch
+++ b/qca/qca-nss-clients/patches/0009-gre-fix-compile-error.patch
@ -0,0 +1,17 @@
+--- a/gre/nss_connmgr_gre_v4.c
+++ b/gre/nss_connmgr_gre_v4.c
+@@ -172,14 +172,6 @@ int nss_connmgr_gre_v4_set_config(struct
+ 		}
+ 	}
+
+-	/*
+-	 * IP address validate
+-	 */
+-	if ((cfg->src_ip == 0) || (cfg->dest_ip == 0)) {
+-		nss_connmgr_gre_warning("Source ip/Destination IP is invalid");
+-		return GRE_ERR_INVALID_IP;
+-	}
+-
+ 	memset(t, 0, sizeof(struct ip_tunnel));
+
+ 	priv->pad_len =  (cfg->add_padding) ? GRE_HDR_PAD_LEN : 0;
--- a/qca/qca-nss-clients/patches/0010-fix-portifmgr.patch
+++ b/qca/qca-nss-clients/patches/0010-fix-portifmgr.patch
@ -0,0 +1,35 @@
+--- a/portifmgr/nss_portifmgr.c
+++ b/portifmgr/nss_portifmgr.c
+@@ -187,16 +187,20 @@ drop:
+ }
+
+ /*
+- * nss_portifmgr_get_stats()
+ * nss_portifmgr_get_stats64()
+  *	Netdev get stats function to get port stats
+  */
+-static struct rtnl_link_stats64 *nss_portifmgr_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)
+/*
+ * nss_nlgre_redir_cmn_dev_stats64
+ *	Report packet statistics to linux
+ */
+static void nss_portifmgr_get_stats64(struct net_device *dev,
+		struct rtnl_link_stats64 *stats)
+ {
+ 	struct nss_portifmgr_priv *priv = (struct nss_portifmgr_priv *)netdev_priv(dev);
+ 	BUG_ON(priv == NULL);
+
+ 	nss_portid_get_stats(priv->if_num, stats);
+-	return stats;
+ }
+
+ /*
+@@ -225,7 +229,7 @@ static const struct net_device_ops nss_p
+ 	.ndo_start_xmit		= nss_portifmgr_start_xmit,
+ 	.ndo_set_mac_address	= eth_mac_addr,
+ 	.ndo_change_mtu		= nss_portifmgr_change_mtu,
+-	.ndo_get_stats64	= nss_portifmgr_get_stats,
+	.ndo_get_stats64	= nss_portifmgr_get_stats64,
+ };
+
+ /*
--- a/qca/qca-nss-clients/patches/0011-dtlsmgr-fix-SHA-header-include-in-5.15.patch
+++ b/qca/qca-nss-clients/patches/0011-dtlsmgr-fix-SHA-header-include-in-5.15.patch
@ -0,0 +1,48 @@
+--- a/dtls/v2.0/nss_dtlsmgr.c
+++ b/dtls/v2.0/nss_dtlsmgr.c
+@@ -38,7 +38,13 @@
+ #include <crypto/aes.h>
+ #include <crypto/authenc.h>
+ #include <crypto/des.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+ #include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+#endif
+ #include <crypto/skcipher.h>
+ #include <crypto/hash.h>
+
+--- a/dtls/v2.0/nss_dtlsmgr_ctx.c
+++ b/dtls/v2.0/nss_dtlsmgr_ctx.c
+@@ -40,7 +40,13 @@
+ #include <crypto/aes.h>
+ #include <crypto/authenc.h>
+ #include <crypto/des.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+ #include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+#endif
+ #include <crypto/skcipher.h>
+ #include <crypto/hash.h>
+
+--- a/dtls/v2.0/nss_dtlsmgr_ctx_dev.c
+++ b/dtls/v2.0/nss_dtlsmgr_ctx_dev.c
+@@ -36,7 +36,13 @@
+ #include <net/protocol.h>
+ #include <net/route.h>
+ #include <crypto/aes.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+ #include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+#endif
+
+ #include <nss_api_if.h>
+ #include <nss_dynamic_interface.h>
--- a/qca/qca-nss-clients/patches/0012-dtlsmgr-fix-debug-print-in-5.15.patch
+++ b/qca/qca-nss-clients/patches/0012-dtlsmgr-fix-debug-print-in-5.15.patch
@ -0,0 +1,36 @@
+--- a/dtls/v2.0/nss_dtlsmgr_private.h
+++ b/dtls/v2.0/nss_dtlsmgr_private.h
+@@ -36,9 +36,9 @@
+ /*
+  * Compile messages for dynamic enable/disable
+  */
+-#define nss_dtlsmgr_warn(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+-#define nss_dtlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+-#define nss_dtlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+#define nss_dtlsmgr_warn(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+#define nss_dtlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+#define nss_dtlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+ #else
+
+ /*
+@@ -46,17 +46,17 @@
+  */
+ #define nss_dtlsmgr_warn(s, ...) {	\
+ 	if (NSS_DTLSMGR_DEBUG_LEVEL > NSS_DTLSMGR_DEBUG_LEVEL_ERROR)	\
+-		pr_warn("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)	\
+		pr_warn("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+ }
+
+ #define nss_dtlsmgr_info(s, ...) {	\
+ 	if (NSS_DTLSMGR_DEBUG_LEVEL > NSS_DTLSMGR_DEBUG_LEVEL_WARN)	\
+-		pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)	\
+		pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+ }
+
+ #define nss_dtlsmgr_trace(s, ...) {	\
+ 	if (NSS_DTLSMGR_DEBUG_LEVEL > NSS_DTLSMGR_DEBUG_LEVEL_INFO)	\
+-		pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)	\
+		pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+ }
+
+ #endif /* CONFIG_DYNAMIC_DEBUG */
--- a/qca/qca-nss-clients/patches/0013-tlsmgr-fix-SHA-header-include-in-5.15.patch
+++ b/qca/qca-nss-clients/patches/0013-tlsmgr-fix-SHA-header-include-in-5.15.patch
@ -0,0 +1,32 @@
+--- a/tls/nss_tlsmgr_crypto.c
+++ b/tls/nss_tlsmgr_crypto.c
+@@ -41,7 +41,13 @@
+ #include <crypto/aes.h>
+ #include <crypto/authenc.h>
+ #include <crypto/des.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+ #include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+#endif
+ #include <crypto/skcipher.h>
+ #include <crypto/hash.h>
+ #include <crypto/internal/hash.h>
+--- a/tls/nss_tlsmgr_tun.c
+++ b/tls/nss_tlsmgr_tun.c
+@@ -35,7 +35,13 @@
+ #include <linux/atomic.h>
+ #include <linux/tlshdr.h>
+ #include <crypto/aes.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+ #include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+#endif
+
+ #include <nss_api_if.h>
+ #include <nss_dynamic_interface.h>
--- a/qca/qca-nss-clients/patches/0014-ovpnmgr-fix-SHA-header-include-in-5.15.patch
+++ b/qca/qca-nss-clients/patches/0014-ovpnmgr-fix-SHA-header-include-in-5.15.patch
@ -0,0 +1,32 @@
+--- a/openvpn/src/nss_ovpnmgr_crypto.c
+++ b/openvpn/src/nss_ovpnmgr_crypto.c
+@@ -28,7 +28,13 @@
+ #include <crypto/aes.h>
+ #include <crypto/authenc.h>
+ #include <crypto/des.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+ #include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+#endif
+ #include <crypto/hash.h>
+
+ #include <nss_api_if.h>
+--- a/openvpn/src/nss_ovpnmgr_route.c
+++ b/openvpn/src/nss_ovpnmgr_route.c
+@@ -34,7 +34,13 @@
+ #include <crypto/aes.h>
+ #include <crypto/authenc.h>
+ #include <crypto/des.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+ #include <crypto/sha.h>
+#else
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+#endif
+ #include <crypto/hash.h>
+
+ #include <nss_api_if.h>
--- a/qca/qca-nss-clients/patches/0015-tunipip6-fix-compile-error-in-5.15.patch
+++ b/qca/qca-nss-clients/patches/0015-tunipip6-fix-compile-error-in-5.15.patch
@ -0,0 +1,11 @@
+--- a/tunipip6/nss_connmgr_tunipip6.c
+++ b/tunipip6/nss_connmgr_tunipip6.c
+@@ -258,7 +258,7 @@ static void nss_tunipip6_decap_exception
+ 	struct iphdr *iph;
+ 	struct rtable *rt;
+ 	int cpu;
+-	int8_t ver = skb->data[0] >> 4;
+	__attribute__((unused)) int8_t ver = skb->data[0] >> 4;
+
+ 	nss_tunipip6_trace("%px: received - %d bytes name %s ver %x\n",
+ 			dev, skb->len, dev->name, ver);
--- a/qca/qca-nss-clients/patches/0016-vxlanmgr-fix-compile-error-in-5.15.patch
+++ b/qca/qca-nss-clients/patches/0016-vxlanmgr-fix-compile-error-in-5.15.patch
@ -0,0 +1,11 @@
+--- a/vxlanmgr/nss_vxlanmgr.c
+++ b/vxlanmgr/nss_vxlanmgr.c
+@@ -84,7 +84,7 @@ int32_t nss_vxlanmgr_bind_ipsec_by_ip(un
+ {
+ 	int32_t ipsec_if_num;
+ 	nss_vxlanmgr_get_ipsec_if_num_by_ip_callback_t ipsec_cb;
+-	struct nss_ctx_instance *nss_ctx = nss_vxlan_get_ctx();
+	__attribute__((unused)) struct nss_ctx_instance *nss_ctx = nss_vxlan_get_ctx();
+
+ 	/*
+ 	 * Check if the VxLAN interface is applied over an IPsec interface by querying the IPsec.
--- a/qca/qca-nss-clients/patches/0017-tlsmgr-fix-debug-print-in-5.15.patch
+++ b/qca/qca-nss-clients/patches/0017-tlsmgr-fix-debug-print-in-5.15.patch
@ -0,0 +1,34 @@
+--- a/tls/nss_tlsmgr_priv.h
+++ b/tls/nss_tlsmgr_priv.h
+@@ -28,7 +28,7 @@
+ #define NSS_TLSMGR_DEBUG_LEVEL_INFO 3
+ #define NSS_TLSMGR_DEBUG_LEVEL_TRACE 4
+
+-#define nss_tlsmgr_info_always(s, ...) pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+#define nss_tlsmgr_info_always(s, ...) pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+
+ #define nss_tlsmgr_error(s, ...) do {	\
+ 	if (net_ratelimit()) {	\
+@@ -43,18 +43,18 @@
+ } while (0)
+
+ #if defined(CONFIG_DYNAMIC_DEBUG)
+-#define nss_tlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+-#define nss_tlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)
+#define nss_tlsmgr_info(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+#define nss_tlsmgr_trace(s, ...) pr_debug("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);
+ #else
+
+ #define nss_tlsmgr_info(s, ...) {	\
+ 	if (NSS_TLSMGR_DEBUG_LEVEL > NSS_TLSMGR_DEBUG_LEVEL_WARN)	\
+-		pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)	\
+		pr_notice("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+ }
+
+ #define nss_tlsmgr_trace(s, ...) {	\
+ 	if (NSS_TLSMGR_DEBUG_LEVEL > NSS_TLSMGR_DEBUG_LEVEL_INFO)	\
+-		pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__)	\
+		pr_info("%s[%d]:" s "\n", __func__, __LINE__, ##__VA_ARGS__);	\
+ }
+
+ #endif /* CONFIG_DYNAMIC_DEBUG */