From 0a50fb78b36afc36914dae755c8593fce8adbbcf Mon Sep 17 00:00:00 2001
From: Qosmio <datapronix@protonmail.com>
Date: Fri, 26 Jan 2024 16:33:08 -0500
Subject: [PATCH] qca-nss-drv: Include options to ignore
 QVPN,LSO_RX,MAPT,CAPWAP,UDP_ST

NSS drivers were being built unconditionally for QVPN, LSO_RX, MAPT,
CAPWAP, and UDP_ST when it was not required. Include options to disable
them manually, as well as expose them to be built should any client
in 'qca-nss-clients' require them.
---
 qca/qca-nss-drv/Config.in | 14 +++++++++-----
 qca/qca-nss-drv/Makefile  | 17 +++++++++++++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/qca/qca-nss-drv/Config.in b/qca/qca-nss-drv/Config.in
index c1bd476..43651cb 100644
--- a/qca/qca-nss-drv/Config.in
+++ b/qca/qca-nss-drv/Config.in
@@ -7,6 +7,10 @@ config NSS_DRV_BRIDGE_ENABLE
 	bool
 	default n
 	prompt "Enable BRIDGE"
+config NSS_DRV_CAPWAP_ENABLE
+	bool
+	default n
+	prompt "Enable CAPWAP"
 config NSS_DRV_C2C_ENABLE
 	bool
 	default n
@@ -90,6 +94,10 @@ config NSS_DRV_PORTID_ENABLE
 	bool
 	default n
 	prompt "Enable PORTID"
+config CONFIG_NSS_DRV_LSO_RX_ENABLE
+	bool
+	default n
+	prompt "Enable LSO RX"
 config NSS_DRV_PPE_ENABLE
 	bool
 	default n
@@ -113,11 +121,7 @@ config NSS_DRV_QRFS_ENABLE
 config NSS_DRV_QVPN_ENABLE
 	bool
 	default n
-	prompt "Enable QVPN"
-config NSS_DRV_OVPN_ENABLE
-	bool
-	default n
-	prompt "Enable OVPN"
+	prompt "Enable OpenVpn (QVPN)"
 config NSS_DRV_RMNET_ENABLE
 	bool
 	default n
diff --git a/qca/qca-nss-drv/Makefile b/qca/qca-nss-drv/Makefile
index c8af8c4..bb29354 100644
--- a/qca/qca-nss-drv/Makefile
+++ b/qca/qca-nss-drv/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qca-nss-drv
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-drv.git
 PKG_SOURCE_PROTO:=git
@@ -14,6 +14,7 @@ PKG_FLAGS:=nonshared
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_NSS_DRV_BRIDGE_ENABLE \
+	CONFIG_NSS_DRV_CAPWAP_ENABLE \
 	CONFIG_NSS_DRV_C2C_ENABLE \
 	CONFIG_NSS_DRV_CLMAP_ENABLE \
 	CONFIG_NSS_DRV_CRYPTO_ENABLE \
@@ -28,6 +29,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_NSS_DRV_IPV4_REASM_ENABLE \
 	CONFIG_NSS_DRV_IPV6_ENABLE \
 	CONFIG_NSS_DRV_IPV6_REASM_ENABLE \
+	CONFIG_NSS_DRV_LSO_RX_ENABLE \
 	CONFIG_NSS_DRV_L2TP_ENABLE \
 	CONFIG_NSS_DRV_LAG_ENABLE \
 	CONFIG_NSS_DRV_MAPT_ENABLE \
@@ -41,7 +43,6 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_NSS_DRV_PVXLAN_ENABLE \
 	CONFIG_NSS_DRV_QRFS_ENABLE \
 	CONFIG_NSS_DRV_QVPN_ENABLE \
-	CONFIG_NSS_DRV_OVPN_ENABLE \
 	CONFIG_NSS_DRV_RMNET_ENABLE \
 	CONFIG_NSS_DRV_SHAPER_ENABLE \
 	CONFIG_NSS_DRV_SJACK_ENABLE \
@@ -183,7 +184,7 @@ ifndef CONFIG_NSS_DRV_LAG_ENABLE
 endif
 ifndef CONFIG_NSS_DRV_MAPT_ENABLE
 ifndef CONFIG_PACKAGE_kmod-nat46
-   DRV_MAKE_OPTS += CONFIG_NSS_DRV_MAPT_ENABLE=n
+   DRV_MAKE_OPTS += NSS_DRV_MAPT_ENABLE=n
 endif
 endif
 ifndef CONFIG_NSS_DRV_MATCH_ENABLE
@@ -270,7 +271,15 @@ endif
 ifndef CONFIG_NSS_DRV_WIFI_MESH_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_WIFI_MESH_ENABLE=n
 endif
-
+ifndef NSS_DRV_UDP_ST_ENABLE
+   DRV_MAKE_OPTS += NSS_DRV_UDP_ST_ENABLE=n
+endif
+ifndef CONFIG_NSS_DRV_CAPWAP_ENABLE
+   DRV_MAKE_OPTS += NSS_DRV_CAPWAP_ENABLE=n
+endif
+ifndef CONFIG_NSS_DRV_LSO_RX_ENABLE
+   DRV_MAKE_OPTS += NSS_DRV_LSO_RX_ENABLE=n
+endif
 define Build/Configure
 	$(LN) arch/nss_$(SOC).h $(PKG_BUILD_DIR)/exports/nss_arch.h
 endef