From 82cdd5f8083c7fdcb49497c55a2129cbc53eebd6 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Thu, 15 Aug 2019 00:38:38 +0200
Subject: [PATCH] targets: adapt ath10k selection to OpenWrt 19.07

This changes the ath10k firmware and driver selection, as
ath10k-ct is now the default in upstream OpenWrt.

However, for 802.11s operation we need the QCA firmware and driver.
---
 targets/ar71xx-generic |  8 ++++----
 targets/ar71xx-nand    |  4 ++--
 targets/ipq40xx        | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/targets/ar71xx-generic b/targets/ar71xx-generic
index 92812b43..4d306417 100644
--- a/targets/ar71xx-generic
+++ b/targets/ar71xx-generic
@@ -4,10 +4,10 @@ config 'CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=64'
 local ATH10K_PACKAGES = {}
 local ATH10K_PACKAGES_QCA9887 = {}
 local ATH10K_PACKAGES_QCA9888 = {}
-if env.GLUON_WLAN_MESH == 'ibss' then
-	ATH10K_PACKAGES = {'-kmod-ath10k', 'kmod-ath10k-ct', '-ath10k-firmware-qca988x', 'ath10k-firmware-qca988x-ct'}
-	ATH10K_PACKAGES_QCA9887 = {'-kmod-ath10k', 'kmod-ath10k-ct', '-ath10k-firmware-qca9887', 'ath10k-firmware-qca9887-ct'}
-	ATH10K_PACKAGES_QCA9888 = {'-kmod-ath10k', 'kmod-ath10k-ct', '-ath10k-firmware-qca9888', 'ath10k-firmware-qca9888-ct'}
+if env.GLUON_WLAN_MESH == '11s' then
+	ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
+	ATH10K_PACKAGES_QCA9887 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9887', '-ath10k-firmware-qca9887-ct'}
+	ATH10K_PACKAGES_QCA9888 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9888', '-ath10k-firmware-qca9888-ct'}
 end
 
 
diff --git a/targets/ar71xx-nand b/targets/ar71xx-nand
index 3ba2671a..dcedccb8 100644
--- a/targets/ar71xx-nand
+++ b/targets/ar71xx-nand
@@ -1,8 +1,8 @@
 config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
 
 local ATH10K_PACKAGES = {}
-if env.GLUON_WLAN_MESH == 'ibss' then
-	ATH10K_PACKAGES = {'-kmod-ath10k', 'kmod-ath10k-ct', '-ath10k-firmware-qca988x', 'ath10k-firmware-qca988x-ct'}
+if env.GLUON_WLAN_MESH == '11s' then
+	ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
 end
 
 
diff --git a/targets/ipq40xx b/targets/ipq40xx
index f3c3c33b..e7a67f75 100644
--- a/targets/ipq40xx
+++ b/targets/ipq40xx
@@ -1,19 +1,19 @@
 local ATH10K_PACKAGES_IPQ40XX = {}
-local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {'ath10k-firmware-qca9888'}
-if env.GLUON_WLAN_MESH == 'ibss' then
+local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {}
+if env.GLUON_WLAN_MESH == '11s' then
 	ATH10K_PACKAGES_IPQ40XX = {
-		'-kmod-ath10k',
-		'kmod-ath10k-ct',
-		'-ath10k-firmware-qca4019',
-		'ath10k-firmware-qca4019-ct',
+		'kmod-ath10k',
+		'-kmod-ath10k-ct',
+		'ath10k-firmware-qca4019',
+		'-ath10k-firmware-qca4019-ct',
 	}
 	ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
-		'-kmod-ath10k',
-		'kmod-ath10k-ct',
-		'-ath10k-firmware-qca4019',
-		'ath10k-firmware-qca4019-ct',
-		'-ath10k-firmware-qca9888',
-		'ath10k-firmware-qca9888-ct',
+		'kmod-ath10k',
+		'-kmod-ath10k-ct',
+		'ath10k-firmware-qca4019',
+		'-ath10k-firmware-qca4019-ct',
+		'ath10k-firmware-qca9888',
+		'-ath10k-firmware-qca9888-ct',
 	}
 end