ath10k-firmware: switch to version from LEDE 0a0caa2656c8db73518a1783743ede772e3ac40f

Fixes a memory leak in ath10k.

patches/openwrt/0006-ath10k-firmware-add-Candela-Technologies-firmware-for-QCA988X.patch

@@ -1,72 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 9 Feb 2016 18:22:29 +0100
-Subject: ath10k-firmware: add Candela Technologies firmware for QCA988X
-
-diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
-index b03d644..7d4d449 100644
---- a/package/firmware/ath10k-firmware/Makefile
-+++ b/package/firmware/ath10k-firmware/Makefile
-@@ -44,6 +44,26 @@ define Download/ath10k-firmware-qca988x
- endef
- $(eval $(call Download,ath10k-firmware-qca988x))
- 
-+
-+define Package/ath10k-firmware-qca988x-ct
-+$(Package/ath10k-firmware-default)
-+  TITLE:=ath10k firmware for QCA988x devices (Candela Technologies version)
-+  CONFLICTS:=ath10k-firmware-qca988x
-+endef
-+
-+QCA988X_CT_FIRMWARE_FILE:=firmware-5-ct-full-community.bin
-+
-+define Download/ath10k-firmware-qca988x-ct
-+  # See http://www.candelatech.com/ath10k.php
-+  #URL:=http://www.candelatech.com/downloads/ath10k-10-2/
-+  # Update to beta version (will switch back to official URL after v2 release)
-+  URL:=https://home.universe-factory.net/neoraider/
-+  FILE:=$(QCA988X_CT_FIRMWARE_FILE)
-+  MD5SUM:=9aa205cfd6b98e695ca8e9ae6d1bcb6b
-+endef
-+$(eval $(call Download,ath10k-firmware-qca988x-ct))
-+
-+
- define Package/ath10k-firmware-qca99x0
- $(Package/ath10k-firmware-default)
-   TITLE:=ath10k firmware for QCA99x0 devices
-@@ -79,6 +99,16 @@ define Package/ath10k-firmware-qca988x/install
- 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
- endef
- 
-+define Package/ath10k-firmware-qca988x-ct/install
-+	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-+	$(INSTALL_DATA) \
-+		$(PKG_BUILD_DIR)/QCA988X/board.bin \
-+		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
-+	$(INSTALL_DATA) \
-+		$(DL_DIR)/$(QCA988X_CT_FIRMWARE_FILE) \
-+		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
-+endef
-+
- define Package/ath10k-firmware-qca6174/install
- 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k
- 	$(CP) $(PKG_BUILD_DIR)/QCA6174 $(1)/lib/firmware/ath10k/
-@@ -98,5 +128,6 @@ define Package/ath10k-firmware-qca99x0/install
- endef
- 
- $(eval $(call BuildPackage,ath10k-firmware-qca988x))
-+$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
- $(eval $(call BuildPackage,ath10k-firmware-qca99x0))
- $(eval $(call BuildPackage,ath10k-firmware-qca6174))
-diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 30da1cf..cd8d670 100644
---- a/package/kernel/mac80211/Makefile
-+++ b/package/kernel/mac80211/Makefile
-@@ -247,7 +247,7 @@ define KernelPackage/ath10k
-   $(call KernelPackage/mac80211/Default)
-   TITLE:=Atheros 802.11ac wireless cards support
-   URL:=https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
--  DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY +ath10k-firmware-qca988x
-+  DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY
-   FILES:= \
- 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_core.ko \
- 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_pci.ko

patches/openwrt/0006-ath10k-firmware-update-to-LEDE-0a0caa2656c8db73518a1783743ede772e3ac40f.patch

