From 22c47df2423e6149c4b37d5f70741adcf3365f5d Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sun, 26 Feb 2023 00:54:32 +0100
Subject: [PATCH] Revert "ipq40xx: switch Wave2 firmware to -ct (#2541)"

This is a temporary measure that fixes #2692.

This reverts commit 15ef885836907b27b2c0481f7ea83d1dd504c5d5.
---
 targets/ath79-generic   |  8 +++++++-
 targets/ipq40xx-generic | 18 ++++++++++++++++--
 targets/ipq806x-generic |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/targets/ath79-generic b/targets/ath79-generic
index 5fe00861..c03bf231 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -39,7 +39,13 @@ local ATH10K_PACKAGES_SMALLBUFFERS_QCA9887 = {
 	'-ath10k-firmware-qca9887-ct',
 }
 
-local ATH10K_PACKAGES_QCA9888 = {}
+local ATH10K_PACKAGES_QCA9888 = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'-kmod-ath10k-ct-smallbuffers',
+	'ath10k-firmware-qca9888',
+	'-ath10k-firmware-qca9888-ct',
+}
 
 -- ALFA NETWORK
 
diff --git a/targets/ipq40xx-generic b/targets/ipq40xx-generic
index a7c8f03a..bed12c9c 100644
--- a/targets/ipq40xx-generic
+++ b/targets/ipq40xx-generic
@@ -1,5 +1,19 @@
-local ATH10K_PACKAGES_IPQ40XX = {}
-local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {}
+local ATH10K_PACKAGES_IPQ40XX = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'-kmod-ath10k-ct-smallbuffers',
+	'ath10k-firmware-qca4019',
+	'-ath10k-firmware-qca4019-ct',
+}
+local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'-kmod-ath10k-ct-smallbuffers',
+	'ath10k-firmware-qca4019',
+	'-ath10k-firmware-qca4019-ct',
+	'ath10k-firmware-qca9888',
+	'-ath10k-firmware-qca9888-ct',
+}
 
 
 defaults {
diff --git a/targets/ipq806x-generic b/targets/ipq806x-generic
index 9a94194a..1b3263fc 100644
--- a/targets/ipq806x-generic
+++ b/targets/ipq806x-generic
@@ -4,7 +4,7 @@
 -- The QCA9984 on the other hand works fine for 11s meshes on both bands.
 
 local QCA9980_PACKAGES = {'-kmod-ath10k', 'kmod-ath10k-ct', '-ath10k-firmware-qca99x0', 'ath10k-firmware-qca99x0-ct'}
-local QCA9984_PACKAGES = {}
+local QCA9984_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9984', '-ath10k-firmware-qca9984-ct'}
 
 
 --