From 001d3473925db27c2606e8d2a3a30bd2095f1195 Mon Sep 17 00:00:00 2001
From: Qosmio <datapronix@protonmail.com>
Date: Mon, 29 Jan 2024 17:14:22 -0500
Subject: [PATCH] qca-nss-drv: Fix wifi offload regression

The option for wifi offload is `NSS_DRV_WIFIOFFLOAD_ENABLE` but the
package Makefile was showing it as `NSS_DRV_WIFI_ENABLE` but then enabling the
flag as `NSS_DRV_WIFI_ENABLE`. Incorrectly assumed `NSS_DRV_WIFI_ENABLE`
was the global option. Reverted the change and updated the option to use
`NSS_DRV_WIFIOFFLOAD_ENABLE`.
---
 qca/qca-nss-drv/Config.in                              |  6 +++---
 qca/qca-nss-drv/Makefile                               |  6 +++---
 .../patches/0013-nss-drv-remove-legacy-wifi.patch      | 10 +++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/qca/qca-nss-drv/Config.in b/qca/qca-nss-drv/Config.in
index 6044a55..b2ef0d4 100644
--- a/qca/qca-nss-drv/Config.in
+++ b/qca/qca-nss-drv/Config.in
@@ -175,19 +175,19 @@ config NSS_DRV_VXLAN_ENABLE
 	bool
 	default n
 	prompt "Enable VXLAN"
-config NSS_DRV_WIFI_ENABLE
+config NSS_DRV_WIFIOFFLOAD_ENABLE
 	bool
 	default n
 	prompt "Enable WIFI"
 config NSS_DRV_WIFI_EXT_VDEV_ENABLE
 	bool
 	default n
-	depends on NSS_DRV_WIFI_ENABLE
+	depends on NSS_DRV_WIFIOFFLOAD_ENABLE
 	prompt "Enable WIFI EXT VDEV"
 config NSS_DRV_WIFI_MESH_ENABLE
 	bool
 	default n
-	depends on NSS_DRV_WIFI_ENABLE
+	depends on NSS_DRV_WIFIOFFLOAD_ENABLE
 	prompt "Enable WIFI MESH"
 config NSS_DRV_WIFI_LEGACY_ENABLE
 	bool
diff --git a/qca/qca-nss-drv/Makefile b/qca/qca-nss-drv/Makefile
index b3ed393..5d48902 100644
--- a/qca/qca-nss-drv/Makefile
+++ b/qca/qca-nss-drv/Makefile
@@ -56,7 +56,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_NSS_DRV_VIRT_IF_ENABLE \
 	CONFIG_NSS_DRV_VLAN_ENABLE \
 	CONFIG_NSS_DRV_VXLAN_ENABLE \
-	CONFIG_NSS_DRV_WIFI_ENABLE \
+	CONFIG_NSS_DRV_WIFIOFFLOAD_ENABLE \
 	CONFIG_NSS_DRV_WIFI_EXT_VDEV_ENABLE \
 	CONFIG_NSS_DRV_WIFI_MESH_ENABLE \
 	CONFIG_NSS_DRV_WIFI_LEGACY_ENABLE
@@ -264,8 +264,8 @@ endif
 ifndef CONFIG_NSS_DRV_VXLAN_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_VXLAN_ENABLE=n
 endif
-ifndef CONFIG_NSS_DRV_WIFI_ENABLE
-   DRV_MAKE_OPTS += NSS_DRV_WIFI_ENABLE=n
+ifndef CONFIG_NSS_DRV_WIFIOFFLOAD_ENABLE
+   DRV_MAKE_OPTS += NSS_DRV_WIFIOFFLOAD_ENABLE=n
 endif
 ifndef CONFIG_NSS_DRV_WIFI_EXT_VDEV_ENABLE
    DRV_MAKE_OPTS += NSS_DRV_WIFI_EXT_VDEV_ENABLE=n
diff --git a/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch b/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch
index 58149a8..f1f13f0 100644
--- a/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch
+++ b/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch
@@ -1,13 +1,9 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -350,12 +350,19 @@ qca-nss-drv-objs += \
- 			nss_pppoe_strings.o
- endif
+@@ -351,10 +351,17 @@ endif
  
--ifneq "$(NSS_DRV_WIFIOFFLOAD_ENABLE)" "n"
--ccflags-y += -DNSS_DRV_WIFIOFFLOAD_ENABLE
-+ifneq "$(NSS_DRV_WIFI_ENABLE)" "n"
-+ccflags-y += -DNSS_DRV_WIFI_ENABLE
+ ifneq "$(NSS_DRV_WIFIOFFLOAD_ENABLE)" "n"
+ ccflags-y += -DNSS_DRV_WIFIOFFLOAD_ENABLE
 +ifneq "$(NSS_DRV_WIFI_LEGACY_ENABLE)" "n"
 +ccflags-y += -DNSS_DRV_WIFI_LEGACY_ENABLE
  qca-nss-drv-objs += \