@@ -0,0 +1,184 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 9 Feb 2016 18:22:29 +0100
+Subject: ath10k-firmware: update to LEDE 0a0caa2656c8db73518a1783743ede772e3ac40f
+
+diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
+index b03d644..4f63cdd 100644
+--- a/package/firmware/ath10k-firmware/Makefile
++++ b/package/firmware/ath10k-firmware/Makefile
+@@ -8,7 +8,7 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=ath10k-firmware
+-PKG_SOURCE_VERSION:=77f72b5f7dd940386d9e619a17904987759b7186
++PKG_SOURCE_VERSION:=b00eb8d30fbebb6a5047ccacefa8c37e072fca9c
+ PKG_VERSION:=2014-11-13-$(PKG_SOURCE_VERSION)
+ PKG_RELEASE:=1
+ 
+@@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+ PKG_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
+ 
+-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
++PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+ 
+ include $(INCLUDE_DIR)/package.mk
+ 
+@@ -28,14 +28,18 @@ define Package/ath10k-firmware-default
+   CATEGORY:=Kernel modules
+   SUBMENU:=$(WMENU)
+   URL:=$(PKG_SOURCE_URL)
++  DEPENDS:=kmod-ath10k
+ endef
+ 
+ define Package/ath10k-firmware-qca988x
+ $(Package/ath10k-firmware-default)
++  DEFAULT:=PACKAGE_kmod-ath10k
+   TITLE:=ath10k firmware for QCA988x devices
+ endef
+ 
+ QCA988X_FIRMWARE_FILE:=firmware-5.bin_10.2.4.97-1
++QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-16.bin-lede
++QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-7.bin-lede.001
+ 
+ define Download/ath10k-firmware-qca988x
+   URL:=https://www.codeaurora.org/cgit/quic/qsdk/oss/firmware/ath10k-firmware/plain/10.2.4/
+@@ -44,11 +48,63 @@ define Download/ath10k-firmware-qca988x
+ endef
+ $(eval $(call Download,ath10k-firmware-qca988x))
+ 
++define Download/ath10k-firmware-qca988x-ct
++  URL:=https://www.candelatech.com/downloads/
++  FILE:=$(QCA988X_FIRMWARE_FILE_CT)
++  MD5SUM:=5b651c0458bcf5c20701308b5e519976
++endef
++$(eval $(call Download,ath10k-firmware-qca988x-ct))
++
++define Download/ath10k-firmware-qca99x0-ct
++  URL:=https://www.candelatech.com/downloads/ath10k-10-4/
++  FILE:=$(QCA99X0_FIRMWARE_FILE_CT)
++  MD5SUM:=eb710949ff79142954aadae24616169c
++endef
++$(eval $(call Download,ath10k-firmware-qca99x0-ct))
++
+ define Package/ath10k-firmware-qca99x0
+ $(Package/ath10k-firmware-default)
+   TITLE:=ath10k firmware for QCA99x0 devices
+ endef
+ 
++define Package/ath10k-firmware-qca988x-ct
++$(Package/ath10k-firmware-default)
++  TITLE:=ath10k CT 10.1 firmware for QCA988x devices
++endef
++
++define Package/ath10k-firmware-qca988x-ct/description
++Alternative ath10k firmware for QCA988X from Candela Technologies.
++Enables IBSS and other features.  See:
++http://www.candelatech.com/ath10k-10.1.php
++This firmware will NOT be used unless the standard ath10k-firmware-qca988x
++is un-selected since the driver will try to load firmware-5.bin before
++firmware-2.bin
++endef
++
++define Package/ath10k-firmware-qca99x0-ct/description
++Alternative ath10k firmware for QCA99x0 from Candela Technologies.
++Enables IBSS and other features.  See:
++http://www.candelatech.com/ath10k-10.4.php
++This firmware conflicts with the standard 99x0 firmware, so select only
++one.
++endef
++
++define Package/ath10k-firmware-qca99x0/description
++Standard ath10k firmware for QCA99x0 from QCA
++This firmware conflicts with the CT 99x0 firmware, so select only
++one.
++endef
++
++define Package/ath10k-firmware-qca99x0-ct
++$(Package/ath10k-firmware-default)
++  TITLE:=ath10k CT 10.4.3 firmware for QCA99x0 devices
++endef
++
++define Package/ath10k-firmware-qca9984
++$(Package/ath10k-firmware-default)
++  TITLE:=ath10k firmware for QCA9984 devices
++endef
++
+ define Package/ath10k-firmware-qca6174
+ $(Package/ath10k-firmware-default)
+   TITLE:=ath10k firmware for QCA6174 devices
+@@ -58,8 +114,8 @@ QCA99X0_BOARD_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe
+ QCA99X0_BOARD_FILE:=board-2.bin.$(QCA99X0_BOARD_REV)
+ 
+ define Download/qca99x0-board
+-  URL:=https://www.codeaurora.org/cgit/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
+-  URL_FILE:=board-2.bin?id=ddcec9efd245da9365c474f513a855a55f3ac7fe
++  URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
++  URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD_REV)
+   FILE:=$(QCA99X0_BOARD_FILE)
+   MD5SUM:=a2b3c653c2363a5641200051d6333d0a
+ endef
+@@ -79,6 +135,16 @@ define Package/ath10k-firmware-qca988x/install
+ 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
+ endef
+ 
++define Package/ath10k-firmware-qca988x-ct/install
++	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
++	$(INSTALL_DATA) \
++		$(PKG_BUILD_DIR)/QCA988X/board.bin \
++		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
++	$(INSTALL_DATA) \
++		$(DL_DIR)/$(QCA988X_FIRMWARE_FILE_CT) \
++		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
++endef
++
+ define Package/ath10k-firmware-qca6174/install
+ 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k
+ 	$(CP) $(PKG_BUILD_DIR)/QCA6174 $(1)/lib/firmware/ath10k/
+@@ -97,6 +163,33 @@ define Package/ath10k-firmware-qca99x0/install
+ 		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
+ endef
+ 
++define Package/ath10k-firmware-qca99x0-ct/install
++	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
++	$(INSTALL_DATA) \
++		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
++		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
++	$(INSTALL_DATA) \
++		$(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \
++		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
++	$(INSTALL_DATA) \
++		$(DL_DIR)/$(QCA99X0_FIRMWARE_FILE_CT) \
++		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
++endef
++
++define Package/ath10k-firmware-qca9984/install
++	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
++	$(INSTALL_DATA) \
++		$(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
++		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
++	$(INSTALL_DATA) \
++		$(PKG_BUILD_DIR)/QCA9984/hw1.0/firmware-5.bin_10.4-3.2-00072 \
++		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
++endef
++
+ $(eval $(call BuildPackage,ath10k-firmware-qca988x))
+ $(eval $(call BuildPackage,ath10k-firmware-qca99x0))
+ $(eval $(call BuildPackage,ath10k-firmware-qca6174))
++$(eval $(call BuildPackage,ath10k-firmware-qca9984))
++
++$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
++$(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct))
+diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
+index 30da1cf..cd8d670 100644
+--- a/package/kernel/mac80211/Makefile
++++ b/package/kernel/mac80211/Makefile
+@@ -247,7 +247,7 @@ define KernelPackage/ath10k
+   $(call KernelPackage/mac80211/Default)
+   TITLE:=Atheros 802.11ac wireless cards support
+   URL:=https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
+-  DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY +ath10k-firmware-qca988x
++  DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY
+   FILES:= \
+ 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_core.ko \
+ 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_pci.ko