From ddb3b3bce1e01ccad1c68f2256bd385311b3fd6e Mon Sep 17 00:00:00 2001
From: AgustinLorenzo <agustin.lorenzo@thinco.es>
Date: Sun, 8 Sep 2024 03:31:23 +0200
Subject: [PATCH] [6.6] WiFi NSS Mesh: Downgrade the NSS firmware to 11.4 for
 restore of working of WiFi Mesh through NSS

---
 .full_config                   | 12 ++++++------
 .github/workflows/ipq807x.yaml | 12 +++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.full_config b/.full_config
index 0a938f5dc2b919..c70a370283f581 100644
--- a/.full_config
+++ b/.full_config
@@ -2156,9 +2156,9 @@ CONFIG_PACKAGE_nss-firmware-default=y
 # Select NSS firmware version
 #
 # CONFIG_NSS_FIRMWARE_VERSION_12_5 is not set
-CONFIG_NSS_FIRMWARE_VERSION_12_2=y
+# CONFIG_NSS_FIRMWARE_VERSION_12_2 is not set
 # CONFIG_NSS_FIRMWARE_VERSION_12_1 is not set
-# CONFIG_NSS_FIRMWARE_VERSION_11_4 is not set
+CONFIG_NSS_FIRMWARE_VERSION_11_4=y
 # end of NSS Firmware Version
 
 CONFIG_PACKAGE_nss-firmware-ipq8074=y
@@ -2834,7 +2834,7 @@ CONFIG_NSS_DRV_VLAN_ENABLE=y
 # CONFIG_NSS_DRV_VXLAN_ENABLE is not set
 CONFIG_NSS_DRV_WIFIOFFLOAD_ENABLE=y
 CONFIG_NSS_DRV_WIFI_EXT_VDEV_ENABLE=y
-# CONFIG_NSS_DRV_WIFI_MESH_ENABLE is not set
+CONFIG_NSS_DRV_WIFI_MESH_ENABLE=y
 # CONFIG_NSS_DRV_WIFI_LEGACY_ENABLE is not set
 # end of Configuration
 
@@ -2854,7 +2854,7 @@ CONFIG_PACKAGE_kmod-qca-nss-drv-tun6rd=y
 # CONFIG_PACKAGE_kmod-qca-nss-drv-tunipip6 is not set
 CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr=y
 # CONFIG_PACKAGE_kmod-qca-nss-drv-vxlanmgr is not set
-# CONFIG_PACKAGE_kmod-qca-nss-drv-wifi-meshmgr is not set
+CONFIG_PACKAGE_kmod-qca-nss-drv-wifi-meshmgr=y
 # CONFIG_PACKAGE_kmod-qca-nss-macsec is not set
 CONFIG_PACKAGE_kmod-qca-ssdk=y
 # CONFIG_PACKAGE_kmod-qlcnic is not set
@@ -3253,7 +3253,7 @@ CONFIG_PACKAGE_kmod-ath11k=y
 # CONFIG_ATH11K_DEBUGFS_STA is not set
 # CONFIG_ATH11K_DEBUGFS_HTT_STATS is not set
 CONFIG_ATH11K_NSS_SUPPORT=y
-# CONFIG_ATH11K_NSS_MESH_SUPPORT is not set
+CONFIG_ATH11K_NSS_MESH_SUPPORT=y
 # CONFIG_ATH11K_MEM_PROFILE_1G is not set
 CONFIG_ATH11K_MEM_PROFILE_512M=y
 # CONFIG_ATH11K_MEM_PROFILE_256M is not set
@@ -5724,7 +5724,7 @@ CONFIG_PACKAGE_luci-i18n-wol-es=y
 #
 # CONFIG_PACKAGE_apfree-wifidog is not set
 # CONFIG_PACKAGE_coova-chilli is not set
-# CONFIG_PACKAGE_mesh11sd is not set
+CONFIG_PACKAGE_mesh11sd=y
 # CONFIG_PACKAGE_nodogsplash is not set
 # CONFIG_PACKAGE_opennds is not set
 # CONFIG_PACKAGE_uspot is not set
diff --git a/.github/workflows/ipq807x.yaml b/.github/workflows/ipq807x.yaml
index 2f49e633f1b4b1..8106d8c171d3df 100644
--- a/.github/workflows/ipq807x.yaml
+++ b/.github/workflows/ipq807x.yaml
@@ -1,4 +1,4 @@
-name: Build IPQ807x NSS WiFi
+name: Build IPQ807x NSS WiFi Mesh
 
 on: workflow_dispatch
 
@@ -33,6 +33,8 @@ jobs:
                 uci set network.globals.packet_steering=0
                 uci set firewall.@defaults[0].flow_offloading=0
                 uci set ecm.@general[0].enable_bridge_filtering=0
+                /etc/init.d/mesh11sd stop
+                /etc/init.d/mesh11sd disable
                 uci commit
                 EOF
 
@@ -60,10 +62,10 @@ jobs:
             - name: Create a release
               uses: "ncipollo/release-action@v1"
               with:
-                name: "Updated prebuilt images (NSS-WiFi) ${{ env.NOW }}"
-                commit: "main_nss"
-                tag: "ipq807x-nsswifi-${{ env.NOW }}"
+                name: "Updated prebuilt images (NSS-WiFi with Mesh) ${{ env.NOW }}"
+                commit: "main_nss_mesh"
+                tag: "ipq807x-nsswifi-mesh-${{ env.NOW }}"
                 generateReleaseNotes: true
-                makeLatest: true
+                makeLatest: false
                 artifacts: bin/targets/qualcommax/ipq807x/*
                 token: "${{ secrets.GITHUB_TOKEN }}"