From fd237f6f43d4ad36e1987bf7461a16647287db18 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 30 Jun 2016 21:07:25 +0200
Subject: [PATCH] mac80211: update to LEDE
0a0caa2656c8db73518a1783743ede772e3ac40f
---
...la-Technologies-firmware-for-QCA988X.patch | 72 -
...aa2656c8db73518a1783743ede772e3ac40f.patch | 9585 +++++++++++++++++
...11-ath10k-allow-simultaneous-AP-IBSS.patch | 20 +-
...uner-support-for-UniFi-Outdoor-Plus.patch} | 56 +-
...-ath9k-enable-platform-WLAN-LED-name.patch | 121 -
...x-Send-power-to-USB-port-on-WNR2200.patch} | 0
...-set-default-state-for-platform-LEDs.patch | 47 -
...1xx-WNR2200-fix-for-random-WLAN-MAC.patch} | 0
...mac80211-ath9k-enable-access-to-GPIO.patch | 261 -
...ble-control-of-all-LEDs-and-buttons.patch} | 0
.../openwrt/0083-mac80211-refresh-patch.patch | 30 -
...=> 0084-ar71xx-add-GL-AR150-support.patch} | 0
...4-mac80211-ath9k-enable-GPIO-buttons.patch | 259 -
...-on-platforms-without-CONFIG_GPIOLIB.patch | 827 --
...ix-version-detection-for-Make-4.2.1.patch} | 0
...j-for-parallel-builds-with-Make-4.2.patch} | 0
...ke-fix-parallel-build-with-Make-4.2.patch} | 0
...IPv6-builtin-if-selected-saves-30KB.patch} | 0
...ages-with-multiple-PROVIDES-entries.patch} | 0
...od-crypto-core-and-kmod-crypto-arc4.patch} | 13 -
...-support-for-the-OpenMesh-OM2P-HSv3.patch} | 0
...-support-for-the-OpenMesh-OM2P-HSv3.patch} | 0
...supgrade-for-the-OpenMesh-OM2P-HSv3.patch} | 0
...hdog-add-OpenMesh-OM2P-HSv3-support.patch} | 0
...ools-add-OpenMesh-OM2P-HSv3-support.patch} | 0
...x-add-OM2P-HSv3-to-the-OM2P-profile.patch} | 0
...l-support-for-the-OpenMesh-MR1750v2.patch} | 0
...e-support-for-the-OpenMesh-MR1750v2.patch} | 0
...ysupgrade-for-the-OpenMesh-MR1750v2.patch} | 0
...chdog-add-OpenMesh-MR1750v2-support.patch} | 0
...tools-add-OpenMesh-MR1750v2-support.patch} | 0
...bin-for-the-OpenMesh-MR1750v2-board.patch} | 0
...-add-MR1750v2-to-the-MR1750-profile.patch} | 0
...n-hexdump-for-image-build-signature.patch} | 0
...0105-mt76-fix-build-with-kernel-3.18.patch | 34 +
35 files changed, 9663 insertions(+), 1662 deletions(-)
delete mode 100644 patches/openwrt/0006-ath10k-firmware-add-Candela-Technologies-firmware-for-QCA988X.patch
create mode 100644 patches/openwrt/0006-mac80211-update-to-LEDE-0a0caa2656c8db73518a1783743ede772e3ac40f.patch
rename patches/openwrt/{0086-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch => 0080-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch} (89%)
delete mode 100644 patches/openwrt/0080-mac80211-ath9k-enable-platform-WLAN-LED-name.patch
rename patches/openwrt/{0087-ar71xx-Send-power-to-USB-port-on-WNR2200.patch => 0081-ar71xx-Send-power-to-USB-port-on-WNR2200.patch} (100%)
delete mode 100644 patches/openwrt/0081-mac80211-ath9k-set-default-state-for-platform-LEDs.patch
rename patches/openwrt/{0088-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch => 0082-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch} (100%)
delete mode 100644 patches/openwrt/0082-mac80211-ath9k-enable-access-to-GPIO.patch
rename patches/openwrt/{0089-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch => 0083-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch} (100%)
delete mode 100644 patches/openwrt/0083-mac80211-refresh-patch.patch
rename patches/openwrt/{0090-ar71xx-add-GL-AR150-support.patch => 0084-ar71xx-add-GL-AR150-support.patch} (100%)
delete mode 100644 patches/openwrt/0084-mac80211-ath9k-enable-GPIO-buttons.patch
delete mode 100644 patches/openwrt/0085-mac80211-rework-gpio-chip-button-support-to-build-on-platforms-without-CONFIG_GPIOLIB.patch
rename patches/openwrt/{0091-scripts-feeds-fix-version-detection-for-Make-4.2.1.patch => 0085-scripts-feeds-fix-version-detection-for-Make-4.2.1.patch} (100%)
rename patches/openwrt/{0092-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch => 0086-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch} (100%)
rename patches/openwrt/{0093-tools-cmake-fix-parallel-build-with-Make-4.2.patch => 0087-tools-cmake-fix-parallel-build-with-Make-4.2.patch} (100%)
rename patches/openwrt/{0094-linux-make-IPv6-builtin-if-selected-saves-30KB.patch => 0088-linux-make-IPv6-builtin-if-selected-saves-30KB.patch} (100%)
rename patches/openwrt/{0095-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch => 0089-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch} (100%)
rename patches/openwrt/{0096-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch => 0090-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch} (90%)
rename patches/openwrt/{0097-ar71xx-add-kernel-support-for-the-OpenMesh-OM2P-HSv3.patch => 0091-ar71xx-add-kernel-support-for-the-OpenMesh-OM2P-HSv3.patch} (100%)
rename patches/openwrt/{0098-ar71xx-add-user-space-support-for-the-OpenMesh-OM2P-HSv3.patch => 0092-ar71xx-add-user-space-support-for-the-OpenMesh-OM2P-HSv3.patch} (100%)
rename patches/openwrt/{0099-ar71xx-enable-sysupgrade-for-the-OpenMesh-OM2P-HSv3.patch => 0093-ar71xx-enable-sysupgrade-for-the-OpenMesh-OM2P-HSv3.patch} (100%)
rename patches/openwrt/{0100-package-om-watchdog-add-OpenMesh-OM2P-HSv3-support.patch => 0094-package-om-watchdog-add-OpenMesh-OM2P-HSv3-support.patch} (100%)
rename patches/openwrt/{0101-package-uboot-envtools-add-OpenMesh-OM2P-HSv3-support.patch => 0095-package-uboot-envtools-add-OpenMesh-OM2P-HSv3-support.patch} (100%)
rename patches/openwrt/{0102-ar71xx-add-OM2P-HSv3-to-the-OM2P-profile.patch => 0096-ar71xx-add-OM2P-HSv3-to-the-OM2P-profile.patch} (100%)
rename patches/openwrt/{0103-ar71xx-add-kernel-support-for-the-OpenMesh-MR1750v2.patch => 0097-ar71xx-add-kernel-support-for-the-OpenMesh-MR1750v2.patch} (100%)
rename patches/openwrt/{0104-ar71xx-add-user-space-support-for-the-OpenMesh-MR1750v2.patch => 0098-ar71xx-add-user-space-support-for-the-OpenMesh-MR1750v2.patch} (100%)
rename patches/openwrt/{0105-ar71xx-enable-sysupgrade-for-the-OpenMesh-MR1750v2.patch => 0099-ar71xx-enable-sysupgrade-for-the-OpenMesh-MR1750v2.patch} (100%)
rename patches/openwrt/{0106-package-om-watchdog-add-OpenMesh-MR1750v2-support.patch => 0100-package-om-watchdog-add-OpenMesh-MR1750v2-support.patch} (100%)
rename patches/openwrt/{0107-package-uboot-envtools-add-OpenMesh-MR1750v2-support.patch => 0101-package-uboot-envtools-add-OpenMesh-MR1750v2-support.patch} (100%)
rename patches/openwrt/{0108-ar71xx-extract-ath10k-wifi-board.bin-for-the-OpenMesh-MR1750v2-board.patch => 0102-ar71xx-extract-ath10k-wifi-board.bin-for-the-OpenMesh-MR1750v2-board.patch} (100%)
rename patches/openwrt/{0109-ar71xx-add-MR1750v2-to-the-MR1750-profile.patch => 0103-ar71xx-add-MR1750v2-to-the-MR1750-profile.patch} (100%)
rename patches/openwrt/{0110-x86-stop-relying-on-hexdump-for-image-build-signature.patch => 0104-x86-stop-relying-on-hexdump-for-image-build-signature.patch} (100%)
create mode 100644 patches/openwrt/0105-mt76-fix-build-with-kernel-3.18.patch
diff --git a/patches/openwrt/0006-ath10k-firmware-add-Candela-Technologies-firmware-for-QCA988X.patch b/patches/openwrt/0006-ath10k-firmware-add-Candela-Technologies-firmware-for-QCA988X.patch
deleted file mode 100644
index 5baf27122..000000000
--- a/patches/openwrt/0006-ath10k-firmware-add-Candela-Technologies-firmware-for-QCA988X.patch
+++ /dev/null
@@ -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
diff --git a/patches/openwrt/0006-mac80211-update-to-LEDE-0a0caa2656c8db73518a1783743ede772e3ac40f.patch b/patches/openwrt/0006-mac80211-update-to-LEDE-0a0caa2656c8db73518a1783743ede772e3ac40f.patch
new file mode 100644
index 000000000..26bd06095
--- /dev/null
+++ b/patches/openwrt/0006-mac80211-update-to-LEDE-0a0caa2656c8db73518a1783743ede772e3ac40f.patch
@@ -0,0 +1,9585 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 7 Jun 2016 14:06:23 +0200
+Subject: mac80211: 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/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile
+index 2fcd93b..7a2e977 100644
+--- a/package/firmware/linux-firmware/Makefile
++++ b/package/firmware/linux-firmware/Makefile
+@@ -16,10 +16,10 @@ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
+ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+-PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+-PKG_MIRROR_MD5SUM:=ca4d289ad9380471cae376fc7dd3660a
++PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
++PKG_MIRROR_MD5SUM:=8d44332359de89b1936b4ff608a72614
+
+-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
++PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+
+ SCAN_DEPS = *.mk
+
+diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk
+index 0f8b1ce..4229ca0 100644
+--- a/package/firmware/linux-firmware/realtek.mk
++++ b/package/firmware/linux-firmware/realtek.mk
+@@ -43,8 +43,15 @@ endef
+ $(eval $(call BuildPackage,rtl8192de-firmware))
+
+ Package/rtl8192se-firmware = $(call Package/firmware-default,RealTek RTL8192SE firmware)
+-define KernelPackage/rtl8192se/install
++define Package/rtl8192se-firmware/install
+ $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi
+ endef
+ $(eval $(call BuildPackage,rtl8192se-firmware))
++
++Package/rtl8192su-firmware = $(call Package/firmware-default,RealTek RTL8192SU firmware)
++define Package/rtl8192su-firmware/install
++ $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8712u.bin $(1)/lib/firmware/rtlwifi
++endef
++$(eval $(call BuildPackage,rtl8192su-firmware))
+diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile
+index 1820e7a..8fce374 100644
+--- a/package/kernel/acx-mac80211/Makefile
++++ b/package/kernel/acx-mac80211/Makefile
+@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
+ include $(INCLUDE_DIR)/kernel.mk
+
+ PKG_NAME:=acx-mac80211
+-PKG_REV:=v20130127
+-PKG_VERSION:=20130909
++PKG_REV:=b6fc31491020cb01d2cd1acc170cfa03ced7e726
++PKG_VERSION:=20140216
+ PKG_RELEASE:=1
+
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+-PKG_SOURCE_URL:=git://acx100.git.sourceforge.net/gitroot/acx100/acx-mac80211
++PKG_SOURCE_URL:=http://git.code.sf.net/p/acx100/acx-mac80211
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+ PKG_SOURCE_VERSION:=$(PKG_REV)
+@@ -190,7 +190,7 @@ define Build/Compile
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ SUBDIRS="$(PKG_BUILD_DIR)" \
+ $(PKG_EXTRA_KCONFIG) \
+- EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,14,0)\"" \
++ EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(4,2,0)\"" \
+ LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \
+ -I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
+ -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
+diff --git a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch b/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch
+deleted file mode 100644
+index fa4a6be..0000000
+--- a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch
++++ /dev/null
+@@ -1,129 +0,0 @@
+-From 8a0f5890019bf43f4bc95ef0754b062ddfcfa9cd Mon Sep 17 00:00:00 2001
+-From: Oliver Winker <oliver@oli1170.net>
+-Date: Sun, 10 Mar 2013 21:04:23 +0100
+-Subject: [PATCH 1/3] pci, mem: Fix 3.8 build
+-
+-__devexit and __devinit not used anymore in 3.8
+-
+-Signed-off-by: Reinhard Karcher <reinhard.karcher@gmx.net>
+-Signed-off-by: Oliver Winker <oliver@oli1170.net>
+----
+- mem.c | 13 ++++++++++++-
+- pci.c | 26 +++++++++++++++++++++++++-
+- 2 files changed, 37 insertions(+), 2 deletions(-)
+-
+---- a/mem.c
+-+++ b/mem.c
+-@@ -2216,7 +2216,11 @@ int acx100mem_ioctl_set_phy_amp_bias(str
+- * ==================================================
+- */
+-
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- static int __devinit acxmem_probe(struct platform_device *pdev)
+-+#else
+-+static int acxmem_probe(struct platform_device *pdev)
+-+#endif
+- {
+- acx_device_t *adev = NULL;
+- const char *chip_name;
+-@@ -2392,7 +2396,11 @@ static int __devinit acxmem_probe(struct
+- * pdev - ptr to PCI device structure containing info about pci
+- * configuration
+- */
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- static int __devexit acxmem_remove(struct platform_device *pdev)
+-+#else
+-+static int acxmem_remove(struct platform_device *pdev)
+-+#endif
+- {
+- struct ieee80211_hw *hw = (struct ieee80211_hw *)
+- platform_get_drvdata(pdev);
+-@@ -2594,8 +2602,11 @@ static struct platform_driver acxmem_dri
+- .name = "acx-mem",
+- },
+- .probe = acxmem_probe,
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- .remove = __devexit_p(acxmem_remove),
+--
+-+#else
+-+ .remove = acxmem_remove,
+-+#endif
+- #ifdef CONFIG_PM
+- .suspend = acxmem_e_suspend,
+- .resume = acxmem_e_resume
+---- a/pci.c
+-+++ b/pci.c
+-@@ -1039,7 +1039,11 @@ int acx100pci_ioctl_set_phy_amp_bias(str
+- * id - ptr to the device id entry that matched this device
+- */
+- #ifdef CONFIG_PCI
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- static int __devinit acxpci_probe(struct pci_dev *pdev,
+-+#else
+-+static int acxpci_probe(struct pci_dev *pdev,
+-+#endif
+- const struct pci_device_id *id)
+- {
+- unsigned long mem_region1 = 0;
+-@@ -1292,7 +1296,11 @@ static int __devinit acxpci_probe(struct
+- *
+- * pdev - ptr to PCI device structure containing info about pci configuration
+- */
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- static void __devexit acxpci_remove(struct pci_dev *pdev)
+-+#else
+-+static void acxpci_remove(struct pci_dev *pdev)
+-+#endif
+- {
+- struct ieee80211_hw *hw
+- = (struct ieee80211_hw *) pci_get_drvdata(pdev);
+-@@ -1505,7 +1513,11 @@ static struct pci_driver acxpci_driver =
+- .name = "acx_pci",
+- .id_table = acxpci_id_tbl,
+- .probe = acxpci_probe,
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- .remove = __devexit_p(acxpci_remove),
+-+#else
+-+ .remove = acxpci_remove,
+-+#endif
+- #ifdef CONFIG_PM
+- .suspend = acxpci_e_suspend,
+- .resume = acxpci_e_resume
+-@@ -1603,8 +1615,12 @@ static struct vlynq_device_id acx_vlynq_
+- };
+-
+-
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- static __devinit int vlynq_probe(struct vlynq_device *vdev,
+-- struct vlynq_device_id *id)
+-+#else
+-+static int vlynq_probe(struct vlynq_device *vdev,
+-+#endif
+-+ struct vlynq_device_id *id)
+- {
+- int result = -EIO, i;
+- u32 addr;
+-@@ -1785,7 +1801,11 @@ static __devinit int vlynq_probe(struct
+- return result;
+- }
+-
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- static __devexit void vlynq_remove(struct vlynq_device *vdev)
+-+#else
+-+static void vlynq_remove(struct vlynq_device *vdev)
+-+#endif
+- {
+- struct ieee80211_hw *hw = vlynq_get_drvdata(vdev);
+- acx_device_t *adev = hw2adev(hw);
+-@@ -1851,7 +1871,11 @@ static struct vlynq_driver acxvlynq_driv
+- .name = "acx_vlynq",
+- .id_table = acx_vlynq_id,
+- .probe = vlynq_probe,
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
+- .remove = __devexit_p(vlynq_remove),
+-+#else
+-+ .remove = vlynq_remove,
+-+#endif
+- };
+- #endif /* CONFIG_VLYNQ */
+-
+diff --git a/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch b/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch
+deleted file mode 100644
+index c737844..0000000
+--- a/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch
++++ /dev/null
+@@ -1,31 +0,0 @@
+-From 1daf4bfdb072b08f3b4e412bbfa9645f88dc0a01 Mon Sep 17 00:00:00 2001
+-From: Oliver Winker <oliver@oli1170.net>
+-Date: Tue, 3 Sep 2013 20:36:36 +0200
+-Subject: [PATCH 3/3] Fix 3.10 build
+-
+-Signed-off-by: Reinhard Karcher <reinhard.karcher@gmx.net>
+-Signed-off-by: Oliver Winker <oliver@oli1170.net>
+----
+- main.c | 7 +++++++
+- 1 file changed, 7 insertions(+)
+-
+---- a/main.c
+-+++ b/main.c
+-@@ -682,10 +682,17 @@ int acx_op_config(struct ieee80211_hw *h
+-
+- if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+- logf1(L_DEBUG, "IEEE80211_CONF_CHANGE_CHANNEL,"
+-+#if CONFIG_ACX_MAC80211_VERSION >= KERNEL_VERSION(3, 10, 0)
+-+ "channel->hw_value=%i\n", conf->chandef.chan->hw_value);
+-+
+-+ acx_set_channel(adev, conf->chandef.chan->hw_value,
+-+ conf->chandef.chan->center_freq);
+-+#else
+- "channel->hw_value=%i\n", conf->channel->hw_value);
+-
+- acx_set_channel(adev, conf->channel->hw_value,
+- conf->channel->center_freq);
+-+#endif
+-
+- changed_not_done &= ~IEEE80211_CONF_CHANGE_CHANNEL;
+- }
+diff --git a/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch b/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch
+deleted file mode 100644
+index 847b573..0000000
+--- a/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch
++++ /dev/null
+@@ -1,22 +0,0 @@
+-From d17fcac710e629463591f6bd09d76b66ec591583 Mon Sep 17 00:00:00 2001
+-From: Hauke Mehrtens <hauke@hauke-m.de>
+-Date: Wed, 5 Feb 2014 20:57:07 +0100
+-Subject: [PATCH] Fix 3.14 build
+-
+-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+----
+- main.c | 2 ++
+- 1 file changed, 2 insertions(+)
+-
+---- a/main.c
+-+++ b/main.c
+-@@ -500,7 +500,9 @@ int acx_init_ieee80211(acx_device_t *ade
+- hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
+- hw->queues = 1;
+- hw->wiphy->max_scan_ssids = 1;
+-+#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 14, 0)
+- hw->channel_change_time = 10000;
+-+#endif
+-
+- /* OW TODO Check if RTS/CTS threshold can be included here */
+-
+diff --git a/package/kernel/acx-mac80211/patches/300-api_sync.patch b/package/kernel/acx-mac80211/patches/300-api_sync.patch
+new file mode 100644
+index 0000000..94d6135
+--- /dev/null
++++ b/package/kernel/acx-mac80211/patches/300-api_sync.patch
+@@ -0,0 +1,83 @@
++--- a/main.c
+++++ b/main.c
++@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *ade
++
++ int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
++ {
++- hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
+++ __clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
++ hw->queues = 1;
++ hw->wiphy->max_scan_ssids = 1;
++
++@@ -525,14 +525,14 @@ int acx_init_ieee80211(acx_device_t *ade
++ /* We base signal quality on winlevel approach of previous driver
++ * TODO OW 20100615 This should into a common init code
++ */
++- hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
+++ __set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
++ hw->max_signal = 100;
++
++ if (IS_ACX100(adev)) {
++- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
++ &acx100_band_2GHz;
++ } else if (IS_ACX111(adev))
++- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
++ &acx111_band_2GHz;
++ else {
++ log(L_ANY, "Error: Unknown device");
++@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee
++ changed_flags, *total_flags);
++
++ /* OWI TODO: Set also FIF_PROBE_REQ ? */
++- *total_flags &= (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL
++- | FIF_CONTROL | FIF_OTHER_BSS);
+++ *total_flags &= (FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL
+++ | FIF_OTHER_BSS);
++
++ logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
++
++@@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw,
++ }
++
++ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
++- struct cfg80211_scan_request *req)
+++ struct ieee80211_scan_request *hw_req)
++ {
++ acx_device_t *adev = hw2adev(hw);
+++ struct cfg80211_scan_request *req = &hw_req->req;
++ struct sk_buff *skb;
++ size_t ssid_len = 0;
++ u8 *ssid = NULL;
++@@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *
++ goto out;
++ }
++ #else
++- skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
+++ skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
++ req->ie_len);
++ if (!skb) {
++ ret = -ENOMEM;
++--- a/main.h
+++++ b/main.h
++@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw,
++ #endif
++
++ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
++- struct cfg80211_scan_request *req);
+++ struct ieee80211_scan_request *req);
++
++ int acx_recover_hw(acx_device_t *adev);
++
++--- a/cardsetting.c
+++++ b/cardsetting.c
++@@ -159,7 +159,7 @@ int acx_set_channel(acx_device_t *adev,
++ int res = 0;
++
++ adev->rx_status.freq = freq;
++- adev->rx_status.band = IEEE80211_BAND_2GHZ;
+++ adev->rx_status.band = NL80211_BAND_2GHZ;
++
++ adev->channel = channel;
++
+diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
+index 30da1cf..bee0723 100644
+--- a/package/kernel/mac80211/Makefile
++++ b/package/kernel/mac80211/Makefile
+@@ -10,20 +10,21 @@ include $(INCLUDE_DIR)/kernel.mk
+
+ PKG_NAME:=mac80211
+
+-PKG_VERSION:=2016-01-10
++PKG_VERSION:=2016-05-12
+ PKG_RELEASE:=1
+ PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+ PKG_BACKPORT_VERSION:=
+-PKG_MD5SUM:=be5fae2e8d6f7490f9b073374fb895ba
++PKG_MD5SUM:=2142cf38509896dca108624e7c193611
+
+ PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2
+ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
+ PKG_BUILD_PARALLEL:=1
+
+-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
++PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+
+ PKG_DRIVERS = \
+ adm8211 \
++ airo \
+ ath ath5k ath9k ath9k-common ath9k-htc ath10k \
+ b43 b43legacy \
+ carl9170 \
+@@ -52,6 +53,7 @@ PKG_CONFIG_DEPENDS:= \
+ $(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \
+ CONFIG_PACKAGE_MAC80211_DEBUGFS \
+ CONFIG_PACKAGE_MAC80211_MESH \
++ CONFIG_PACKAGE_MAC80211_TRACING \
+ CONFIG_PACKAGE_ATH_DEBUG \
+ CONFIG_PACKAGE_ATH_DFS \
+ CONFIG_PACKAGE_B43_DEBUG \
+@@ -63,7 +65,12 @@ PKG_CONFIG_DEPENDS:= \
+ CONFIG_PACKAGE_B43_BUSES_BCMA_AND_SSB \
+ CONFIG_PACKAGE_B43_BUSES_BCMA \
+ CONFIG_PACKAGE_B43_BUSES_SSB \
++ CONFIG_PACKAGE_BRCM80211_DEBUG \
++ CONFIG_PACKAGE_IWLWIFI_DEBUG \
++ CONFIG_PACKAGE_IWLWIFI_DEBUGFS \
+ CONFIG_PACKAGE_RTLWIFI_DEBUG \
++ CONFIG_ATH9K_SUPPORT_PCOEM \
++ CONFIG_ATH9K_TX99 \
+ CONFIG_ATH_USER_REGD \
+
+ include $(INCLUDE_DIR)/package.mk
+@@ -73,7 +80,7 @@ WMENU:=Wireless Drivers
+ define KernelPackage/mac80211/Default
+ SUBMENU:=$(WMENU)
+ URL:=https://wireless.wiki.kernel.org/
+- MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
++ MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+ endef
+
+ define KernelPackage/cfg80211
+@@ -92,7 +99,7 @@ endef
+ define KernelPackage/mac80211
+ $(call KernelPackage/mac80211/Default)
+ TITLE:=Linux 802.11 Wireless Networking Stack
+- DEPENDS+= +kmod-cfg80211 +hostapd-common +kmod-crypto-core +kmod-crypto-arc4
++ DEPENDS+= +kmod-cfg80211 +hostapd-common
+ KCONFIG:=\
+ CONFIG_AVERAGE=y
+ FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
+@@ -138,10 +145,23 @@ define KernelPackage/adm8211
+ AUTOLOAD:=$(call AutoProbe,adm8211)
+ endef
+
++define KernelPackage/airo
++ $(call KernelPackage/mac80211/Default)
++ TITLE:=Cisco Aironet driver
++ DEPENDS+=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-cfg80211 @TARGET_x86
++ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/cisco/airo.ko
++ AUTOLOAD:=$(call AutoProbe,airo)
++endef
++
++define KernelPackage/airo/description
++ Kernel support for Cisco Aironet cards
++endef
++
+ define KernelPackage/ath/config
+ if PACKAGE_kmod-ath
+ config ATH_USER_REGD
+ bool "Force Atheros drivers to respect the user's regdomain settings"
++ default y
+ help
+ Atheros' idea of regulatory handling is that the EEPROM of the card defines
+ the regulatory limits and the user is only allowed to restrict the settings
+@@ -226,6 +246,10 @@ define KernelPackage/ath9k/config
+ bool "Support chips used in PC OEM cards"
+ depends on PACKAGE_kmod-ath9k
+
++ config ATH9K_TX99
++ bool "Enable TX99 support"
++ depends on PACKAGE_kmod-ath9k
++
+ endef
+
+ define KernelPackage/ath9k-htc
+@@ -247,7 +271,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
+@@ -673,6 +697,7 @@ define KernelPackage/brcmfmac/config
+
+ config BRCMFMAC_SDIO
+ bool "Enable SDIO bus interface support"
++ default y if TARGET_brcm2708
+ default n
+ help
+ Enable support for cards attached to an SDIO bus.
+@@ -761,7 +786,7 @@ endef
+
+ define KernelPackage/iwlwifi
+ $(call KernelPackage/mac80211/Default)
+- DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT +iwlwifi-firmware
++ DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT +iwlwifi-firmware @!LINUX_3_18
+ TITLE:=Intel AGN Wireless support
+ FILES:= \
+ $(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko \
+@@ -870,7 +895,7 @@ endef
+ define KernelPackage/lib80211
+ $(call KernelPackage/mac80211/Default)
+ TITLE:=802.11 Networking stack
+- DEPENDS:=+kmod-cfg80211
++ DEPENDS:=+kmod-cfg80211 +kmod-crypto-hash
+ FILES:= \
+ $(PKG_BUILD_DIR)/net/wireless/lib80211.ko \
+ $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \
+@@ -897,7 +922,7 @@ endef
+ define KernelPackage/libipw
+ $(call KernelPackage/mac80211/Default)
+ TITLE:=libipw for ipw2100 and ipw2200
+- DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-crypto-core +kmod-crypto-arc4 +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
++ DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/ipw2x00/libipw.ko
+ AUTOLOAD:=$(call AutoProbe,libipw)
+ endef
+@@ -978,7 +1003,7 @@ endef
+ define KernelPackage/libertas-spi
+ $(call KernelPackage/mac80211/Default)
+ SUBMENU:=Wireless Drivers
+- DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT +libertas-spi-firmware
++ DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-spi-firmware
+ KCONFIG := \
+ CONFIG_SPI=y \
+ CONFIG_SPI_MASTER=y
+@@ -1453,6 +1478,7 @@ config-y:= \
+ WLAN_VENDOR_ATH \
+ WLAN_VENDOR_ATMEL \
+ WLAN_VENDOR_BROADCOM \
++ WLAN_VENDOR_CISCO \
+ WLAN_VENDOR_INTEL \
+ WLAN_VENDOR_INTERSIL \
+ WLAN_VENDOR_MARVELL \
+@@ -1491,6 +1517,8 @@ endif
+
+ config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP
+
++config-$(call config_package,airo) += AIRO
++
+ config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
+ config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
+ config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
+@@ -1501,6 +1529,7 @@ config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB
+ config-$(CONFIG_PCI) += ATH9K_PCI
+ config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD
+ config-$(CONFIG_ATH9K_SUPPORT_PCOEM) += ATH9K_PCOEM
++config-$(CONFIG_ATH9K_TX99) += ATH9K_TX99
+
+ config-$(call config_package,ath9k-htc) += ATH9K_HTC
+ config-$(call config_package,ath10k) += ATH10K ATH10K_PCI
+@@ -1764,6 +1793,7 @@ endef
+
+
+ $(eval $(call KernelPackage,adm8211))
++$(eval $(call KernelPackage,airo))
+ $(eval $(call KernelPackage,ath))
+ $(eval $(call KernelPackage,ath10k))
+ $(eval $(call KernelPackage,ath5k))
+diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+index fb2f928..e3d612e 100644
+--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
++++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+@@ -23,6 +23,7 @@ drv_mac80211_init_device_config() {
+ config_add_int rxantenna txantenna antenna_gain txpower distance
+ config_add_boolean noscan ht_coex
+ config_add_array ht_capab
++ config_add_array channels
+ config_add_boolean \
+ rxldpc \
+ short_gi_80 \
+@@ -89,6 +90,7 @@ mac80211_hostapd_setup_base() {
+ json_select config
+
+ [ "$auto_channel" -gt 0 ] && channel=acs_survey
++ [ "$auto_channel" -gt 0 ] && json_get_values channel_list channels
+
+ json_get_vars noscan ht_coex
+ json_get_values ht_capab_list ht_capab
+@@ -218,7 +220,6 @@ mac80211_hostapd_setup_base() {
+ vht_max_a_mpdu_len_exp:7 \
+ vht_max_mpdu:11454 \
+ rx_stbc:4 \
+- tx_stbc:4 \
+ vht_link_adapt:3 \
+ vht160:2
+
+@@ -230,13 +231,13 @@ mac80211_hostapd_setup_base() {
+
+ cap_rx_stbc=$((($vht_cap >> 8) & 7))
+ [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
+- ht_cap_mask="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
++ vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
+
+ mac80211_add_capabilities vht_capab $vht_cap \
+ RXLDPC:0x10::$rxldpc \
+ SHORT-GI-80:0x20::$short_gi_80 \
+ SHORT-GI-160:0x40::$short_gi_160 \
+- TX-STBC-2BY1:0x80::$tx_stbc \
++ TX-STBC-2BY1:0x80::$tx_stbc_2by1 \
+ SU-BEAMFORMER:0x800::$su_beamformer \
+ SU-BEAMFORMEE:0x1000::$su_beamformee \
+ MU-BEAMFORMER:0x80000::$mu_beamformer \
+@@ -245,10 +246,10 @@ mac80211_hostapd_setup_base() {
+ HTC-VHT:0x400000::$htc_vht \
+ RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \
+ TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \
+- RX-STBC1:0x700:0x100:1 \
+- RX-STBC12:0x700:0x200:1 \
+- RX-STBC123:0x700:0x300:1 \
+- RX-STBC1234:0x700:0x400:1 \
++ RX-STBC-1:0x700:0x100:1 \
++ RX-STBC-12:0x700:0x200:1 \
++ RX-STBC-123:0x700:0x300:1 \
++ RX-STBC-1234:0x700:0x400:1 \
+
+ # supported Channel widths
+ vht160_hw=0
+@@ -301,6 +302,7 @@ mac80211_hostapd_setup_base() {
+ hostapd_prepare_device_config "$hostapd_conf_file" nl80211
+ cat >> "$hostapd_conf_file" <<EOF
+ ${channel:+channel=$channel}
++${channel_list:+chanlist=$channel_list}
+ ${noscan:+noscan=$noscan}
+ $base_cfg
+
+@@ -391,11 +393,10 @@ mac80211_generate_mac() {
+ find_phy() {
+ [ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
+ [ -n "$path" ] && {
+- for phy in /sys/devices/$path/ieee80211/phy*; do
+- [ -e "$phy" ] && {
+- phy="${phy##*/}"
+- return 0
+- }
++ for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
++ case "$(readlink -f /sys/class/ieee80211/$phy/device)" in
++ *$path) return 0;;
++ esac
+ done
+ }
+ [ -n "$macaddr" ] && {
+@@ -481,7 +482,7 @@ mac80211_prepare_vif() {
+ # All interfaces must have unique mac addresses
+ # which can either be explicitly set in the device
+ # section, or automatically generated
+- ifconfig "$ifname" hw ether "$macaddr"
++ ip link set dev "$ifname" address "$macaddr"
+ fi
+
+ json_select ..
+@@ -496,7 +497,7 @@ mac80211_setup_supplicant() {
+ mac80211_setup_adhoc_htmode() {
+ case "$htmode" in
+ VHT20|HT20) ibss_htmode=HT20;;
+- HT40*|VHT40|VHT80|VHT160)
++ HT40*|VHT40|VHT160)
+ case "$hwmode" in
+ a)
+ case "$(( ($channel / 4) % 2 ))" in
+@@ -520,6 +521,9 @@ mac80211_setup_adhoc_htmode() {
+ esac
+ [ "$auto_channel" -gt 0 ] && ibss_htmode="HT40+"
+ ;;
++ VHT80)
++ ibss_htmode="80MHZ"
++ ;;
+ NONE|NOHT)
+ ibss_htmode="NOHT"
+ ;;
+@@ -580,7 +584,7 @@ mac80211_setup_vif() {
+ json_get_vars mode
+ json_get_var vif_txpower txpower
+
+- ifconfig "$ifname" up || {
++ ip link set dev "$ifname" up || {
+ wireless_setup_vif_failed IFUP_ERROR
+ json_select ..
+ return
+@@ -643,7 +647,7 @@ mac80211_interface_cleanup() {
+ local phy="$1"
+
+ for wdev in $(list_phy_interfaces "$phy"); do
+- ifconfig "$wdev" down 2>/dev/null
++ ip link set dev "$wdev" down 2>/dev/null
+ iw dev "$wdev" del
+ done
+ }
+diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+index ea229d6..06f3b8b 100644
+--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
++++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+@@ -9,11 +9,10 @@ lookup_phy() {
+ local devpath
+ config_get devpath "$device" path
+ [ -n "$devpath" ] && {
+- for _phy in /sys/devices/$devpath/ieee80211/phy*; do
+- [ -e "$_phy" ] && {
+- phy="${_phy##*/}"
+- return
+- }
++ for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
++ case "$(readlink -f /sys/class/ieee80211/$phy/device)" in
++ *$devpath) return;;
++ esac
+ done
+ }
+
+@@ -102,6 +101,9 @@ detect_mac80211() {
+ fi
+ if [ -n "$path" ]; then
+ path="${path##/sys/devices/}"
++ case "$path" in
++ platform*/pci*) path="${path##platform/}";;
++ esac
+ dev_id=" option path '$path'"
+ else
+ dev_id=" option macaddr $(cat /sys/class/ieee80211/${dev}/macaddress)"
+diff --git a/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch b/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch
+deleted file mode 100644
+index 9adfd8f..0000000
+--- a/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch
++++ /dev/null
+@@ -1,21 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Thu, 28 Jan 2016 15:16:35 +0100
+-Subject: [PATCH] backports: add skb_free_frag()
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/backport-include/linux/skbuff.h
+-+++ b/backport-include/linux/skbuff.h
+-@@ -300,4 +300,11 @@ int skb_ensure_writable(struct sk_buff *
+-
+- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) */
+-
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+-+static inline void skb_free_frag(void *data)
+-+{
+-+ put_page(virt_to_head_page(data));
+-+}
+-+#endif
+-+
+- #endif /* __BACKPORT_SKBUFF_H */
+diff --git a/package/kernel/mac80211/patches/004-header-backport-GENL_UNS_ADMIN_PERM.patch b/package/kernel/mac80211/patches/004-header-backport-GENL_UNS_ADMIN_PERM.patch
+new file mode 100644
+index 0000000..38d655f
+--- /dev/null
++++ b/package/kernel/mac80211/patches/004-header-backport-GENL_UNS_ADMIN_PERM.patch
+@@ -0,0 +1,21 @@
++From: Felix Fietkau <nbd@nbd.name>
++Date: Sat, 14 May 2016 16:39:35 +0200
++Subject: [PATCH] header: backport GENL_UNS_ADMIN_PERM
++
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++ create mode 100644 backport-include/uapi/linux/genetlink.h
++
++--- /dev/null
+++++ b/backport-include/uapi/linux/genetlink.h
++@@ -0,0 +1,10 @@
+++#ifndef __COMPAT_UAPI_LINUX_GENETLINK_H
+++#define __COMPAT_UAPI_LINUX_GENETLINK_H
+++
+++#include_next <uapi/linux/genetlink.h>
+++
+++#ifndef GENL_UNS_ADMIN_PERM
+++#define GENL_UNS_ADMIN_PERM GENL_ADMIN_PERM
+++#endif
+++
+++#endif
+diff --git a/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch b/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch
+deleted file mode 100644
+index 9b672a8..0000000
+--- a/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch
++++ /dev/null
+@@ -1,20 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Thu, 28 Jan 2016 15:19:22 +0100
+-Subject: [PATCH] backports: add napi_alloc_frag
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/backport-include/linux/netdevice.h
+-+++ b/backport-include/linux/netdevice.h
+-@@ -232,6 +232,10 @@ static inline void backport_unregister_n
+- #define unregister_netdevice_many LINUX_BACKPORT(unregister_netdevice_many)
+- #endif
+-
+-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+-+#define napi_alloc_frag netdev_alloc_frag
+-+#endif
+-+
+- /*
+- * Complicated way of saying: We only backport netdev_rss_key stuff on kernels
+- * that either already have net_get_random_once() (>= 3.13) or where we've been
+diff --git a/package/kernel/mac80211/patches/005-header-backport-nla_put_u64_64bit-and-nla_put_64bit.patch b/package/kernel/mac80211/patches/005-header-backport-nla_put_u64_64bit-and-nla_put_64bit.patch
+new file mode 100644
+index 0000000..e20d87a
+--- /dev/null
++++ b/package/kernel/mac80211/patches/005-header-backport-nla_put_u64_64bit-and-nla_put_64bit.patch
+@@ -0,0 +1,158 @@
++From: Felix Fietkau <nbd@nbd.name>
++Date: Sat, 14 May 2016 16:40:16 +0200
++Subject: [PATCH] header: backport nla_put_u64_64bit and nla_put_64bit
++
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++
++--- a/backport-include/net/netlink.h
+++++ b/backport-include/net/netlink.h
++@@ -189,4 +189,148 @@ static inline __le64 nla_get_le64(const
++ }
++ #endif /* < 4.4 */
++
+++
+++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+++
+++/**
+++ * nla_need_padding_for_64bit - test 64-bit alignment of the next attribute
+++ * @skb: socket buffer the message is stored in
+++ *
+++ * Return true if padding is needed to align the next attribute (nla_data()) to
+++ * a 64-bit aligned area.
+++ */
+++static inline bool nla_need_padding_for_64bit(struct sk_buff *skb)
+++{
+++#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+++ /* The nlattr header is 4 bytes in size, that's why we test
+++ * if the skb->data _is_ aligned. A NOP attribute, plus
+++ * nlattr header for next attribute, will make nla_data()
+++ * 8-byte aligned.
+++ */
+++ if (IS_ALIGNED((unsigned long)skb_tail_pointer(skb), 8))
+++ return true;
+++#endif
+++ return false;
+++}
+++
+++/**
+++ * nla_align_64bit - 64-bit align the nla_data() of next attribute
+++ * @skb: socket buffer the message is stored in
+++ * @padattr: attribute type for the padding
+++ *
+++ * Conditionally emit a padding netlink attribute in order to make
+++ * the next attribute we emit have a 64-bit aligned nla_data() area.
+++ * This will only be done in architectures which do not have
+++ * CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS defined.
+++ *
+++ * Returns zero on success or a negative error code.
+++ */
+++static inline int nla_align_64bit(struct sk_buff *skb, int padattr)
+++{
+++ if (nla_need_padding_for_64bit(skb) &&
+++ !nla_reserve(skb, padattr, 0))
+++ return -EMSGSIZE;
+++
+++ return 0;
+++}
+++
+++/**
+++ * __nla_reserve_64bit - reserve room for attribute on the skb and align it
+++ * @skb: socket buffer to reserve room on
+++ * @attrtype: attribute type
+++ * @attrlen: length of attribute payload
+++ * @padattr: attribute type for the padding
+++ *
+++ * Adds a netlink attribute header to a socket buffer and reserves
+++ * room for the payload but does not copy it. It also ensure that this
+++ * attribute will have a 64-bit aligned nla_data() area.
+++ *
+++ * The caller is responsible to ensure that the skb provides enough
+++ * tailroom for the attribute header and payload.
+++ */
+++static inline struct nlattr *__nla_reserve_64bit(struct sk_buff *skb, int attrtype,
+++ int attrlen, int padattr)
+++{
+++ if (nla_need_padding_for_64bit(skb))
+++ nla_align_64bit(skb, padattr);
+++
+++ return __nla_reserve(skb, attrtype, attrlen);
+++}
+++
+++/**
+++ * __nla_put_64bit - Add a netlink attribute to a socket buffer and align it
+++ * @skb: socket buffer to add attribute to
+++ * @attrtype: attribute type
+++ * @attrlen: length of attribute payload
+++ * @data: head of attribute payload
+++ * @padattr: attribute type for the padding
+++ *
+++ * The caller is responsible to ensure that the skb provides enough
+++ * tailroom for the attribute header and payload.
+++ */
+++static inline void __nla_put_64bit(struct sk_buff *skb, int attrtype, int attrlen,
+++ const void *data, int padattr)
+++{
+++ struct nlattr *nla;
+++
+++ nla = __nla_reserve_64bit(skb, attrtype, attrlen, padattr);
+++ memcpy(nla_data(nla), data, attrlen);
+++}
+++
+++/**
+++ * nla_total_size_64bit - total length of attribute including padding
+++ * @payload: length of payload
+++ */
+++static inline int nla_total_size_64bit(int payload)
+++{
+++ return NLA_ALIGN(nla_attr_size(payload))
+++#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+++ + NLA_ALIGN(nla_attr_size(0))
+++#endif
+++ ;
+++}
+++
+++/**
+++ * nla_put_64bit - Add a netlink attribute to a socket buffer and align it
+++ * @skb: socket buffer to add attribute to
+++ * @attrtype: attribute type
+++ * @attrlen: length of attribute payload
+++ * @data: head of attribute payload
+++ * @padattr: attribute type for the padding
+++ *
+++ * Returns -EMSGSIZE if the tailroom of the skb is insufficient to store
+++ * the attribute header and payload.
+++ */
+++static inline int nla_put_64bit(struct sk_buff *skb, int attrtype, int attrlen,
+++ const void *data, int padattr)
+++{
+++ size_t len;
+++
+++ if (nla_need_padding_for_64bit(skb))
+++ len = nla_total_size_64bit(attrlen);
+++ else
+++ len = nla_total_size(attrlen);
+++ if (unlikely(skb_tailroom(skb) < len))
+++ return -EMSGSIZE;
+++
+++ __nla_put_64bit(skb, attrtype, attrlen, data, padattr);
+++ return 0;
+++}
+++
+++/**
+++ * nla_put_u64_64bit - Add a u64 netlink attribute to a skb and align it
+++ * @skb: socket buffer to add attribute to
+++ * @attrtype: attribute type
+++ * @value: numeric value
+++ * @padattr: attribute type for the padding
+++ */
+++static inline int nla_put_u64_64bit(struct sk_buff *skb, int attrtype,
+++ u64 value, int padattr)
+++{
+++ return nla_put_64bit(skb, attrtype, sizeof(u64), &value, padattr);
+++}
+++
+++
+++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) */
+++
++ #endif /* __BACKPORT_NET_NETLINK_H */
+diff --git a/package/kernel/mac80211/patches/006-compat-bump-rhashtable-backport-version-due-to-API-c.patch b/package/kernel/mac80211/patches/006-compat-bump-rhashtable-backport-version-due-to-API-c.patch
+new file mode 100644
+index 0000000..1fdad3c
+--- /dev/null
++++ b/package/kernel/mac80211/patches/006-compat-bump-rhashtable-backport-version-due-to-API-c.patch
+@@ -0,0 +1,18 @@
++From: Felix Fietkau <nbd@nbd.name>
++Date: Sat, 14 May 2016 16:44:57 +0200
++Subject: [PATCH] compat: bump rhashtable backport version due to API changes
++
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++
++--- a/compat/Kconfig
+++++ b/compat/Kconfig
++@@ -139,7 +139,7 @@ config BPAUTO_BUILD_WANT_DEV_COREDUMP
++ config BPAUTO_RHASHTABLE
++ bool
++ # current API of rhashtable was introduced in version 4.1
++- depends on KERNEL_4_1
+++ depends on KERNEL_4_7
++ # not very nice - but better than always having it
++ default y if MAC80211
++ #h-file linux/rhashtable.h
+diff --git a/package/kernel/mac80211/patches/007-fix_duplicate_skcipher_backport.patch b/package/kernel/mac80211/patches/007-fix_duplicate_skcipher_backport.patch
+new file mode 100644
+index 0000000..38b3179
+--- /dev/null
++++ b/package/kernel/mac80211/patches/007-fix_duplicate_skcipher_backport.patch
+@@ -0,0 +1,11 @@
++--- a/compat/Makefile
+++++ b/compat/Makefile
++@@ -35,8 +35,6 @@ compat-$(CPTCFG_KERNEL_4_6) += backport-
++
++ compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
++ compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
++-skcipher-objs += crypto-skcipher.o
++-obj-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += skcipher.o
++ compat-$(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP) += drivers-base-devcoredump.o
++ compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o
++ cordic-objs += lib-cordic.o
+diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
+index fd1e1cf..e9a140c 100644
+--- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
++++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
+@@ -1,6 +1,6 @@
+ --- a/.local-symbols
+ +++ b/.local-symbols
+-@@ -476,44 +476,6 @@ USB_IPHETH=
++@@ -481,45 +481,6 @@ USB_IPHETH=
+ USB_SIERRA_NET=
+ USB_VL600=
+ USB_NET_CH9200=
+@@ -37,6 +37,7 @@
+ -BCMA_DRIVER_PCI=
+ -BCMA_DRIVER_PCI_HOSTMODE=
+ -BCMA_DRIVER_MIPS=
++-BCMA_PFLASH=
+ -BCMA_SFLASH=
+ -BCMA_NFLASH=
+ -BCMA_DRIVER_GMAC_CMN=
+@@ -56,7 +57,7 @@
+ return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
+ #else
+ return bus->chipco.dev;
+-@@ -4903,7 +4903,7 @@ static int b43_wireless_core_init(struct
++@@ -4901,7 +4901,7 @@ static int b43_wireless_core_init(struct
+ }
+ if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
+ hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
+diff --git a/package/kernel/mac80211/patches/080-disable_clk_backport.patch b/package/kernel/mac80211/patches/080-disable_clk_backport.patch
+deleted file mode 100644
+index 3765591..0000000
+--- a/package/kernel/mac80211/patches/080-disable_clk_backport.patch
++++ /dev/null
+@@ -1,20 +0,0 @@
+---- a/compat/compat-3.6.c
+-+++ b/compat/compat-3.6.c
+-@@ -147,17 +147,3 @@ int sg_alloc_table_from_pages(struct sg_
+- return 0;
+- }
+- EXPORT_SYMBOL_GPL(sg_alloc_table_from_pages);
+--
+--/* whoopsie ! */
+--#ifndef CONFIG_COMMON_CLK
+--int clk_enable(struct clk *clk)
+--{
+-- return 0;
+--}
+--EXPORT_SYMBOL_GPL(clk_enable);
+--
+--void clk_disable(struct clk *clk)
+--{
+--}
+--EXPORT_SYMBOL_GPL(clk_disable);
+--#endif
+diff --git a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
+index 02f46c7..b65b0bd 100644
+--- a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
++++ b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
+@@ -34,12 +34,9 @@
+ #include "aes_ccm.h"
+
+ -void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+-- u8 *data, size_t data_len, u8 *mic,
+-- size_t mic_len)
+ +static void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *b_0, u8 *aad, u8 *s_0,
+ + u8 *a, u8 *b)
+- {
+-- struct scatterlist sg[3];
+++{
+ + int i;
+ +
+ + crypto_cipher_encrypt_one(tfm, b, b_0);
+@@ -54,55 +51,56 @@
+ + for (i = 0; i < AES_BLOCK_SIZE; i++)
+ + aad[i] ^= b[i];
+ + crypto_cipher_encrypt_one(tfm, a, aad);
+-
+-- char aead_req_data[sizeof(struct aead_request) +
+-- crypto_aead_reqsize(tfm)]
+-- __aligned(__alignof__(struct aead_request));
+-- struct aead_request *aead_req = (void *) aead_req_data;
+++
+ + /* Mask out bits from auth-only-b_0 */
+ + b_0[0] &= 0x07;
+-
+-- memset(aead_req, 0, sizeof(aead_req_data));
+++
+ + /* S_0 is used to encrypt T (= MIC) */
+ + b_0[14] = 0;
+ + b_0[15] = 0;
+ + crypto_cipher_encrypt_one(tfm, s_0, b_0);
+ +}
+-
+-- sg_init_table(sg, 3);
+-- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
+-- sg_set_buf(&sg[1], data, data_len);
+-- sg_set_buf(&sg[2], mic, mic_len);
+-
+-- aead_request_set_tfm(aead_req, tfm);
+-- aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
+-- aead_request_set_ad(aead_req, sg[0].length);
+++
+++
+ +void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
+-+ u8 *data, size_t data_len, u8 *mic,
+-+ size_t mic_len)
+-+{
++ u8 *data, size_t data_len, u8 *mic,
++ size_t mic_len)
++ {
++- struct scatterlist sg[3];
+ + int i, j, last_len, num_blocks;
+ + u8 b[AES_BLOCK_SIZE];
+ + u8 s_0[AES_BLOCK_SIZE];
+ + u8 e[AES_BLOCK_SIZE];
+ + u8 *pos, *cpos;
+-+
++
++- char aead_req_data[sizeof(struct aead_request) +
++- crypto_aead_reqsize(tfm)]
++- __aligned(__alignof__(struct aead_request));
++- struct aead_request *aead_req = (void *) aead_req_data;
+ + num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
+ + last_len = data_len % AES_BLOCK_SIZE;
+ + aes_ccm_prepare(tfm, b_0, aad, s_0, b, b);
+-+
++
++- memset(aead_req, 0, sizeof(aead_req_data));
+ + /* Process payload blocks */
+ + pos = data;
+ + cpos = data;
+ + for (j = 1; j <= num_blocks; j++) {
+ + int blen = (j == num_blocks && last_len) ?
+ + last_len : AES_BLOCK_SIZE;
+-+
++
++- sg_init_table(sg, 3);
++- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
++- sg_set_buf(&sg[1], data, data_len);
++- sg_set_buf(&sg[2], mic, mic_len);
+ + /* Authentication followed by encryption */
+ + for (i = 0; i < blen; i++)
+ + b[i] ^= pos[i];
+ + crypto_cipher_encrypt_one(tfm, b, b);
+-+
++
++- aead_request_set_tfm(aead_req, tfm);
++- aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
++- aead_request_set_ad(aead_req, sg[0].length);
+ + b_0[14] = (j >> 8) & 0xff;
+ + b_0[15] = j & 0xff;
+ + crypto_cipher_encrypt_one(tfm, e, b_0);
+@@ -125,37 +123,30 @@
+ - crypto_aead_reqsize(tfm)]
+ - __aligned(__alignof__(struct aead_request));
+ - struct aead_request *aead_req = (void *) aead_req_data;
+--
+-- if (data_len == 0)
+-- return -EINVAL;
+--
+-- memset(aead_req, 0, sizeof(aead_req_data));
+--
+-- sg_init_table(sg, 3);
+-- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
+-- sg_set_buf(&sg[1], data, data_len);
+-- sg_set_buf(&sg[2], mic, mic_len);
+--
+-- aead_request_set_tfm(aead_req, tfm);
+-- aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
+-- aead_request_set_ad(aead_req, sg[0].length);
+ + int i, j, last_len, num_blocks;
+ + u8 *pos, *cpos;
+ + u8 a[AES_BLOCK_SIZE];
+ + u8 b[AES_BLOCK_SIZE];
+ + u8 s_0[AES_BLOCK_SIZE];
+-+
++
++- if (data_len == 0)
++- return -EINVAL;
+ + num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
+ + last_len = data_len % AES_BLOCK_SIZE;
+ + aes_ccm_prepare(tfm, b_0, aad, s_0, a, b);
+-+
++
++- memset(aead_req, 0, sizeof(aead_req_data));
+ + /* Process payload blocks */
+ + cpos = data;
+ + pos = data;
+ + for (j = 1; j <= num_blocks; j++) {
+ + int blen = (j == num_blocks && last_len) ?
+ + last_len : AES_BLOCK_SIZE;
+-+
++
++- sg_init_table(sg, 3);
++- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
++- sg_set_buf(&sg[1], data, data_len);
++- sg_set_buf(&sg[2], mic, mic_len);
+ + /* Decryption followed by authentication */
+ + b_0[14] = (j >> 8) & 0xff;
+ + b_0[15] = j & 0xff;
+@@ -166,7 +157,10 @@
+ + }
+ + crypto_cipher_encrypt_one(tfm, a, a);
+ + }
+-+
++
++- aead_request_set_tfm(aead_req, tfm);
++- aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
++- aead_request_set_ad(aead_req, sg[0].length);
+ + for (i = 0; i < mic_len; i++) {
+ + if ((mic[i] ^ s_0[i]) != a[i])
+ + return -1;
+@@ -185,12 +179,12 @@
+ {
+ - struct crypto_aead *tfm;
+ - int err;
+-+ struct crypto_cipher *tfm;
+-
++-
+ - tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC);
+ - if (IS_ERR(tfm))
+ - return tfm;
+--
+++ struct crypto_cipher *tfm;
++
+ - err = crypto_aead_setkey(tfm, key, key_len);
+ - if (err)
+ - goto free_aead;
+@@ -309,7 +303,7 @@
+ #endif /* AES_GMAC_H */
+ --- a/net/mac80211/key.h
+ +++ b/net/mac80211/key.h
+-@@ -84,7 +84,7 @@ struct ieee80211_key {
++@@ -88,7 +88,7 @@ struct ieee80211_key {
+ * Management frames.
+ */
+ u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
+@@ -320,7 +314,7 @@
+ struct {
+ --- a/net/mac80211/wpa.c
+ +++ b/net/mac80211/wpa.c
+-@@ -307,7 +307,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
++@@ -304,7 +304,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
+ }
+
+
+@@ -330,7 +324,7 @@
+ {
+ __le16 mask_fc;
+ int a4_included, mgmt;
+-@@ -337,14 +338,8 @@ static void ccmp_special_blocks(struct s
++@@ -334,14 +335,8 @@ static void ccmp_special_blocks(struct s
+ else
+ qos_tid = 0;
+
+@@ -347,7 +341,7 @@
+
+ /* Nonce: Nonce Flags | A2 | PN
+ * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
+-@@ -352,6 +347,8 @@ static void ccmp_special_blocks(struct s
++@@ -349,6 +344,8 @@ static void ccmp_special_blocks(struct s
+ b_0[1] = qos_tid | (mgmt << 4);
+ memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
+ memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
+@@ -356,7 +350,7 @@
+
+ /* AAD (extra authenticate-only data) / masked 802.11 header
+ * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
+-@@ -463,7 +460,7 @@ static int ccmp_encrypt_skb(struct ieee8
++@@ -460,7 +457,7 @@ static int ccmp_encrypt_skb(struct ieee8
+ return 0;
+
+ pos += IEEE80211_CCMP_HDR_LEN;
+@@ -365,7 +359,7 @@
+ ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
+ skb_put(skb, mic_len), mic_len);
+
+-@@ -534,7 +531,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
++@@ -537,7 +534,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+ u8 aad[2 * AES_BLOCK_SIZE];
+ u8 b_0[AES_BLOCK_SIZE];
+ /* hardware didn't decrypt/verify MIC */
+diff --git a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
+index d1d9fbd..3ca166f 100644
+--- a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
++++ b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
+@@ -2,7 +2,7 @@ Used for AP+STA support in OpenWrt - preserve AP mode keys across STA reconnects
+
+ --- a/net/mac80211/cfg.c
+ +++ b/net/mac80211/cfg.c
+-@@ -846,7 +846,6 @@ static int ieee80211_stop_ap(struct wiph
++@@ -850,7 +850,6 @@ static int ieee80211_stop_ap(struct wiph
+ sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
+
+ __sta_info_flush(sdata, true);
+diff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
+index 2855a88..3029598 100644
+--- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
++++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
+@@ -18,7 +18,7 @@
+ static int ieee80211_ifa6_changed(struct notifier_block *nb,
+ unsigned long data, void *arg)
+ {
+-@@ -1087,14 +1087,14 @@ int ieee80211_register_hw(struct ieee802
++@@ -1089,14 +1089,14 @@ int ieee80211_register_hw(struct ieee802
+
+ rtnl_unlock();
+
+@@ -35,7 +35,7 @@
+ local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
+ result = register_inet6addr_notifier(&local->ifa6_notifier);
+ if (result)
+-@@ -1103,13 +1103,13 @@ int ieee80211_register_hw(struct ieee802
++@@ -1105,13 +1105,13 @@ int ieee80211_register_hw(struct ieee802
+
+ return 0;
+
+@@ -52,7 +52,7 @@
+ fail_ifa:
+ #endif
+ rtnl_lock();
+-@@ -1137,10 +1137,10 @@ void ieee80211_unregister_hw(struct ieee
++@@ -1139,10 +1139,10 @@ void ieee80211_unregister_hw(struct ieee
+ tasklet_kill(&local->tx_pending_tasklet);
+ tasklet_kill(&local->tasklet);
+
+diff --git a/package/kernel/mac80211/patches/210-ap_scan.patch b/package/kernel/mac80211/patches/210-ap_scan.patch
+index a99cbd2..29f05c4 100644
+--- a/package/kernel/mac80211/patches/210-ap_scan.patch
++++ b/package/kernel/mac80211/patches/210-ap_scan.patch
+@@ -1,6 +1,6 @@
+ --- a/net/mac80211/cfg.c
+ +++ b/net/mac80211/cfg.c
+-@@ -1999,7 +1999,7 @@ static int ieee80211_scan(struct wiphy *
++@@ -2008,7 +2008,7 @@ static int ieee80211_scan(struct wiphy *
+ * the frames sent while scanning on other channel will be
+ * lost)
+ */
+diff --git a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
+index bddb15a..8f7e893 100644
+--- a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
++++ b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
+@@ -1,17 +1,18 @@
+-From: Felix Fietkau <nbd@openwrt.org>
++From: Felix Fietkau <nbd@nbd.name>
+ Date: Sun, 7 Jun 2015 13:53:35 +0200
+ Subject: [PATCH] ath9k: force rx_clear when disabling rx
+
+ This makes stopping Rx more reliable and should reduce the frequency of
+-Rx related DMA stop warnings
++Rx related DMA stop warnings. Don't use rx_clear in TX99 mode.
+
+ Cc: stable@vger.kernel.org
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
+ ---
+
+ --- a/drivers/net/wireless/ath/ath9k/mac.c
+ +++ b/drivers/net/wireless/ath/ath9k/mac.c
+-@@ -677,13 +677,15 @@ void ath9k_hw_startpcureceive(struct ath
++@@ -677,13 +677,18 @@ void ath9k_hw_startpcureceive(struct ath
+
+ ath9k_ani_reset(ah, is_scanning);
+
+@@ -24,8 +25,11 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+ void ath9k_hw_abortpcurecv(struct ath_hw *ah)
+ {
+ - REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS);
+-+ REG_SET_BIT(ah, AR_DIAG_SW,
+-+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR);
+++ u32 reg = AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT;
+++
+++ if (!config_enabled(CPTCFG_ATH9K_TX99))
+++ reg |= AR_DIAG_FORCE_RX_CLEAR;
+++ REG_SET_BIT(ah, AR_DIAG_SW, reg);
+
+ ath9k_hw_disable_mib_counters(ah);
+ }
+diff --git a/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch b/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch
+index a160dc4..358d028 100644
+--- a/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch
++++ b/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch
+@@ -1,4 +1,4 @@
+-From: Felix Fietkau <nbd@openwrt.org>
++From: Felix Fietkau <nbd@nbd.name>
+ Date: Thu, 2 Jul 2015 15:20:56 +0200
+ Subject: [PATCH] ath9k: limit retries for powersave response frames
+
+@@ -8,7 +8,7 @@ gone to sleep. To avoid wasting too much airtime on this, limit the
+ number of retries on such frames and ensure that no sample rate gets
+ used.
+
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ ---
+
+ --- a/drivers/net/wireless/ath/ath9k/xmit.c
+diff --git a/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch b/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
+new file mode 100644
+index 0000000..7caa9be
+--- /dev/null
++++ b/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
+@@ -0,0 +1,37 @@
++From: Felix Fietkau <nbd@nbd.name>
++Date: Sat, 14 May 2016 14:51:02 +0200
++Subject: [PATCH] Revert "ath9k: interpret requested txpower in EIRP
++ domain"
++
++This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.
++---
++
++--- a/drivers/net/wireless/ath/ath9k/hw.c
+++++ b/drivers/net/wireless/ath/ath9k/hw.c
++@@ -2914,7 +2914,8 @@ void ath9k_hw_apply_txpower(struct ath_h
++ {
++ struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
++ struct ieee80211_channel *channel;
++- int chan_pwr, new_pwr;
+++ int chan_pwr, new_pwr, max_gain;
+++ int ant_gain, ant_reduction = 0;
++
++ if (!chan)
++ return;
++@@ -2922,10 +2923,15 @@ void ath9k_hw_apply_txpower(struct ath_h
++ channel = chan->chan;
++ chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
++ new_pwr = min_t(int, chan_pwr, reg->power_limit);
+++ max_gain = chan_pwr - new_pwr + channel->max_antenna_gain * 2;
+++
+++ ant_gain = get_antenna_gain(ah, chan);
+++ if (ant_gain > max_gain)
+++ ant_reduction = ant_gain - max_gain;
++
++ ah->eep_ops->set_txpower(ah, chan,
++ ath9k_regd_get_ctl(reg, chan),
++- get_antenna_gain(ah, chan), new_pwr, test);
+++ ant_reduction, new_pwr, test);
++ }
++
++ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
+diff --git a/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch b/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch
+deleted file mode 100644
+index 22b987a..0000000
+--- a/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch
++++ /dev/null
+@@ -1,95 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Thu, 14 Jan 2016 03:14:03 +0100
+-Subject: [PATCH] ath9k_hw: add low power tx gain table for AR953x
+-
+-Used in some newer TP-Link AR9533 devices.
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+-+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+-@@ -698,6 +698,9 @@ static void ar9003_tx_gain_table_mode2(s
+- else if (AR_SREV_9340(ah))
+- INIT_INI_ARRAY(&ah->iniModesTxGain,
+- ar9340Modes_low_ob_db_tx_gain_table_1p0);
+-+ else if (AR_SREV_9531_11(ah))
+-+ INIT_INI_ARRAY(&ah->iniModesTxGain,
+-+ qca953x_1p1_modes_no_xpa_low_power_tx_gain_table);
+- else if (AR_SREV_9485_11_OR_LATER(ah))
+- INIT_INI_ARRAY(&ah->iniModesTxGain,
+- ar9485Modes_low_ob_db_tx_gain_1_1);
+---- a/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
+-+++ b/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
+-@@ -757,6 +757,71 @@ static const u32 qca953x_1p1_modes_xpa_t
+- {0x00016448, 0x6c927a70},
+- };
+-
+-+static const u32 qca953x_1p1_modes_no_xpa_low_power_tx_gain_table[][2] = {
+-+ /* Addr allmodes */
+-+ {0x0000a2dc, 0xfff55592},
+-+ {0x0000a2e0, 0xfff99924},
+-+ {0x0000a2e4, 0xfffe1e00},
+-+ {0x0000a2e8, 0xffffe000},
+-+ {0x0000a410, 0x000050d6},
+-+ {0x0000a500, 0x00000069},
+-+ {0x0000a504, 0x0400006b},
+-+ {0x0000a508, 0x0800006d},
+-+ {0x0000a50c, 0x0c000269},
+-+ {0x0000a510, 0x1000026b},
+-+ {0x0000a514, 0x1400026d},
+-+ {0x0000a518, 0x18000669},
+-+ {0x0000a51c, 0x1c00066b},
+-+ {0x0000a520, 0x1d000a68},
+-+ {0x0000a524, 0x21000a6a},
+-+ {0x0000a528, 0x25000a6c},
+-+ {0x0000a52c, 0x29000a6e},
+-+ {0x0000a530, 0x2d0012a9},
+-+ {0x0000a534, 0x310012ab},
+-+ {0x0000a538, 0x350012ad},
+-+ {0x0000a53c, 0x39001b0a},
+-+ {0x0000a540, 0x3d001b0c},
+-+ {0x0000a544, 0x41001b0e},
+-+ {0x0000a548, 0x43001bae},
+-+ {0x0000a54c, 0x45001914},
+-+ {0x0000a550, 0x47001916},
+-+ {0x0000a554, 0x49001b96},
+-+ {0x0000a558, 0x49001b96},
+-+ {0x0000a55c, 0x49001b96},
+-+ {0x0000a560, 0x49001b96},
+-+ {0x0000a564, 0x49001b96},
+-+ {0x0000a568, 0x49001b96},
+-+ {0x0000a56c, 0x49001b96},
+-+ {0x0000a570, 0x49001b96},
+-+ {0x0000a574, 0x49001b96},
+-+ {0x0000a578, 0x49001b96},
+-+ {0x0000a57c, 0x49001b96},
+-+ {0x0000a600, 0x00000000},
+-+ {0x0000a604, 0x00000000},
+-+ {0x0000a608, 0x00000000},
+-+ {0x0000a60c, 0x00000000},
+-+ {0x0000a610, 0x00000000},
+-+ {0x0000a614, 0x00000000},
+-+ {0x0000a618, 0x00804201},
+-+ {0x0000a61c, 0x01408201},
+-+ {0x0000a620, 0x01408502},
+-+ {0x0000a624, 0x01408502},
+-+ {0x0000a628, 0x01408502},
+-+ {0x0000a62c, 0x01408502},
+-+ {0x0000a630, 0x01408502},
+-+ {0x0000a634, 0x01408502},
+-+ {0x0000a638, 0x01408502},
+-+ {0x0000a63c, 0x01408502},
+-+ {0x0000b2dc, 0xfff55592},
+-+ {0x0000b2e0, 0xfff99924},
+-+ {0x0000b2e4, 0xfffe1e00},
+-+ {0x0000b2e8, 0xffffe000},
+-+ {0x00016044, 0x044922db},
+-+ {0x00016048, 0x6c927a70},
+-+ {0x00016444, 0x044922db},
+-+ {0x00016448, 0x6c927a70},
+-+};
+-+
+- static const u32 qca953x_2p0_baseband_core[][2] = {
+- /* Addr allmodes */
+- {0x00009800, 0xafe68e30},
+diff --git a/package/kernel/mac80211/patches/303-mac80211-mesh-flush-mesh-paths-unconditionally.patch b/package/kernel/mac80211/patches/303-mac80211-mesh-flush-mesh-paths-unconditionally.patch
+new file mode 100644
+index 0000000..518d0a3
+--- /dev/null
++++ b/package/kernel/mac80211/patches/303-mac80211-mesh-flush-mesh-paths-unconditionally.patch
+@@ -0,0 +1,146 @@
++From: Bob Copeland <me@bobcopeland.com>
++Date: Sun, 15 May 2016 13:19:16 -0400
++Subject: [PATCH] mac80211: mesh: flush mesh paths unconditionally
++
++Currently, the mesh paths associated with a nexthop station are cleaned
++up in the following code path:
++
++ __sta_info_destroy_part1
++ synchronize_net()
++ __sta_info_destroy_part2
++ -> cleanup_single_sta
++ -> mesh_sta_cleanup
++ -> mesh_plink_deactivate
++ -> mesh_path_flush_by_nexthop
++
++However, there are a couple of problems here:
++
++1) the paths aren't flushed at all if the MPM is running in userspace
++ (e.g. when using wpa_supplicant or authsae)
++
++2) there is no synchronize_rcu between removing the path and readers
++ accessing the nexthop, which means the following race is possible:
++
++CPU0 CPU1
++~~~~ ~~~~
++ sta_info_destroy_part1()
++ synchronize_net()
++rcu_read_lock()
++mesh_nexthop_resolve()
++ mpath = mesh_path_lookup()
++ [...] -> mesh_path_flush_by_nexthop()
++ sta = rcu_dereference(
++ mpath->next_hop)
++ kfree(sta)
++ access sta <-- CRASH
++
++Fix both of these by unconditionally flushing paths before destroying
++the sta, and by adding a synchronize_net() after path flush to ensure
++no active readers can still dereference the sta.
++
++Fixes this crash:
++
++[ 348.529295] BUG: unable to handle kernel paging request at 00020040
++[ 348.530014] IP: [<f929245d>] ieee80211_mps_set_frame_flags+0x40/0xaa [mac80211]
++[ 348.530014] *pde = 00000000
++[ 348.530014] Oops: 0000 [#1] PREEMPT
++[ 348.530014] Modules linked in: drbg ansi_cprng ctr ccm ppp_generic slhc ipt_MASQUERADE nf_nat_masquerade_ipv4 8021q ]
++[ 348.530014] CPU: 0 PID: 20597 Comm: wget Tainted: G O 4.6.0-rc5-wt=V1 #1
++[ 348.530014] Hardware name: To Be Filled By O.E.M./To be filled by O.E.M., BIOS 080016 11/07/2014
++[ 348.530014] task: f64fa280 ti: f4f9c000 task.ti: f4f9c000
++[ 348.530014] EIP: 0060:[<f929245d>] EFLAGS: 00010246 CPU: 0
++[ 348.530014] EIP is at ieee80211_mps_set_frame_flags+0x40/0xaa [mac80211]
++[ 348.530014] EAX: f4ce63e0 EBX: 00000088 ECX: f3788416 EDX: 00020008
++[ 348.530014] ESI: 00000000 EDI: 00000088 EBP: f6409a4c ESP: f6409a40
++[ 348.530014] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
++[ 348.530014] CR0: 80050033 CR2: 00020040 CR3: 33190000 CR4: 00000690
++[ 348.530014] Stack:
++[ 348.530014] 00000000 f4ce63e0 f5f9bd80 f6409a64 f9291d80 0000ce67 f5d51e00 f4ce63e0
++[ 348.530014] f3788416 f6409a80 f9291dc1 f4ce8320 f4ce63e0 f5d51e00 f4ce63e0 f4ce8320
++[ 348.530014] f6409a98 f9277f6f 00000000 00000000 0000007c 00000000 f6409b2c f9278dd1
++[ 348.530014] Call Trace:
++[ 348.530014] [<f9291d80>] mesh_nexthop_lookup+0xbb/0xc8 [mac80211]
++[ 348.530014] [<f9291dc1>] mesh_nexthop_resolve+0x34/0xd8 [mac80211]
++[ 348.530014] [<f9277f6f>] ieee80211_xmit+0x92/0xc1 [mac80211]
++[ 348.530014] [<f9278dd1>] __ieee80211_subif_start_xmit+0x807/0x83c [mac80211]
++[ 348.530014] [<c04df012>] ? sch_direct_xmit+0xd7/0x1b3
++[ 348.530014] [<c022a8c6>] ? __local_bh_enable_ip+0x5d/0x7b
++[ 348.530014] [<f956870c>] ? nf_nat_ipv4_out+0x4c/0xd0 [nf_nat_ipv4]
++[ 348.530014] [<f957e036>] ? iptable_nat_ipv4_fn+0xf/0xf [iptable_nat]
++[ 348.530014] [<c04c6f45>] ? netif_skb_features+0x14d/0x30a
++[ 348.530014] [<f9278e10>] ieee80211_subif_start_xmit+0xa/0xe [mac80211]
++[ 348.530014] [<c04c769c>] dev_hard_start_xmit+0x1f8/0x267
++[ 348.530014] [<c04c7261>] ? validate_xmit_skb.isra.120.part.121+0x10/0x253
++[ 348.530014] [<c04defc6>] sch_direct_xmit+0x8b/0x1b3
++[ 348.530014] [<c04c7a9c>] __dev_queue_xmit+0x2c8/0x513
++[ 348.530014] [<c04c7cfb>] dev_queue_xmit+0xa/0xc
++[ 348.530014] [<f91bfc7a>] batadv_send_skb_packet+0xd6/0xec [batman_adv]
++[ 348.530014] [<f91bfdc4>] batadv_send_unicast_skb+0x15/0x4a [batman_adv]
++[ 348.530014] [<f91b5938>] batadv_dat_send_data+0x27e/0x310 [batman_adv]
++[ 348.530014] [<f91c30b5>] ? batadv_tt_global_hash_find.isra.11+0x8/0xa [batman_adv]
++[ 348.530014] [<f91b63f3>] batadv_dat_snoop_outgoing_arp_request+0x208/0x23d [batman_adv]
++[ 348.530014] [<f91c0cd9>] batadv_interface_tx+0x206/0x385 [batman_adv]
++[ 348.530014] [<c04c769c>] dev_hard_start_xmit+0x1f8/0x267
++[ 348.530014] [<c04c7261>] ? validate_xmit_skb.isra.120.part.121+0x10/0x253
++[ 348.530014] [<c04defc6>] sch_direct_xmit+0x8b/0x1b3
++[ 348.530014] [<c04c7a9c>] __dev_queue_xmit+0x2c8/0x513
++[ 348.530014] [<f80cbd2a>] ? igb_xmit_frame+0x57/0x72 [igb]
++[ 348.530014] [<c04c7cfb>] dev_queue_xmit+0xa/0xc
++[ 348.530014] [<f843a326>] br_dev_queue_push_xmit+0xeb/0xfb [bridge]
++[ 348.530014] [<f843a35f>] br_forward_finish+0x29/0x74 [bridge]
++[ 348.530014] [<f843a23b>] ? deliver_clone+0x3b/0x3b [bridge]
++[ 348.530014] [<f843a714>] __br_forward+0x89/0xe7 [bridge]
++[ 348.530014] [<f843a336>] ? br_dev_queue_push_xmit+0xfb/0xfb [bridge]
++[ 348.530014] [<f843a234>] deliver_clone+0x34/0x3b [bridge]
++[ 348.530014] [<f843a68b>] ? br_flood+0x95/0x95 [bridge]
++[ 348.530014] [<f843a66d>] br_flood+0x77/0x95 [bridge]
++[ 348.530014] [<f843a809>] br_flood_forward+0x13/0x1a [bridge]
++[ 348.530014] [<f843a68b>] ? br_flood+0x95/0x95 [bridge]
++[ 348.530014] [<f843b877>] br_handle_frame_finish+0x392/0x3db [bridge]
++[ 348.530014] [<c04e9b2b>] ? nf_iterate+0x2b/0x6b
++[ 348.530014] [<f843baa6>] br_handle_frame+0x1e6/0x240 [bridge]
++[ 348.530014] [<f843b4e5>] ? br_handle_local_finish+0x6a/0x6a [bridge]
++[ 348.530014] [<c04c4ba0>] __netif_receive_skb_core+0x43a/0x66b
++[ 348.530014] [<f843b8c0>] ? br_handle_frame_finish+0x3db/0x3db [bridge]
++[ 348.530014] [<c023cea4>] ? resched_curr+0x19/0x37
++[ 348.530014] [<c0240707>] ? check_preempt_wakeup+0xbf/0xfe
++[ 348.530014] [<c0255dec>] ? ktime_get_with_offset+0x5c/0xfc
++[ 348.530014] [<c04c4fc1>] __netif_receive_skb+0x47/0x55
++[ 348.530014] [<c04c57ba>] netif_receive_skb_internal+0x40/0x5a
++[ 348.530014] [<c04c61ef>] napi_gro_receive+0x3a/0x94
++[ 348.530014] [<f80ce8d5>] igb_poll+0x6fd/0x9ad [igb]
++[ 348.530014] [<c0242bd8>] ? swake_up_locked+0x14/0x26
++[ 348.530014] [<c04c5d29>] net_rx_action+0xde/0x250
++[ 348.530014] [<c022a743>] __do_softirq+0x8a/0x163
++[ 348.530014] [<c022a6b9>] ? __hrtimer_tasklet_trampoline+0x19/0x19
++[ 348.530014] [<c021100f>] do_softirq_own_stack+0x26/0x2c
++[ 348.530014] <IRQ>
++[ 348.530014] [<c022a957>] irq_exit+0x31/0x6f
++[ 348.530014] [<c0210eb2>] do_IRQ+0x8d/0xa0
++[ 348.530014] [<c058152c>] common_interrupt+0x2c/0x40
++[ 348.530014] Code: e7 8c 00 66 81 ff 88 00 75 12 85 d2 75 0e b2 c3 b8 83 e9 29 f9 e8 a7 5f f9 c6 eb 74 66 81 e3 8c 005
++[ 348.530014] EIP: [<f929245d>] ieee80211_mps_set_frame_flags+0x40/0xaa [mac80211] SS:ESP 0068:f6409a40
++[ 348.530014] CR2: 0000000000020040
++[ 348.530014] ---[ end trace 48556ac26779732e ]---
++[ 348.530014] Kernel panic - not syncing: Fatal exception in interrupt
++[ 348.530014] Kernel Offset: disabled
++
++Cc: stable@vger.kernel.org
++Reported-by: Fred Veldini <fred.veldini@gmail.com>
++Tested-by: Fred Veldini <fred.veldini@gmail.com>
++Signed-off-by: Bob Copeland <me@bobcopeland.com>
++---
++
++--- a/net/mac80211/mesh.c
+++++ b/net/mac80211/mesh.c
++@@ -161,6 +161,10 @@ void mesh_sta_cleanup(struct sta_info *s
++ del_timer_sync(&sta->mesh->plink_timer);
++ }
++
+++ /* make sure no readers can access nexthop sta from here on */
+++ mesh_path_flush_by_nexthop(sta);
+++ synchronize_net();
+++
++ if (changed)
++ ieee80211_mbss_info_change_notify(sdata, changed);
++ }
+diff --git a/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch b/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch
+deleted file mode 100644
+index 7bb7435..0000000
+--- a/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch
++++ /dev/null
+@@ -1,156 +0,0 @@
+-From: Eli Cooper <elicooper@gmx.com>
+-Date: Thu, 14 Jan 2016 00:07:12 +0800
+-Subject: [PATCH] rt2x00: fix monitor mode regression
+-
+-Since commit df1404650ccbfeb76a84f301f22316be0d00a864 monitor mode for rt2x00
+-has been made effectively useless because the hardware filter is configured to
+-drop packets whose intended recipient is not the device, regardless of the
+-presence of monitor mode interfaces.
+-
+-This patch fixes this regression by adding explicit monitor mode support, and
+-configuring the hardware filter accordingly.
+-
+-Signed-off-by: Eli Cooper <elicooper@gmx.com>
+----
+-
+---- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
+-@@ -273,8 +273,10 @@ static void rt2400pci_config_filter(stru
+- !(filter_flags & FIF_PLCPFAIL));
+- rt2x00_set_field32(®, RXCSR0_DROP_CONTROL,
+- !(filter_flags & FIF_CONTROL));
+-- rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1);
+-+ rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
+-+ !rt2x00dev->is_monitoring);
+- rt2x00_set_field32(®, RXCSR0_DROP_TODS,
+-+ !rt2x00dev->is_monitoring &&
+- !rt2x00dev->intf_ap_count);
+- rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
+- rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
+---- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
+-@@ -274,8 +274,10 @@ static void rt2500pci_config_filter(stru
+- !(filter_flags & FIF_PLCPFAIL));
+- rt2x00_set_field32(®, RXCSR0_DROP_CONTROL,
+- !(filter_flags & FIF_CONTROL));
+-- rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1);
+-+ rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
+-+ !rt2x00dev->is_monitoring);
+- rt2x00_set_field32(®, RXCSR0_DROP_TODS,
+-+ !rt2x00dev->is_monitoring &&
+- !rt2x00dev->intf_ap_count);
+- rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
+- rt2x00_set_field32(®, RXCSR0_DROP_MCAST,
+---- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
+-@@ -437,8 +437,10 @@ static void rt2500usb_config_filter(stru
+- !(filter_flags & FIF_PLCPFAIL));
+- rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL,
+- !(filter_flags & FIF_CONTROL));
+-- rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME, 1);
+-+ rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME,
+-+ !rt2x00dev->is_monitoring);
+- rt2x00_set_field16(®, TXRX_CSR2_DROP_TODS,
+-+ !rt2x00dev->is_monitoring &&
+- !rt2x00dev->intf_ap_count);
+- rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 1);
+- rt2x00_set_field16(®, TXRX_CSR2_DROP_MULTICAST,
+---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+-@@ -1490,7 +1490,8 @@ void rt2800_config_filter(struct rt2x00_
+- !(filter_flags & FIF_FCSFAIL));
+- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_PHY_ERROR,
+- !(filter_flags & FIF_PLCPFAIL));
+-- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME, 1);
+-+ rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME,
+-+ !rt2x00dev->is_monitoring);
+- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_MY_BSSD, 0);
+- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_VER_ERROR, 1);
+- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_MULTICAST,
+---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -844,11 +844,13 @@ struct rt2x00_dev {
+- * - Open sta interface count.
+- * - Association count.
+- * - Beaconing enabled count.
+-+ * - Whether the device is monitoring.
+- */
+- unsigned int intf_ap_count;
+- unsigned int intf_sta_count;
+- unsigned int intf_associated;
+- unsigned int intf_beaconing;
+-+ bool is_monitoring;
+-
+- /*
+- * Interface combinations
+---- a/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
+-@@ -244,6 +244,16 @@ void rt2x00lib_config(struct rt2x00_dev
+- (ieee80211_flags & IEEE80211_CONF_CHANGE_PS))
+- cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
+-
+-+ if (ieee80211_flags & IEEE80211_CONF_CHANGE_MONITOR) {
+-+ if (conf->flags & IEEE80211_CONF_MONITOR) {
+-+ rt2x00_dbg(rt2x00dev, "Monitor mode is enabled\n");
+-+ rt2x00dev->is_monitoring = true;
+-+ } else {
+-+ rt2x00_dbg(rt2x00dev, "Monitor mode is disabled\n");
+-+ rt2x00dev->is_monitoring = false;
+-+ }
+-+ }
+-+
+- /*
+- * Start configuration.
+- */
+---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+-@@ -1204,6 +1204,7 @@ int rt2x00lib_start(struct rt2x00_dev *r
+- rt2x00dev->intf_ap_count = 0;
+- rt2x00dev->intf_sta_count = 0;
+- rt2x00dev->intf_associated = 0;
+-+ rt2x00dev->is_monitoring = false;
+-
+- /* Enable the radio */
+- retval = rt2x00lib_enable_radio(rt2x00dev);
+---- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
+-@@ -385,11 +385,6 @@ void rt2x00mac_configure_filter(struct i
+- *total_flags |= FIF_PSPOLL;
+- }
+-
+-- /*
+-- * Check if there is any work left for us.
+-- */
+-- if (rt2x00dev->packet_filter == *total_flags)
+-- return;
+- rt2x00dev->packet_filter = *total_flags;
+-
+- rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
+---- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
+-@@ -530,8 +530,10 @@ static void rt61pci_config_filter(struct
+- !(filter_flags & FIF_PLCPFAIL));
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL,
+- !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
+-- rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1);
+-+ rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
+-+ !rt2x00dev->is_monitoring);
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
+-+ !rt2x00dev->is_monitoring &&
+- !rt2x00dev->intf_ap_count);
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
+---- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c
+-+++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
+-@@ -480,8 +480,10 @@ static void rt73usb_config_filter(struct
+- !(filter_flags & FIF_PLCPFAIL));
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL,
+- !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
+-- rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1);
+-+ rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
+-+ !rt2x00dev->is_monitoring);
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
+-+ !rt2x00dev->is_monitoring &&
+- !rt2x00dev->intf_ap_count);
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
+- rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
+diff --git a/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch b/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch
+deleted file mode 100644
+index 049059a..0000000
+--- a/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch
++++ /dev/null
+@@ -1,32 +0,0 @@
+-From: Miaoqing Pan <miaoqing@codeaurora.org>
+-Date: Fri, 15 Jan 2016 18:17:17 +0800
+-Subject: [PATCH] ath9k: avoid ANI restart if no trigger
+-
+-Fixes commit 54da20d83f0e ("ath9k_hw: improve ANI processing and rx desensitizing parameters")
+-
+-Call ath9k_ani_restart() only when the phy error rate reach the
+-ANI immunity threshold. Sync the logic with internal code base.
+-
+-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/ani.c
+-+++ b/drivers/net/wireless/ath/ath9k/ani.c
+-@@ -444,14 +444,16 @@ void ath9k_hw_ani_monitor(struct ath_hw
+- ofdmPhyErrRate < ah->config.ofdm_trig_low) {
+- ath9k_hw_ani_lower_immunity(ah);
+- aniState->ofdmsTurn = !aniState->ofdmsTurn;
+-+ ath9k_ani_restart(ah);
+- } else if (ofdmPhyErrRate > ah->config.ofdm_trig_high) {
+- ath9k_hw_ani_ofdm_err_trigger(ah);
+- aniState->ofdmsTurn = false;
+-+ ath9k_ani_restart(ah);
+- } else if (cckPhyErrRate > ah->config.cck_trig_high) {
+- ath9k_hw_ani_cck_err_trigger(ah);
+- aniState->ofdmsTurn = true;
+-+ ath9k_ani_restart(ah);
+- }
+-- ath9k_ani_restart(ah);
+- }
+- }
+- EXPORT_SYMBOL(ath9k_hw_ani_monitor);
+diff --git a/package/kernel/mac80211/patches/304-mac80211-fix-fast_tx-header-alignment.patch b/package/kernel/mac80211/patches/304-mac80211-fix-fast_tx-header-alignment.patch
+new file mode 100644
+index 0000000..6316d81
+--- /dev/null
++++ b/package/kernel/mac80211/patches/304-mac80211-fix-fast_tx-header-alignment.patch
+@@ -0,0 +1,25 @@
++From: Felix Fietkau <nbd@nbd.name>
++Date: Thu, 19 May 2016 17:32:13 +0200
++Subject: [PATCH] mac80211: fix fast_tx header alignment
++
++The header field is defined as u8[] but also accessed as struct
++ieee80211_hdr. Enforce an alignment of 2 to prevent unnecessary
++unaligned accesses, which can be very harmful for performance on many
++platforms.
++
++Fixes: e495c24731a2 ("mac80211: extend fast-xmit for more ciphers")
++Cc: stable@vger.kernel.org
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++
++--- a/net/mac80211/sta_info.h
+++++ b/net/mac80211/sta_info.h
++@@ -280,7 +280,7 @@ struct ieee80211_fast_tx {
++ u8 sa_offs, da_offs, pn_offs;
++ u8 band;
++ u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
++- sizeof(rfc1042_header)];
+++ sizeof(rfc1042_header)] __aligned(2);
++
++ struct rcu_head rcu_head;
++ };
+diff --git a/package/kernel/mac80211/patches/305-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch b/package/kernel/mac80211/patches/305-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch
+new file mode 100644
+index 0000000..73accd8
+--- /dev/null
++++ b/package/kernel/mac80211/patches/305-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch
+@@ -0,0 +1,21 @@
++From: Ben Greear <greearb@candelatech.com>
++Date: Fri, 1 Apr 2016 14:12:08 -0700
++Subject: [PATCH] ath10k: Ensure txrx-compl-task is stopped when cleaning
++ htt-tx.
++
++Otherwise, the txrx-compl-task may access some bad memory?
++
++Signed-off-by: Ben Greear <greearb@candelatech.com>
++---
++
++--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
++@@ -388,6 +388,8 @@ void ath10k_htt_tx_free(struct ath10k_ht
++ {
++ int size;
++
+++ tasklet_kill(&htt->txrx_compl_task);
+++
++ idr_for_each(&htt->pending_tx, ath10k_htt_tx_clean_up_pending, htt->ar);
++ idr_destroy(&htt->pending_tx);
++
+diff --git a/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch b/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch
+deleted file mode 100644
+index a1ac67c..0000000
+--- a/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch
++++ /dev/null
+@@ -1,91 +0,0 @@
+-From: Miaoqing Pan <miaoqing@codeaurora.org>
+-Date: Fri, 15 Jan 2016 18:17:18 +0800
+-Subject: [PATCH] ath9k: clean up ANI per-channel pointer checking
+-
+-commit c24bd3620c50 ("ath9k: Do not maintain ANI state per-channel")
+-removed per-channel handling, the code to check 'curchan' also
+-should be removed as never used.
+-
+-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/ani.c
+-+++ b/drivers/net/wireless/ath/ath9k/ani.c
+-@@ -126,12 +126,8 @@ static void ath9k_hw_update_mibstats(str
+-
+- static void ath9k_ani_restart(struct ath_hw *ah)
+- {
+-- struct ar5416AniState *aniState;
+--
+-- if (!ah->curchan)
+-- return;
+-+ struct ar5416AniState *aniState = &ah->ani;
+-
+-- aniState = &ah->ani;
+- aniState->listenTime = 0;
+-
+- ENABLE_REGWRITE_BUFFER(ah);
+-@@ -221,12 +217,7 @@ static void ath9k_hw_set_ofdm_nil(struct
+-
+- static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
+- {
+-- struct ar5416AniState *aniState;
+--
+-- if (!ah->curchan)
+-- return;
+--
+-- aniState = &ah->ani;
+-+ struct ar5416AniState *aniState = &ah->ani;
+-
+- if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)
+- ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1, false);
+-@@ -281,12 +272,7 @@ static void ath9k_hw_set_cck_nil(struct
+-
+- static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
+- {
+-- struct ar5416AniState *aniState;
+--
+-- if (!ah->curchan)
+-- return;
+--
+-- aniState = &ah->ani;
+-+ struct ar5416AniState *aniState = &ah->ani;
+-
+- if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)
+- ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1,
+-@@ -299,9 +285,7 @@ static void ath9k_hw_ani_cck_err_trigger
+- */
+- static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
+- {
+-- struct ar5416AniState *aniState;
+--
+-- aniState = &ah->ani;
+-+ struct ar5416AniState *aniState = &ah->ani;
+-
+- /* lower OFDM noise immunity */
+- if (aniState->ofdmNoiseImmunityLevel > 0 &&
+-@@ -329,7 +313,7 @@ void ath9k_ani_reset(struct ath_hw *ah,
+- struct ath_common *common = ath9k_hw_common(ah);
+- int ofdm_nil, cck_nil;
+-
+-- if (!ah->curchan)
+-+ if (!chan)
+- return;
+-
+- BUG_ON(aniState == NULL);
+-@@ -416,14 +400,10 @@ static bool ath9k_hw_ani_read_counters(s
+-
+- void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)
+- {
+-- struct ar5416AniState *aniState;
+-+ struct ar5416AniState *aniState = &ah->ani;
+- struct ath_common *common = ath9k_hw_common(ah);
+- u32 ofdmPhyErrRate, cckPhyErrRate;
+-
+-- if (!ah->curchan)
+-- return;
+--
+-- aniState = &ah->ani;
+- if (!ath9k_hw_ani_read_counters(ah))
+- return;
+-
+diff --git a/package/kernel/mac80211/patches/306-ath10k-Ensure-peer_map-references-are-cleaned-up.patch b/package/kernel/mac80211/patches/306-ath10k-Ensure-peer_map-references-are-cleaned-up.patch
+new file mode 100644
+index 0000000..2979b4b
+--- /dev/null
++++ b/package/kernel/mac80211/patches/306-ath10k-Ensure-peer_map-references-are-cleaned-up.patch
+@@ -0,0 +1,60 @@
++From: Ben Greear <greearb@candelatech.com>
++Date: Fri, 1 Apr 2016 14:12:09 -0700
++Subject: [PATCH] ath10k: Ensure peer_map references are cleaned up.
++
++While debugging OS crashes due to firmware crashes, I enabled
++kasan, and it noticed that peer objects were being used-after-freed.
++
++Looks like there are two places we could be leaving stale references
++in the peer-map, so clean that up.
++
++Signed-off-by: Ben Greear <greearb@candelatech.com>
++---
++
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -773,6 +773,7 @@ static void ath10k_peer_cleanup(struct a
++ {
++ struct ath10k_peer *peer, *tmp;
++ int peer_id;
+++ int i;
++
++ lockdep_assert_held(&ar->conf_mutex);
++
++@@ -789,6 +790,17 @@ static void ath10k_peer_cleanup(struct a
++ ar->peer_map[peer_id] = NULL;
++ }
++
+++ /* Double check that peer is properly un-referenced from
+++ * the peer_map
+++ */
+++ for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++) {
+++ if (ar->peer_map[i] == peer) {
+++ ath10k_warn(ar, "removing stale peer_map entry for %pM (ptr %p idx %d)\n",
+++ peer->addr, peer, i);
+++ ar->peer_map[i] = NULL;
+++ }
+++ }
+++
++ list_del(&peer->list);
++ kfree(peer);
++ ar->num_peers--;
++@@ -799,6 +811,7 @@ static void ath10k_peer_cleanup(struct a
++ static void ath10k_peer_cleanup_all(struct ath10k *ar)
++ {
++ struct ath10k_peer *peer, *tmp;
+++ int i;
++
++ lockdep_assert_held(&ar->conf_mutex);
++
++@@ -807,6 +820,10 @@ static void ath10k_peer_cleanup_all(stru
++ list_del(&peer->list);
++ kfree(peer);
++ }
+++
+++ for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++)
+++ ar->peer_map[i] = NULL;
+++
++ spin_unlock_bh(&ar->data_lock);
++
++ ar->num_peers = 0;
+diff --git a/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch b/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch
+deleted file mode 100644
+index cf8194a..0000000
+--- a/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch
++++ /dev/null
+@@ -1,31 +0,0 @@
+-From: Miaoqing Pan <miaoqing@codeaurora.org>
+-Date: Fri, 15 Jan 2016 18:17:19 +0800
+-Subject: [PATCH] ath9k: do not reset while BB panic(0x4000409) on ar9561
+-
+-BB panic(0x4000409) observed while AP enabling/disabling
+-bursting.
+-
+-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+-@@ -2071,7 +2071,8 @@ void ar9003_hw_attach_phy_ops(struct ath
+- * to be disabled.
+- *
+- * 0x04000409: Packet stuck on receive.
+-- * Full chip reset is required for all chips except AR9340.
+-+ * Full chip reset is required for all chips except
+-+ * AR9340, AR9531 and AR9561.
+- */
+-
+- /*
+-@@ -2100,7 +2101,7 @@ bool ar9003_hw_bb_watchdog_check(struct
+- case 0x04000b09:
+- return true;
+- case 0x04000409:
+-- if (AR_SREV_9340(ah) || AR_SREV_9531(ah))
+-+ if (AR_SREV_9340(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah))
+- return false;
+- else
+- return true;
+diff --git a/package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch b/package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch
+new file mode 100644
+index 0000000..f814ae7
+--- /dev/null
++++ b/package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch
+@@ -0,0 +1,32 @@
++From: Ben Greear <greearb@candelatech.com>
++Date: Fri, 1 Apr 2016 14:12:11 -0700
++Subject: [PATCH] ath10k: Clean up peer when sta goes away.
++
++If WMI and/or firmware has issues removing the peer object,
++then we still need to clean up the peer object in the driver.
++
++Signed-off-by: Ben Greear <greearb@candelatech.com>
++---
++
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -5949,9 +5949,17 @@ static int ath10k_sta_state(struct ieee8
++ continue;
++
++ if (peer->sta == sta) {
++- ath10k_warn(ar, "found sta peer %pM entry on vdev %i after it was supposedly removed\n",
++- sta->addr, arvif->vdev_id);
+++ ath10k_warn(ar, "found sta peer %pM (ptr %p id %d) entry on vdev %i after it was supposedly removed\n",
+++ sta->addr, peer, i, arvif->vdev_id);
++ peer->sta = NULL;
+++
+++ /* Clean up the peer object as well since we
+++ * must have failed to do this above.
+++ */
+++ list_del(&peer->list);
+++ ar->peer_map[i] = NULL;
+++ kfree(peer);
+++ ar->num_peers--;
++ }
++ }
++ spin_unlock_bh(&ar->data_lock);
+diff --git a/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch b/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch
+deleted file mode 100644
+index 80b781c..0000000
+--- a/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch
++++ /dev/null
+@@ -1,27 +0,0 @@
+-From: Miaoqing Pan <miaoqing@codeaurora.org>
+-Date: Fri, 15 Jan 2016 18:17:20 +0800
+-Subject: [PATCH] ath9k: fix inconsistent use of tab and space in
+- indentation
+-
+-Minor changes for indenting.
+-
+-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+-@@ -5485,11 +5485,11 @@ unsigned int ar9003_get_paprd_scale_fact
+- AR9300_PAPRD_SCALE_1);
+- else {
+- if (chan->channel >= 5700)
+-- return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt20),
+-- AR9300_PAPRD_SCALE_1);
+-+ return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt20),
+-+ AR9300_PAPRD_SCALE_1);
+- else if (chan->channel >= 5400)
+- return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt40),
+-- AR9300_PAPRD_SCALE_2);
+-+ AR9300_PAPRD_SCALE_2);
+- else
+- return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt40),
+- AR9300_PAPRD_SCALE_1);
+diff --git a/package/kernel/mac80211/patches/308-ath10k-remove-duplicate-and-unused-rx-rate-flags.patch b/package/kernel/mac80211/patches/308-ath10k-remove-duplicate-and-unused-rx-rate-flags.patch
+new file mode 100644
+index 0000000..7c5c5be
+--- /dev/null
++++ b/package/kernel/mac80211/patches/308-ath10k-remove-duplicate-and-unused-rx-rate-flags.patch
+@@ -0,0 +1,66 @@
++From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
++Date: Thu, 2 Jun 2016 19:54:41 +0530
++Subject: [PATCH] ath10k: remove duplicate and unused rx rate flags
++
++All these flags are not used and their use is completely
++covered by 'ath10k_hw_rate_ofdm', 'ath10k_hw_rate_cck',
++and RX_PPDU_START_RATE_FLAG
++
++Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
++---
++
++--- a/drivers/net/wireless/ath/ath10k/rx_desc.h
+++++ b/drivers/net/wireless/ath/ath10k/rx_desc.h
++@@ -656,26 +656,6 @@ struct rx_msdu_end {
++ * Reserved: HW should fill with zero. FW should ignore.
++ */
++
++-#define RX_PPDU_START_SIG_RATE_SELECT_OFDM 0
++-#define RX_PPDU_START_SIG_RATE_SELECT_CCK 1
++-
++-#define RX_PPDU_START_SIG_RATE_OFDM_48 0
++-#define RX_PPDU_START_SIG_RATE_OFDM_24 1
++-#define RX_PPDU_START_SIG_RATE_OFDM_12 2
++-#define RX_PPDU_START_SIG_RATE_OFDM_6 3
++-#define RX_PPDU_START_SIG_RATE_OFDM_54 4
++-#define RX_PPDU_START_SIG_RATE_OFDM_36 5
++-#define RX_PPDU_START_SIG_RATE_OFDM_18 6
++-#define RX_PPDU_START_SIG_RATE_OFDM_9 7
++-
++-#define RX_PPDU_START_SIG_RATE_CCK_LP_11 0
++-#define RX_PPDU_START_SIG_RATE_CCK_LP_5_5 1
++-#define RX_PPDU_START_SIG_RATE_CCK_LP_2 2
++-#define RX_PPDU_START_SIG_RATE_CCK_LP_1 3
++-#define RX_PPDU_START_SIG_RATE_CCK_SP_11 4
++-#define RX_PPDU_START_SIG_RATE_CCK_SP_5_5 5
++-#define RX_PPDU_START_SIG_RATE_CCK_SP_2 6
++-
++ #define HTT_RX_PPDU_START_PREAMBLE_LEGACY 0x04
++ #define HTT_RX_PPDU_START_PREAMBLE_HT 0x08
++ #define HTT_RX_PPDU_START_PREAMBLE_HT_WITH_TXBF 0x09
++@@ -711,25 +691,6 @@ struct rx_msdu_end {
++ /* No idea what this flag means. It seems to be always set in rate. */
++ #define RX_PPDU_START_RATE_FLAG BIT(3)
++
++-enum rx_ppdu_start_rate {
++- RX_PPDU_START_RATE_OFDM_48M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_48M,
++- RX_PPDU_START_RATE_OFDM_24M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_24M,
++- RX_PPDU_START_RATE_OFDM_12M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_12M,
++- RX_PPDU_START_RATE_OFDM_6M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_6M,
++- RX_PPDU_START_RATE_OFDM_54M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_54M,
++- RX_PPDU_START_RATE_OFDM_36M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_36M,
++- RX_PPDU_START_RATE_OFDM_18M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_18M,
++- RX_PPDU_START_RATE_OFDM_9M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_OFDM_9M,
++-
++- RX_PPDU_START_RATE_CCK_LP_11M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_CCK_LP_11M,
++- RX_PPDU_START_RATE_CCK_LP_5_5M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_CCK_LP_5_5M,
++- RX_PPDU_START_RATE_CCK_LP_2M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_CCK_LP_2M,
++- RX_PPDU_START_RATE_CCK_LP_1M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_CCK_LP_1M,
++- RX_PPDU_START_RATE_CCK_SP_11M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_CCK_SP_11M,
++- RX_PPDU_START_RATE_CCK_SP_5_5M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_CCK_SP_5_5M,
++- RX_PPDU_START_RATE_CCK_SP_2M = RX_PPDU_START_RATE_FLAG | ATH10K_HW_RATE_CCK_SP_2M,
++-};
++-
++ struct rx_ppdu_start {
++ struct {
++ u8 pri20_mhz;
+diff --git a/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch b/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch
+deleted file mode 100644
+index d408866..0000000
+--- a/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch
++++ /dev/null
+@@ -1,65 +0,0 @@
+-From: Miaoqing Pan <miaoqing@codeaurora.org>
+-Date: Fri, 15 Jan 2016 18:17:21 +0800
+-Subject: [PATCH] ath9k: fix data bus error on ar9300 and ar9580
+-
+-One crash issue be found on ar9300: RTC_RC reg read leads crash, leading
+-the data bus error, due to RTC_RC reg write not happen properly.
+-
+-Warm Reset trigger in continuous beacon stuck for one of the customer for
+-other chip, noticed the MAC was stuck in RTC reset. After analysis noticed
+-DMA did not complete when RTC was put in reset.
+-
+-So, before resetting the MAC need to make sure there are no pending DMA
+-transactions because this reset does not reset all parts of the chip.
+-
+-The 12th and 11th bit of MAC _DMA_CFG register used to do that.
+- 12 cfg_halt_ack 0x0
+- 0 DMA has not yet halted
+- 1 DMA has halted
+- 11 cfg_halt_req 0x0
+- 0 DMA logic operates normally
+- 1 Request DMA logic to stop so software can reset the MAC
+-
+-The Bit [12] of this register indicates when the halt has taken effect or
+-not. the DMA halt IS NOT recoverable; once software sets bit [11] to
+-request a DMA halt, software must wait for bit [12] to be set and reset
+-the MAC.
+-
+-So, the same thing we implemented for ar9580 chip.
+-
+-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/hw.c
+-+++ b/drivers/net/wireless/ath/ath9k/hw.c
+-@@ -1368,6 +1368,16 @@ static bool ath9k_hw_set_reset(struct at
+- if (ath9k_hw_mci_is_enabled(ah))
+- ar9003_mci_check_gpm_offset(ah);
+-
+-+ /* DMA HALT added to resolve ar9300 and ar9580 bus error during
+-+ * RTC_RC reg read
+-+ */
+-+ if (AR_SREV_9300(ah) || AR_SREV_9580(ah)) {
+-+ REG_SET_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
+-+ ath9k_hw_wait(ah, AR_CFG, AR_CFG_HALT_ACK, AR_CFG_HALT_ACK,
+-+ 20 * AH_WAIT_TIMEOUT);
+-+ REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
+-+ }
+-+
+- REG_WRITE(ah, AR_RTC_RC, rst_flags);
+-
+- REGWRITE_BUFFER_FLUSH(ah);
+---- a/drivers/net/wireless/ath/ath9k/reg.h
+-+++ b/drivers/net/wireless/ath/ath9k/reg.h
+-@@ -34,8 +34,10 @@
+- #define AR_CFG_SWRG 0x00000010
+- #define AR_CFG_AP_ADHOC_INDICATION 0x00000020
+- #define AR_CFG_PHOK 0x00000100
+--#define AR_CFG_CLK_GATE_DIS 0x00000400
+- #define AR_CFG_EEBS 0x00000200
+-+#define AR_CFG_CLK_GATE_DIS 0x00000400
+-+#define AR_CFG_HALT_REQ 0x00000800
+-+#define AR_CFG_HALT_ACK 0x00001000
+- #define AR_CFG_PCI_MASTER_REQ_Q_THRESH 0x00060000
+- #define AR_CFG_PCI_MASTER_REQ_Q_THRESH_S 17
+-
+diff --git a/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch b/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch
+deleted file mode 100644
+index d9511c8..0000000
+--- a/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch
++++ /dev/null
+@@ -1,19 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Fri, 15 Jan 2016 15:59:45 +0100
+-Subject: [PATCH] brcmfmac: add missing include
+-
+-linux/module.h is required for defining module parameters
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+-@@ -17,6 +17,7 @@
+- #include <linux/kernel.h>
+- #include <linux/string.h>
+- #include <linux/netdevice.h>
+-+#include <linux/module.h>
+- #include <brcmu_wifi.h>
+- #include <brcmu_utils.h>
+- #include "core.h"
+diff --git a/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch b/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch
+deleted file mode 100644
+index 711e019..0000000
+--- a/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch
++++ /dev/null
+@@ -1,118 +0,0 @@
+-From: Hante Meuleman <meuleman@broadcom.com>
+-Date: Tue, 19 Jan 2016 12:39:24 +0100
+-Subject: [PATCH] brcmfmac: fix sdio sg table alloc crash
+-
+-With commit 7d34b0560567 ("brcmfmac: Move all module parameters to
+-one place") a bug was introduced causing a null pointer exception.
+-This patch fixes the bug by initializing the sg table till after
+-the settings have been initialized.
+-
+-Fixes: 7d34b0560567 ("brcmfmac: Move all module parameters to one place")
+-Reported-by: Marc Zyngier <marc.zyngier@arm.com>
+-Tested-by: Marc Zyngier <marc.zyngier@arm.com>
+-Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+-Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+-Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+-Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+-Signed-off-by: Arend van Spriel <arend@broadcom.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+-@@ -879,11 +879,24 @@ int brcmf_sdiod_abort(struct brcmf_sdio_
+- return 0;
+- }
+-
+--static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
+-+void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
+- {
+-+ struct sdio_func *func;
+-+ struct mmc_host *host;
+-+ uint max_blocks;
+- uint nents;
+- int err;
+-
+-+ func = sdiodev->func[2];
+-+ host = func->card->host;
+-+ sdiodev->sg_support = host->max_segs > 1;
+-+ max_blocks = min_t(uint, host->max_blk_count, 511u);
+-+ sdiodev->max_request_size = min_t(uint, host->max_req_size,
+-+ max_blocks * func->cur_blksize);
+-+ sdiodev->max_segment_count = min_t(uint, host->max_segs,
+-+ SG_MAX_SINGLE_ALLOC);
+-+ sdiodev->max_segment_size = host->max_seg_size;
+-+
+- if (!sdiodev->sg_support)
+- return;
+-
+-@@ -1021,9 +1034,6 @@ static void brcmf_sdiod_host_fixup(struc
+-
+- static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
+- {
+-- struct sdio_func *func;
+-- struct mmc_host *host;
+-- uint max_blocks;
+- int ret = 0;
+-
+- sdiodev->num_funcs = 2;
+-@@ -1054,26 +1064,6 @@ static int brcmf_sdiod_probe(struct brcm
+- goto out;
+- }
+-
+-- /*
+-- * determine host related variables after brcmf_sdiod_probe()
+-- * as func->cur_blksize is properly set and F2 init has been
+-- * completed successfully.
+-- */
+-- func = sdiodev->func[2];
+-- host = func->card->host;
+-- sdiodev->sg_support = host->max_segs > 1;
+-- max_blocks = min_t(uint, host->max_blk_count, 511u);
+-- sdiodev->max_request_size = min_t(uint, host->max_req_size,
+-- max_blocks * func->cur_blksize);
+-- sdiodev->max_segment_count = min_t(uint, host->max_segs,
+-- SG_MAX_SINGLE_ALLOC);
+-- sdiodev->max_segment_size = host->max_seg_size;
+--
+-- /* allocate scatter-gather table. sg support
+-- * will be disabled upon allocation failure.
+-- */
+-- brcmf_sdiod_sgtable_alloc(sdiodev);
+--
+- ret = brcmf_sdiod_freezer_attach(sdiodev);
+- if (ret)
+- goto out;
+-@@ -1084,7 +1074,7 @@ static int brcmf_sdiod_probe(struct brcm
+- ret = -ENODEV;
+- goto out;
+- }
+-- brcmf_sdiod_host_fixup(host);
+-+ brcmf_sdiod_host_fixup(sdiodev->func[2]->card->host);
+- out:
+- if (ret)
+- brcmf_sdiod_remove(sdiodev);
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+-@@ -4114,6 +4114,11 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
+- goto fail;
+- }
+-
+-+ /* allocate scatter-gather table. sg support
+-+ * will be disabled upon allocation failure.
+-+ */
+-+ brcmf_sdiod_sgtable_alloc(bus->sdiodev);
+-+
+- /* Query the F2 block size, set roundup accordingly */
+- bus->blocksize = bus->sdiodev->func[2]->cur_blksize;
+- bus->roundup = min(max_roundup, bus->blocksize);
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
+-@@ -342,6 +342,7 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_
+-
+- /* Issue an abort to the specified function */
+- int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
+-+void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev);
+- void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
+- enum brcmf_sdiod_state state);
+- #ifdef CONFIG_PM_SLEEP
+diff --git a/package/kernel/mac80211/patches/309-ath10k-fix-CCK-h-w-rates-for-QCA99X0-and-newer-chips.patch b/package/kernel/mac80211/patches/309-ath10k-fix-CCK-h-w-rates-for-QCA99X0-and-newer-chips.patch
+new file mode 100644
+index 0000000..50ebfce
+--- /dev/null
++++ b/package/kernel/mac80211/patches/309-ath10k-fix-CCK-h-w-rates-for-QCA99X0-and-newer-chips.patch
+@@ -0,0 +1,141 @@
++From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
++Date: Thu, 2 Jun 2016 19:54:42 +0530
++Subject: [PATCH] ath10k: fix CCK h/w rates for QCA99X0 and newer chipsets
++
++CCK hardware table mapping from QCA99X0 onwards got revised.
++The CCK hardware rate values are in a proper order wrt. to
++rate and preamble as below
++
++ATH10K_HW_RATE_REV2_CCK_LP_1M = 1,
++ATH10K_HW_RATE_REV2_CCK_LP_2M = 2,
++ATH10K_HW_RATE_REV2_CCK_LP_5_5M = 3,
++ATH10K_HW_RATE_REV2_CCK_LP_11M = 4,
++ATH10K_HW_RATE_REV2_CCK_SP_2M = 5,
++ATH10K_HW_RATE_REV2_CCK_SP_5_5M = 6,
++ATH10K_HW_RATE_REV2_CCK_SP_11M = 7,
++
++This results in reporting of rx frames (with CCK rates)
++totally wrong for QCA99X0, QCA4019. Fix this by having
++separate CCK rate table for these chipsets with rev2 suffix
++and registering the correct rate mapping to mac80211 based on
++the new hw_param (introduced) 'cck_rate_map_rev2' which shall
++be true for any newchipsets from QCA99X0 onwards
++
++Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
++---
++
++--- a/drivers/net/wireless/ath/ath10k/core.c
+++++ b/drivers/net/wireless/ath/ath10k/core.c
++@@ -148,6 +148,8 @@ static const struct ath10k_hw_params ath
++ .uart_pin = 7,
++ .otp_exe_param = 0x00000700,
++ .continuous_frag_desc = true,
+++ .cck_rate_map_rev2 = true,
+++ .cck_rate_map_rev2 = true,
++ .channel_counters_freq_hz = 150000,
++ .max_probe_resp_desc_thres = 24,
++ .hw_4addr_pad = ATH10K_HW_4ADDR_PAD_BEFORE,
++@@ -205,6 +207,7 @@ static const struct ath10k_hw_params ath
++ .has_shifted_cc_wraparound = true,
++ .otp_exe_param = 0x0010000,
++ .continuous_frag_desc = true,
+++ .cck_rate_map_rev2 = true,
++ .channel_counters_freq_hz = 125000,
++ .max_probe_resp_desc_thres = 24,
++ .hw_4addr_pad = ATH10K_HW_4ADDR_PAD_BEFORE,
++--- a/drivers/net/wireless/ath/ath10k/core.h
+++++ b/drivers/net/wireless/ath/ath10k/core.h
++@@ -716,6 +716,12 @@ struct ath10k {
++ */
++ bool continuous_frag_desc;
++
+++ /* CCK hardware rate table mapping for the newer chipsets
+++ * like QCA99X0, QCA4019 got revised. The CCK h/w rate values
+++ * are in a proper order with respect to the rate/preamble
+++ */
+++ bool cck_rate_map_rev2;
+++
++ u32 channel_counters_freq_hz;
++
++ /* Mgmt tx descriptors threshold for limiting probe response
++--- a/drivers/net/wireless/ath/ath10k/hw.h
+++++ b/drivers/net/wireless/ath/ath10k/hw.h
++@@ -315,6 +315,16 @@ enum ath10k_hw_rate_cck {
++ ATH10K_HW_RATE_CCK_SP_2M,
++ };
++
+++enum ath10k_hw_rate_rev2_cck {
+++ ATH10K_HW_RATE_REV2_CCK_LP_1M = 1,
+++ ATH10K_HW_RATE_REV2_CCK_LP_2M,
+++ ATH10K_HW_RATE_REV2_CCK_LP_5_5M,
+++ ATH10K_HW_RATE_REV2_CCK_LP_11M,
+++ ATH10K_HW_RATE_REV2_CCK_SP_2M,
+++ ATH10K_HW_RATE_REV2_CCK_SP_5_5M,
+++ ATH10K_HW_RATE_REV2_CCK_SP_11M,
+++};
+++
++ enum ath10k_hw_4addr_pad {
++ ATH10K_HW_4ADDR_PAD_AFTER,
++ ATH10K_HW_4ADDR_PAD_BEFORE,
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -62,6 +62,32 @@ static struct ieee80211_rate ath10k_rate
++ { .bitrate = 540, .hw_value = ATH10K_HW_RATE_OFDM_54M },
++ };
++
+++static struct ieee80211_rate ath10k_rates_rev2[] = {
+++ { .bitrate = 10,
+++ .hw_value = ATH10K_HW_RATE_REV2_CCK_LP_1M },
+++ { .bitrate = 20,
+++ .hw_value = ATH10K_HW_RATE_REV2_CCK_LP_2M,
+++ .hw_value_short = ATH10K_HW_RATE_REV2_CCK_SP_2M,
+++ .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+++ { .bitrate = 55,
+++ .hw_value = ATH10K_HW_RATE_REV2_CCK_LP_5_5M,
+++ .hw_value_short = ATH10K_HW_RATE_REV2_CCK_SP_5_5M,
+++ .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+++ { .bitrate = 110,
+++ .hw_value = ATH10K_HW_RATE_REV2_CCK_LP_11M,
+++ .hw_value_short = ATH10K_HW_RATE_REV2_CCK_SP_11M,
+++ .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+++
+++ { .bitrate = 60, .hw_value = ATH10K_HW_RATE_OFDM_6M },
+++ { .bitrate = 90, .hw_value = ATH10K_HW_RATE_OFDM_9M },
+++ { .bitrate = 120, .hw_value = ATH10K_HW_RATE_OFDM_12M },
+++ { .bitrate = 180, .hw_value = ATH10K_HW_RATE_OFDM_18M },
+++ { .bitrate = 240, .hw_value = ATH10K_HW_RATE_OFDM_24M },
+++ { .bitrate = 360, .hw_value = ATH10K_HW_RATE_OFDM_36M },
+++ { .bitrate = 480, .hw_value = ATH10K_HW_RATE_OFDM_48M },
+++ { .bitrate = 540, .hw_value = ATH10K_HW_RATE_OFDM_54M },
+++};
+++
++ #define ATH10K_MAC_FIRST_OFDM_RATE_IDX 4
++
++ #define ath10k_a_rates (ath10k_rates + ATH10K_MAC_FIRST_OFDM_RATE_IDX)
++@@ -70,6 +96,9 @@ static struct ieee80211_rate ath10k_rate
++ #define ath10k_g_rates (ath10k_rates + 0)
++ #define ath10k_g_rates_size (ARRAY_SIZE(ath10k_rates))
++
+++#define ath10k_g_rates_rev2 (ath10k_rates_rev2 + 0)
+++#define ath10k_g_rates_rev2_size (ARRAY_SIZE(ath10k_rates_rev2))
+++
++ static bool ath10k_mac_bitrate_is_cck(int bitrate)
++ {
++ switch (bitrate) {
++@@ -7720,8 +7749,14 @@ int ath10k_mac_register(struct ath10k *a
++ band = &ar->mac.sbands[NL80211_BAND_2GHZ];
++ band->n_channels = ARRAY_SIZE(ath10k_2ghz_channels);
++ band->channels = channels;
++- band->n_bitrates = ath10k_g_rates_size;
++- band->bitrates = ath10k_g_rates;
+++
+++ if (ar->hw_params.cck_rate_map_rev2) {
+++ band->n_bitrates = ath10k_g_rates_rev2_size;
+++ band->bitrates = ath10k_g_rates_rev2;
+++ } else {
+++ band->n_bitrates = ath10k_g_rates_size;
+++ band->bitrates = ath10k_g_rates;
+++ }
++
++ ar->hw->wiphy->bands[NL80211_BAND_2GHZ] = band;
++ }
+diff --git a/package/kernel/mac80211/patches/310-ath10k-improve-tx-scheduling.patch b/package/kernel/mac80211/patches/310-ath10k-improve-tx-scheduling.patch
+new file mode 100644
+index 0000000..81ac2db
+--- /dev/null
++++ b/package/kernel/mac80211/patches/310-ath10k-improve-tx-scheduling.patch
+@@ -0,0 +1,67 @@
++From: Michal Kazior <michal.kazior@tieto.com>
++Date: Mon, 23 May 2016 23:12:45 +0300
++Subject: [PATCH] ath10k: improve tx scheduling
++
++Recent changes revolving around implementing
++wake_tx_queue support introduced a significant
++performance regressions on some (slower, uni-proc)
++systems.
++
++Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
++Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
++---
++
++--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
++@@ -2291,7 +2291,6 @@ bool ath10k_htt_t2h_msg_handler(struct a
++ ath10k_htt_tx_mgmt_dec_pending(htt);
++ spin_unlock_bh(&htt->tx_lock);
++ }
++- ath10k_mac_tx_push_pending(ar);
++ break;
++ }
++ case HTT_T2H_MSG_TYPE_TX_COMPL_IND:
++@@ -2442,8 +2441,6 @@ static void ath10k_htt_txrx_compl_task(u
++ dev_kfree_skb_any(skb);
++ }
++
++- ath10k_mac_tx_push_pending(ar);
++-
++ num_mpdus = atomic_read(&htt->num_mpdus_ready);
++
++ while (num_mpdus) {
++--- a/drivers/net/wireless/ath/ath10k/mac.c
+++++ b/drivers/net/wireless/ath/ath10k/mac.c
++@@ -3827,6 +3827,9 @@ void ath10k_mac_tx_push_pending(struct a
++ int ret;
++ int max;
++
+++ if (ar->htt.num_pending_tx >= (ar->htt.max_num_pending_tx / 2))
+++ return;
+++
++ spin_lock_bh(&ar->txqs_lock);
++ rcu_read_lock();
++
++@@ -4097,9 +4100,7 @@ static void ath10k_mac_op_wake_tx_queue(
++ list_add_tail(&artxq->list, &ar->txqs);
++ spin_unlock_bh(&ar->txqs_lock);
++
++- if (ath10k_mac_tx_can_push(hw, txq))
++- tasklet_schedule(&ar->htt.txrx_compl_task);
++-
+++ ath10k_mac_tx_push_pending(ar);
++ ath10k_htt_tx_txq_update(hw, txq);
++ }
++
++--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++++ b/drivers/net/wireless/ath/ath10k/txrx.c
++@@ -117,6 +117,9 @@ int ath10k_txrx_tx_unref(struct ath10k_h
++
++ ieee80211_tx_status(htt->ar->hw, msdu);
++ /* we do not own the msdu anymore */
+++
+++ ath10k_mac_tx_push_pending(ar);
+++
++ return 0;
++ }
++
+diff --git a/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch b/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch
+deleted file mode 100644
+index 287d6e1..0000000
+--- a/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch
++++ /dev/null
+@@ -1,38 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Thu, 21 Jan 2016 16:28:44 +0100
+-Subject: [PATCH] ath9k_hw: ignore eeprom magic mismatch on flash based devices
+-
+-Many AR913x based devices (maybe others too) do not have a valid EEPROM
+-magic in their calibration data partition.
+-
+-Fixes: 6fa658fd5ab2 ("ath9k: Simplify and fix eeprom endianness swapping")
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/eeprom.c
+-+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
+-@@ -150,18 +150,18 @@ int ath9k_hw_nvram_swap_data(struct ath_
+- return -EIO;
+- }
+-
+-- if (magic == AR5416_EEPROM_MAGIC) {
+-- *swap_needed = false;
+-- } else if (swab16(magic) == AR5416_EEPROM_MAGIC) {
+-+ *swap_needed = false;
+-+ if (swab16(magic) == AR5416_EEPROM_MAGIC) {
+- if (ah->ah_flags & AH_NO_EEP_SWAP) {
+- ath_info(common,
+- "Ignoring endianness difference in EEPROM magic bytes.\n");
+--
+-- *swap_needed = false;
+- } else {
+- *swap_needed = true;
+- }
+-- } else {
+-+ } else if (magic != AR5416_EEPROM_MAGIC) {
+-+ if (ath9k_hw_use_flash(ah))
+-+ return 0;
+-+
+- ath_err(common,
+- "Invalid EEPROM Magic (0x%04x).\n", magic);
+- return -EINVAL;
+diff --git a/package/kernel/mac80211/patches/311-ath10k-fix-deadlock-while-processing-rx_in_ord_ind.patch b/package/kernel/mac80211/patches/311-ath10k-fix-deadlock-while-processing-rx_in_ord_ind.patch
+new file mode 100644
+index 0000000..3664d70
+--- /dev/null
++++ b/package/kernel/mac80211/patches/311-ath10k-fix-deadlock-while-processing-rx_in_ord_ind.patch
+@@ -0,0 +1,59 @@
++From: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
++Date: Thu, 9 Jun 2016 11:33:55 +0530
++Subject: [PATCH] ath10k: fix deadlock while processing rx_in_ord_ind
++
++commit 5c86d97bcc1d ("ath10k: combine txrx and replenish task")
++introduced deadlock while processing rx in order indication message
++for qca6174 based devices. While merging replenish and txrx tasklets,
++replenish task should be called out of htt rx ring locking since it
++is also try to acquire the same lock.
++
++Unfortunately this issue is not exposed by other solutions (qca988x,
++qca99x0 & qca4019), as rx_in_ord_ind message is specific to qca6174
++based devices. This patch fixes
++
++=============================================
++[ INFO: possible recursive locking detected ]
++4.7.0-rc2-wt-ath+ #1353 Tainted: G E
++---------------------------------------------
++swapper/3/0 is trying to acquire lock:
++ (&(&htt->rx_ring.lock)->rlock){+.-...}, at: [<f8d7ef19>]
++ath10k_htt_rx_msdu_buff_replenish+0x29/0x90 [ath10k_core]
++
++but task is already holding lock:
++ (&(&htt->rx_ring.lock)->rlock){+.-...}, at: [<f8d82cab>]
++ath10k_htt_txrx_compl_task+0x21b/0x250 [ath10k_core]
++
++other info that might help us debug this:
++ Possible unsafe locking scenario:
++
++ CPU0
++ ----
++ lock(&(&htt->rx_ring.lock)->rlock);
++ lock(&(&htt->rx_ring.lock)->rlock);
++
++ *** DEADLOCK ***
++
++ May be due to missing lock nesting notation
++
++1 lock held by swapper/3/0:
++ #0: (&(&htt->rx_ring.lock)->rlock){+.-...}, at: [<f8d82cab>]
++ath10k_htt_txrx_compl_task+0x21b/0x250 [ath10k_core]
++
++Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=119151
++Fixes: 5c86d97bcc1d ("ath10k: combine txrx and replenish task")
++Reported-by: Mike Lothian <mike@fireburn.co.uk>
++Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
++Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
++---
++
++--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
++@@ -1904,7 +1904,6 @@ static void ath10k_htt_rx_in_ord_ind(str
++ return;
++ }
++ }
++- ath10k_htt_rx_msdu_buff_replenish(htt);
++ }
++
++ static void ath10k_htt_rx_tx_fetch_resp_id_confirm(struct ath10k *ar,
+diff --git a/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch b/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch
+deleted file mode 100644
+index 070efa9..0000000
+--- a/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch
++++ /dev/null
+@@ -1,55 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Fri, 22 Jan 2016 01:05:56 +0100
+-Subject: [PATCH] ath9k: do not limit the number of DFS interfaces to 1
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/init.c
+-+++ b/drivers/net/wireless/ath/ath9k/init.c
+-@@ -751,14 +751,6 @@ static const struct ieee80211_iface_comb
+-
+- #endif /* CPTCFG_ATH9K_CHANNEL_CONTEXT */
+-
+--static const struct ieee80211_iface_limit if_dfs_limits[] = {
+-- { .max = 1, .types = BIT(NL80211_IFTYPE_AP) |
+--#ifdef CPTCFG_MAC80211_MESH
+-- BIT(NL80211_IFTYPE_MESH_POINT) |
+--#endif
+-- BIT(NL80211_IFTYPE_ADHOC) },
+--};
+--
+- static const struct ieee80211_iface_combination if_comb[] = {
+- {
+- .limits = if_limits,
+-@@ -766,6 +758,11 @@ static const struct ieee80211_iface_comb
+- .max_interfaces = 2048,
+- .num_different_channels = 1,
+- .beacon_int_infra_match = true,
+-+#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
+-+ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
+-+ BIT(NL80211_CHAN_WIDTH_20) |
+-+ BIT(NL80211_CHAN_WIDTH_40),
+-+#endif
+- },
+- {
+- .limits = wds_limits,
+-@@ -774,18 +771,6 @@ static const struct ieee80211_iface_comb
+- .num_different_channels = 1,
+- .beacon_int_infra_match = true,
+- },
+--#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
+-- {
+-- .limits = if_dfs_limits,
+-- .n_limits = ARRAY_SIZE(if_dfs_limits),
+-- .max_interfaces = 1,
+-- .num_different_channels = 1,
+-- .beacon_int_infra_match = true,
+-- .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
+-- BIT(NL80211_CHAN_WIDTH_20) |
+-- BIT(NL80211_CHAN_WIDTH_40),
+-- }
+--#endif
+- };
+-
+- #ifdef CPTCFG_ATH9K_CHANNEL_CONTEXT
+diff --git a/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch b/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch
+deleted file mode 100644
+index 61cafc7..0000000
+--- a/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch
++++ /dev/null
+@@ -1,27 +0,0 @@
+-From: Michal Kazior <michal.kazior@tieto.com>
+-Date: Thu, 21 Jan 2016 14:23:07 +0100
+-Subject: [PATCH] mac80211: fix txq queue related crashes
+-
+-The driver can access the queue simultanously
+-while mac80211 tears down the interface. Without
+-spinlock protection this could lead to corrupting
+-sk_buff_head and subsequently to an invalid
+-pointer dereference.
+-
+-Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
+-Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
+----
+-
+---- a/net/mac80211/iface.c
+-+++ b/net/mac80211/iface.c
+-@@ -977,7 +977,10 @@ static void ieee80211_do_stop(struct iee
+- if (sdata->vif.txq) {
+- struct txq_info *txqi = to_txq_info(sdata->vif.txq);
+-
+-+ spin_lock_bh(&txqi->queue.lock);
+- ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
+-+ spin_unlock_bh(&txqi->queue.lock);
+-+
+- atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
+- }
+-
+diff --git a/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch b/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch
+deleted file mode 100644
+index 844d43b..0000000
+--- a/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch
++++ /dev/null
+@@ -1,57 +0,0 @@
+-From: Michal Kazior <michal.kazior@tieto.com>
+-Date: Mon, 25 Jan 2016 14:43:24 +0100
+-Subject: [PATCH] mac80211: fix unnecessary frame drops in mesh fwding
+-
+-The ieee80211_queue_stopped() expects hw queue
+-number but it was given raw WMM AC number instead.
+-
+-This could cause frame drops and problems with
+-traffic in some cases - most notably if driver
+-doesn't map AC numbers to queue numbers 1:1 and
+-uses ieee80211_stop_queues() and
+-ieee80211_wake_queue() only without ever calling
+-ieee80211_wake_queues().
+-
+-On ath10k it was possible to hit this problem in
+-the following case:
+-
+- 1. wlan0 uses queue 0
+- (ath10k maps queues per vif)
+- 2. offchannel uses queue 15
+- 3. queues 1-14 are unused
+- 4. ieee80211_stop_queues()
+- 5. ieee80211_wake_queue(q=0)
+- 6. ieee80211_wake_queue(q=15)
+- (other queues are not woken up because both
+- driver and mac80211 know other queues are
+- unused)
+- 7. ieee80211_rx_h_mesh_fwding()
+- 8. ieee80211_select_queue_80211() returns 2
+- 9. ieee80211_queue_stopped(q=2) returns true
+- 10. frame is dropped (oops!)
+-
+-Fixes: d3c1597b8d1b ("mac80211: fix forwarded mesh frame queue mapping")
+-Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
+----
+-
+---- a/net/mac80211/rx.c
+-+++ b/net/mac80211/rx.c
+-@@ -2235,7 +2235,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
+- struct ieee80211_local *local = rx->local;
+- struct ieee80211_sub_if_data *sdata = rx->sdata;
+- struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+-- u16 q, hdrlen;
+-+ u16 ac, q, hdrlen;
+-
+- hdr = (struct ieee80211_hdr *) skb->data;
+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
+-@@ -2304,7 +2304,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
+- ether_addr_equal(sdata->vif.addr, hdr->addr3))
+- return RX_CONTINUE;
+-
+-- q = ieee80211_select_queue_80211(sdata, skb, hdr);
+-+ ac = ieee80211_select_queue_80211(sdata, skb, hdr);
+-+ q = sdata->vif.hw_queue[ac];
+- if (ieee80211_queue_stopped(&local->hw, q)) {
+- IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_congestion);
+- return RX_DROP_MONITOR;
+diff --git a/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch b/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch
+deleted file mode 100644
+index 5b3efbd..0000000
+--- a/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch
++++ /dev/null
+@@ -1,103 +0,0 @@
+-From: Sachin Kulkarni <Sachin.Kulkarni@imgtec.com>
+-Date: Tue, 12 Jan 2016 14:30:19 +0530
+-Subject: [PATCH] mac80211: Requeue work after scan complete for all VIF
+- types.
+-
+-During a sw scan ieee80211_iface_work ignores work items for all vifs.
+-However after the scan complete work is requeued only for STA, ADHOC
+-and MESH iftypes.
+-
+-This occasionally results in event processing getting delayed/not
+-processed for iftype AP when it coexists with a STA. This can result
+-in data halt and eventually disconnection on the AP interface.
+-
+-Signed-off-by: Sachin Kulkarni <Sachin.Kulkarni@imgtec.com>
+-Cc: linux-wireless@vger.kernel.org
+-Cc: johannes@sipsolutions.net
+----
+-
+---- a/net/mac80211/ibss.c
+-+++ b/net/mac80211/ibss.c
+-@@ -1731,7 +1731,6 @@ void ieee80211_ibss_notify_scan_complete
+- if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
+- continue;
+- sdata->u.ibss.last_scan_completed = jiffies;
+-- ieee80211_queue_work(&local->hw, &sdata->work);
+- }
+- mutex_unlock(&local->iflist_mtx);
+- }
+---- a/net/mac80211/mesh.c
+-+++ b/net/mac80211/mesh.c
+-@@ -1369,17 +1369,6 @@ out:
+- sdata_unlock(sdata);
+- }
+-
+--void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
+--{
+-- struct ieee80211_sub_if_data *sdata;
+--
+-- rcu_read_lock();
+-- list_for_each_entry_rcu(sdata, &local->interfaces, list)
+-- if (ieee80211_vif_is_mesh(&sdata->vif) &&
+-- ieee80211_sdata_running(sdata))
+-- ieee80211_queue_work(&local->hw, &sdata->work);
+-- rcu_read_unlock();
+--}
+-
+- void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
+- {
+---- a/net/mac80211/mesh.h
+-+++ b/net/mac80211/mesh.h
+-@@ -362,14 +362,10 @@ static inline bool mesh_path_sel_is_hwmp
+- return sdata->u.mesh.mesh_pp_id == IEEE80211_PATH_PROTOCOL_HWMP;
+- }
+-
+--void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local);
+--
+- void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
+- void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);
+- void ieee80211s_stop(void);
+- #else
+--static inline void
+--ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) {}
+- static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)
+- { return false; }
+- static inline void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)
+---- a/net/mac80211/mlme.c
+-+++ b/net/mac80211/mlme.c
+-@@ -3978,8 +3978,6 @@ static void ieee80211_restart_sta_timer(
+- if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR))
+- ieee80211_queue_work(&sdata->local->hw,
+- &sdata->u.mgd.monitor_work);
+-- /* and do all the other regular work too */
+-- ieee80211_queue_work(&sdata->local->hw, &sdata->work);
+- }
+- }
+-
+---- a/net/mac80211/scan.c
+-+++ b/net/mac80211/scan.c
+-@@ -314,6 +314,7 @@ static void __ieee80211_scan_completed(s
+- bool was_scanning = local->scanning;
+- struct cfg80211_scan_request *scan_req;
+- struct ieee80211_sub_if_data *scan_sdata;
+-+ struct ieee80211_sub_if_data *sdata;
+-
+- lockdep_assert_held(&local->mtx);
+-
+-@@ -373,7 +374,15 @@ static void __ieee80211_scan_completed(s
+-
+- ieee80211_mlme_notify_scan_completed(local);
+- ieee80211_ibss_notify_scan_completed(local);
+-- ieee80211_mesh_notify_scan_completed(local);
+-+
+-+ /* Requeue all the work that might have been ignored while
+-+ * the scan was in progress
+-+ */
+-+ list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+-+ if (ieee80211_sdata_running(sdata))
+-+ ieee80211_queue_work(&sdata->local->hw, &sdata->work);
+-+ }
+-+
+- if (was_scanning)
+- ieee80211_start_next_roc(local);
+- }
+diff --git a/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch b/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch
+deleted file mode 100644
+index 52fecb9..0000000
+--- a/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch
++++ /dev/null
+@@ -1,57 +0,0 @@
+-From: Sara Sharon <sara.sharon@intel.com>
+-Date: Mon, 25 Jan 2016 15:46:35 +0200
+-Subject: [PATCH] mac80211: fix ibss scan parameters
+-
+-When joining IBSS a full scan should be initiated in order to search
+-for existing cell, unless the fixed_channel parameter was set.
+-A default channel to create the IBSS on if no cell was found is
+-provided as well.
+-However - a scan is initiated only on the default channel provided
+-regardless of whether ifibss->fixed_channel is set or not, with the
+-obvious result of the cell not joining existing IBSS cell that is
+-on another channel.
+-
+-Fixes: 76bed0f43b27 ("mac80211: IBSS fix scan request")
+-Signed-off-by: Sara Sharon <sara.sharon@intel.com>
+-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+----
+-
+---- a/net/mac80211/ibss.c
+-+++ b/net/mac80211/ibss.c
+-@@ -7,6 +7,7 @@
+- * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
+- * Copyright 2009, Johannes Berg <johannes@sipsolutions.net>
+- * Copyright 2013-2014 Intel Mobile Communications GmbH
+-+ * Copyright(c) 2016 Intel Deutschland GmbH
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 2 as
+-@@ -1483,14 +1484,21 @@ static void ieee80211_sta_find_ibss(stru
+-
+- sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
+-
+-- num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
+-- &ifibss->chandef,
+-- channels,
+-- ARRAY_SIZE(channels));
+- scan_width = cfg80211_chandef_to_scan_width(&ifibss->chandef);
+-- ieee80211_request_ibss_scan(sdata, ifibss->ssid,
+-- ifibss->ssid_len, channels, num,
+-- scan_width);
+-+
+-+ if (ifibss->fixed_channel) {
+-+ num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
+-+ &ifibss->chandef,
+-+ channels,
+-+ ARRAY_SIZE(channels));
+-+ ieee80211_request_ibss_scan(sdata, ifibss->ssid,
+-+ ifibss->ssid_len, channels,
+-+ num, scan_width);
+-+ } else {
+-+ ieee80211_request_ibss_scan(sdata, ifibss->ssid,
+-+ ifibss->ssid_len, NULL,
+-+ 0, scan_width);
+-+ }
+- } else {
+- int interval = IEEE80211_SCAN_INTERVAL;
+-
+diff --git a/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch b/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch
+deleted file mode 100644
+index e78df36..0000000
+--- a/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch
++++ /dev/null
+@@ -1,50 +0,0 @@
+-From: Chris Bainbridge <chris.bainbridge@gmail.com>
+-Date: Wed, 27 Jan 2016 15:46:18 +0000
+-Subject: [PATCH] net/mac80211/agg-rx.c: fix use of uninitialised values
+-
+-Use kzalloc instead of kmalloc for struct tid_ampdu_rx. Fixes:
+-
+-[ 7.976605] UBSAN: Undefined behaviour in net/mac80211/rx.c:932:29
+-[ 7.976608] load of value 2 is not a valid value for type '_Bool'
+-[ 7.976611] CPU: 3 PID: 1134 Comm: kworker/u16:7 Not tainted 4.5.0-rc1+ #265
+-[ 7.976613] Hardware name: Apple Inc. MacBookPro10,2/Mac-AFD8A9D944EA4843, BIOS MBP102.88Z.0106.B0A.1509130955 09/13/2015
+-[ 7.976616] Workqueue: phy0 rt2x00usb_work_rxdone
+-[ 7.976619] 0000000000000004 ffff880254a7ba50 ffffffff8181d866 0000000000000007
+-[ 7.976622] ffff880254a7ba78 ffff880254a7ba68 ffffffff8188422d ffffffff8379b500
+-[ 7.976626] ffff880254a7bab8 ffffffff81884747 0000000000000202 0000000348620032
+-[ 7.976629] Call Trace:
+-[ 7.976633] [<ffffffff8181d866>] dump_stack+0x45/0x5f
+-[ 7.976637] [<ffffffff8188422d>] ubsan_epilogue+0xd/0x40
+-[ 7.976642] [<ffffffff81884747>] __ubsan_handle_load_invalid_value+0x67/0x70
+-[ 7.976646] [<ffffffff82227b4d>] ieee80211_sta_reorder_release.isra.16+0x5ed/0x730
+-[ 7.976650] [<ffffffff8222ca14>] ieee80211_prepare_and_rx_handle+0xd04/0x1c00
+-[ 7.976654] [<ffffffff81cb27ce>] ? usb_hcd_map_urb_for_dma+0x65e/0x960
+-[ 7.976659] [<ffffffff8222db03>] __ieee80211_rx_handle_packet+0x1f3/0x750
+-[ 7.976663] [<ffffffff8222e4a7>] ieee80211_rx_napi+0x447/0x990
+-[ 7.976667] [<ffffffff81c5fb85>] rt2x00lib_rxdone+0x305/0xbd0
+-[ 7.976670] [<ffffffff811ac23f>] ? dequeue_task_fair+0x64f/0x1de0
+-[ 7.976674] [<ffffffff811a1516>] ? sched_clock_cpu+0xe6/0x150
+-[ 7.976678] [<ffffffff81c6c45c>] rt2x00usb_work_rxdone+0x7c/0x140
+-[ 7.976682] [<ffffffff8117aef6>] process_one_work+0x226/0x860
+-[ 7.976686] [<ffffffff8117b58c>] worker_thread+0x5c/0x680
+-[ 7.976690] [<ffffffff8117b530>] ? process_one_work+0x860/0x860
+-[ 7.976693] [<ffffffff81184f86>] kthread+0xf6/0x150
+-[ 7.976697] [<ffffffff81184e90>] ? kthread_worker_fn+0x310/0x310
+-[ 7.976700] [<ffffffff822a94df>] ret_from_fork+0x3f/0x70
+-[ 7.976703] [<ffffffff81184e90>] ? kthread_worker_fn+0x310/0x310
+-
+-Link: https://lkml.org/lkml/2016/1/26/230
+-Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com>
+----
+-
+---- a/net/mac80211/agg-rx.c
+-+++ b/net/mac80211/agg-rx.c
+-@@ -327,7 +327,7 @@ void __ieee80211_start_rx_ba_session(str
+- }
+-
+- /* prepare A-MPDU MLME for Rx aggregation */
+-- tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);
+-+ tid_agg_rx = kzalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);
+- if (!tid_agg_rx)
+- goto end;
+-
+diff --git a/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch b/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch
+deleted file mode 100644
+index 5bf53b9..0000000
+--- a/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch
++++ /dev/null
+@@ -1,45 +0,0 @@
+-From: Konstantin Khlebnikov <koct9i@gmail.com>
+-Date: Fri, 29 Jan 2016 11:35:12 +0300
+-Subject: [PATCH] mac80211: minstrel_ht: fix out-of-bound in
+- minstrel_ht_set_best_prob_rate
+-
+-Patch fixes this splat
+-
+-BUG: KASAN: slab-out-of-bounds in minstrel_ht_update_stats.isra.7+0x6e1/0x9e0
+-[mac80211] at addr ffff8800cee640f4 Read of size 4 by task swapper/3/0
+-
+-Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
+-Link: http://lkml.kernel.org/r/CALYGNiNyJhSaVnE35qS6UCGaSb2Dx1_i5HcRavuOX14oTz2P+w@mail.gmail.com
+----
+-
+---- a/net/mac80211/rc80211_minstrel_ht.c
+-+++ b/net/mac80211/rc80211_minstrel_ht.c
+-@@ -414,15 +414,16 @@ minstrel_ht_set_best_prob_rate(struct mi
+- (max_tp_group != MINSTREL_CCK_GROUP))
+- return;
+-
+-+ max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;
+-+ max_gpr_idx = mg->max_group_prob_rate % MCS_GROUP_RATES;
+-+ max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;
+-+
+- if (mrs->prob_ewma > MINSTREL_FRAC(75, 100)) {
+- cur_tp_avg = minstrel_ht_get_tp_avg(mi, cur_group, cur_idx,
+- mrs->prob_ewma);
+- if (cur_tp_avg > tmp_tp_avg)
+- mi->max_prob_rate = index;
+-
+-- max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;
+-- max_gpr_idx = mg->max_group_prob_rate % MCS_GROUP_RATES;
+-- max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;
+- max_gpr_tp_avg = minstrel_ht_get_tp_avg(mi, max_gpr_group,
+- max_gpr_idx,
+- max_gpr_prob);
+-@@ -431,7 +432,7 @@ minstrel_ht_set_best_prob_rate(struct mi
+- } else {
+- if (mrs->prob_ewma > tmp_prob)
+- mi->max_prob_rate = index;
+-- if (mrs->prob_ewma > mg->rates[mg->max_group_prob_rate].prob_ewma)
+-+ if (mrs->prob_ewma > max_gpr_prob)
+- mg->max_group_prob_rate = index;
+- }
+- }
+diff --git a/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch b/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch
+deleted file mode 100644
+index 655dc4b..0000000
+--- a/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch
++++ /dev/null
+@@ -1,35 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Tue, 2 Feb 2016 14:39:08 +0100
+-Subject: [PATCH] mac80211: move A-MSDU skb_linearize call to
+- ieee80211_amsdu_to_8023s
+-
+-Prepararation for zero-copy A-MSDU support with page fragment SKBs
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/mac80211/rx.c
+-+++ b/net/mac80211/rx.c
+-@@ -2203,9 +2203,6 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx
+- skb->dev = dev;
+- __skb_queue_head_init(&frame_list);
+-
+-- if (skb_linearize(skb))
+-- return RX_DROP_UNUSABLE;
+--
+- ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
+- rx->sdata->vif.type,
+- rx->local->hw.extra_tx_headroom, true);
+---- a/net/wireless/util.c
+-+++ b/net/wireless/util.c
+-@@ -657,6 +657,9 @@ void ieee80211_amsdu_to_8023s(struct sk_
+- int remaining, err;
+- u8 dst[ETH_ALEN], src[ETH_ALEN];
+-
+-+ if (skb_linearize(skb))
+-+ goto out;
+-+
+- if (has_80211_header) {
+- err = ieee80211_data_to_8023(skb, addr, iftype);
+- if (err)
+diff --git a/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch b/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch
+deleted file mode 100644
+index b646ab3..0000000
+--- a/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch
++++ /dev/null
+@@ -1,186 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Tue, 2 Feb 2016 14:39:09 +0100
+-Subject: [PATCH] cfg80211: add function for 802.3 conversion with separate
+- output buffer
+-
+-Use skb_copy_bits in preparation for allowing fragmented skbs
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/wireless/util.c
+-+++ b/net/wireless/util.c
+-@@ -393,9 +393,9 @@ unsigned int ieee80211_get_hdrlen_from_s
+- }
+- EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
+-
+--unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
+-+static unsigned int __ieee80211_get_mesh_hdrlen(u8 flags)
+- {
+-- int ae = meshhdr->flags & MESH_FLAGS_AE;
+-+ int ae = flags & MESH_FLAGS_AE;
+- /* 802.11-2012, 8.2.4.7.3 */
+- switch (ae) {
+- default:
+-@@ -407,21 +407,31 @@ unsigned int ieee80211_get_mesh_hdrlen(s
+- return 18;
+- }
+- }
+-+
+-+unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
+-+{
+-+ return __ieee80211_get_mesh_hdrlen(meshhdr->flags);
+-+}
+- EXPORT_SYMBOL(ieee80211_get_mesh_hdrlen);
+-
+--int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
+-- enum nl80211_iftype iftype)
+-+static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr,
+-+ const u8 *addr, enum nl80211_iftype iftype)
+- {
+- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+-- u16 hdrlen, ethertype;
+-- u8 *payload;
+-- u8 dst[ETH_ALEN];
+-- u8 src[ETH_ALEN] __aligned(2);
+-+ struct {
+-+ u8 hdr[ETH_ALEN] __aligned(2);
+-+ __be16 proto;
+-+ } payload;
+-+ struct ethhdr tmp;
+-+ u16 hdrlen;
+-+ u8 mesh_flags = 0;
+-
+- if (unlikely(!ieee80211_is_data_present(hdr->frame_control)))
+- return -1;
+-
+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
+-+ if (skb->len < hdrlen + 8)
+-+ return -1;
+-
+- /* convert IEEE 802.11 header + possible LLC headers into Ethernet
+- * header
+-@@ -432,8 +442,11 @@ int ieee80211_data_to_8023(struct sk_buf
+- * 1 0 BSSID SA DA n/a
+- * 1 1 RA TA DA SA
+- */
+-- memcpy(dst, ieee80211_get_DA(hdr), ETH_ALEN);
+-- memcpy(src, ieee80211_get_SA(hdr), ETH_ALEN);
+-+ memcpy(tmp.h_dest, ieee80211_get_DA(hdr), ETH_ALEN);
+-+ memcpy(tmp.h_source, ieee80211_get_SA(hdr), ETH_ALEN);
+-+
+-+ if (iftype == NL80211_IFTYPE_MESH_POINT)
+-+ skb_copy_bits(skb, hdrlen, &mesh_flags, 1);
+-
+- switch (hdr->frame_control &
+- cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {
+-@@ -450,44 +463,31 @@ int ieee80211_data_to_8023(struct sk_buf
+- iftype != NL80211_IFTYPE_STATION))
+- return -1;
+- if (iftype == NL80211_IFTYPE_MESH_POINT) {
+-- struct ieee80211s_hdr *meshdr =
+-- (struct ieee80211s_hdr *) (skb->data + hdrlen);
+-- /* make sure meshdr->flags is on the linear part */
+-- if (!pskb_may_pull(skb, hdrlen + 1))
+-- return -1;
+-- if (meshdr->flags & MESH_FLAGS_AE_A4)
+-+ if (mesh_flags & MESH_FLAGS_AE_A4)
+- return -1;
+-- if (meshdr->flags & MESH_FLAGS_AE_A5_A6) {
+-+ if (mesh_flags & MESH_FLAGS_AE_A5_A6) {
+- skb_copy_bits(skb, hdrlen +
+- offsetof(struct ieee80211s_hdr, eaddr1),
+-- dst, ETH_ALEN);
+-- skb_copy_bits(skb, hdrlen +
+-- offsetof(struct ieee80211s_hdr, eaddr2),
+-- src, ETH_ALEN);
+-+ tmp.h_dest, 2 * ETH_ALEN);
+- }
+-- hdrlen += ieee80211_get_mesh_hdrlen(meshdr);
+-+ hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
+- }
+- break;
+- case cpu_to_le16(IEEE80211_FCTL_FROMDS):
+- if ((iftype != NL80211_IFTYPE_STATION &&
+- iftype != NL80211_IFTYPE_P2P_CLIENT &&
+- iftype != NL80211_IFTYPE_MESH_POINT) ||
+-- (is_multicast_ether_addr(dst) &&
+-- ether_addr_equal(src, addr)))
+-+ (is_multicast_ether_addr(tmp.h_dest) &&
+-+ ether_addr_equal(tmp.h_source, addr)))
+- return -1;
+- if (iftype == NL80211_IFTYPE_MESH_POINT) {
+-- struct ieee80211s_hdr *meshdr =
+-- (struct ieee80211s_hdr *) (skb->data + hdrlen);
+-- /* make sure meshdr->flags is on the linear part */
+-- if (!pskb_may_pull(skb, hdrlen + 1))
+-- return -1;
+-- if (meshdr->flags & MESH_FLAGS_AE_A5_A6)
+-+ if (mesh_flags & MESH_FLAGS_AE_A5_A6)
+- return -1;
+-- if (meshdr->flags & MESH_FLAGS_AE_A4)
+-+ if (mesh_flags & MESH_FLAGS_AE_A4)
+- skb_copy_bits(skb, hdrlen +
+- offsetof(struct ieee80211s_hdr, eaddr1),
+-- src, ETH_ALEN);
+-- hdrlen += ieee80211_get_mesh_hdrlen(meshdr);
+-+ tmp.h_source, ETH_ALEN);
+-+ hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
+- }
+- break;
+- case cpu_to_le16(0):
+-@@ -498,33 +498,33 @@ int ieee80211_data_to_8023(struct sk_buf
+- break;
+- }
+-
+-- if (!pskb_may_pull(skb, hdrlen + 8))
+-- return -1;
+--
+-- payload = skb->data + hdrlen;
+-- ethertype = (payload[6] << 8) | payload[7];
+-+ skb_copy_bits(skb, hdrlen, &payload, sizeof(payload));
+-+ tmp.h_proto = payload.proto;
+-
+-- if (likely((ether_addr_equal(payload, rfc1042_header) &&
+-- ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
+-- ether_addr_equal(payload, bridge_tunnel_header))) {
+-+ if (likely((ether_addr_equal(payload.hdr, rfc1042_header) &&
+-+ tmp.h_proto != htons(ETH_P_AARP) &&
+-+ tmp.h_proto != htons(ETH_P_IPX)) ||
+-+ ether_addr_equal(payload.hdr, bridge_tunnel_header)))
+- /* remove RFC1042 or Bridge-Tunnel encapsulation and
+- * replace EtherType */
+-- skb_pull(skb, hdrlen + 6);
+-- memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
+-- memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
+-- } else {
+-- struct ethhdr *ehdr;
+-- __be16 len;
+-+ hdrlen += ETH_ALEN + 2;
+-+ else
+-+ tmp.h_proto = htons(skb->len);
+-
+-- skb_pull(skb, hdrlen);
+-- len = htons(skb->len);
+-+ pskb_pull(skb, hdrlen);
+-+
+-+ if (!ehdr)
+- ehdr = (struct ethhdr *) skb_push(skb, sizeof(struct ethhdr));
+-- memcpy(ehdr->h_dest, dst, ETH_ALEN);
+-- memcpy(ehdr->h_source, src, ETH_ALEN);
+-- ehdr->h_proto = len;
+-- }
+-+ memcpy(ehdr, &tmp, sizeof(tmp));
+-+
+- return 0;
+- }
+-+
+-+int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
+-+ enum nl80211_iftype iftype)
+-+{
+-+ return __ieee80211_data_to_8023(skb, NULL, addr, iftype);
+-+}
+- EXPORT_SYMBOL(ieee80211_data_to_8023);
+-
+- int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
+diff --git a/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch b/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch
+deleted file mode 100644
+index 2eeed22..0000000
+--- a/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch
++++ /dev/null
+@@ -1,159 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Tue, 2 Feb 2016 14:39:10 +0100
+-Subject: [PATCH] cfg80211: add support for non-linear skbs in
+- ieee80211_amsdu_to_8023s
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/wireless/util.c
+-+++ b/net/wireless/util.c
+-@@ -644,73 +644,75 @@ int ieee80211_data_from_8023(struct sk_b
+- }
+- EXPORT_SYMBOL(ieee80211_data_from_8023);
+-
+-+static struct sk_buff *
+-+__ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
+-+ int offset, int len)
+-+{
+-+ struct sk_buff *frame;
+-+
+-+ if (skb->len - offset < len)
+-+ return NULL;
+-+
+-+ /*
+-+ * Allocate and reserve two bytes more for payload
+-+ * alignment since sizeof(struct ethhdr) is 14.
+-+ */
+-+ frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + len);
+-+
+-+ skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
+-+ skb_copy_bits(skb, offset, skb_put(frame, len), len);
+-+
+-+ return frame;
+-+}
+-
+- void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
+- const u8 *addr, enum nl80211_iftype iftype,
+- const unsigned int extra_headroom,
+- bool has_80211_header)
+- {
+-+ unsigned int hlen = ALIGN(extra_headroom, 4);
+- struct sk_buff *frame = NULL;
+- u16 ethertype;
+- u8 *payload;
+-- const struct ethhdr *eth;
+-- int remaining, err;
+-- u8 dst[ETH_ALEN], src[ETH_ALEN];
+--
+-- if (skb_linearize(skb))
+-- goto out;
+-+ int offset = 0, remaining, err;
+-+ struct ethhdr eth;
+-+ bool reuse_skb = true;
+-+ bool last = false;
+-
+- if (has_80211_header) {
+-- err = ieee80211_data_to_8023(skb, addr, iftype);
+-+ err = __ieee80211_data_to_8023(skb, ð, addr, iftype);
+- if (err)
+- goto out;
+--
+-- /* skip the wrapping header */
+-- eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
+-- if (!eth)
+-- goto out;
+-- } else {
+-- eth = (struct ethhdr *) skb->data;
+- }
+-
+-- while (skb != frame) {
+-+ while (!last) {
+-+ unsigned int subframe_len;
+-+ int len;
+- u8 padding;
+-- __be16 len = eth->h_proto;
+-- unsigned int subframe_len = sizeof(struct ethhdr) + ntohs(len);
+--
+-- remaining = skb->len;
+-- memcpy(dst, eth->h_dest, ETH_ALEN);
+-- memcpy(src, eth->h_source, ETH_ALEN);
+-
+-+ skb_copy_bits(skb, offset, ð, sizeof(eth));
+-+ len = ntohs(eth.h_proto);
+-+ subframe_len = sizeof(struct ethhdr) + len;
+- padding = (4 - subframe_len) & 0x3;
+-+
+- /* the last MSDU has no padding */
+-+ remaining = skb->len - offset;
+- if (subframe_len > remaining)
+- goto purge;
+-
+-- skb_pull(skb, sizeof(struct ethhdr));
+-+ offset += sizeof(struct ethhdr);
+- /* reuse skb for the last subframe */
+-- if (remaining <= subframe_len + padding)
+-+ last = remaining <= subframe_len + padding;
+-+ if (!skb_is_nonlinear(skb) && last) {
+-+ skb_pull(skb, offset);
+- frame = skb;
+-- else {
+-- unsigned int hlen = ALIGN(extra_headroom, 4);
+-- /*
+-- * Allocate and reserve two bytes more for payload
+-- * alignment since sizeof(struct ethhdr) is 14.
+-- */
+-- frame = dev_alloc_skb(hlen + subframe_len + 2);
+-+ reuse_skb = true;
+-+ } else {
+-+ frame = __ieee80211_amsdu_copy(skb, hlen, offset, len);
+- if (!frame)
+- goto purge;
+-
+-- skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
+-- memcpy(skb_put(frame, ntohs(len)), skb->data,
+-- ntohs(len));
+--
+-- eth = (struct ethhdr *)skb_pull(skb, ntohs(len) +
+-- padding);
+-- if (!eth) {
+-- dev_kfree_skb(frame);
+-- goto purge;
+-- }
+-+ offset += len + padding;
+- }
+-
+- skb_reset_network_header(frame);
+-@@ -719,24 +721,20 @@ void ieee80211_amsdu_to_8023s(struct sk_
+-
+- payload = frame->data;
+- ethertype = (payload[6] << 8) | payload[7];
+--
+- if (likely((ether_addr_equal(payload, rfc1042_header) &&
+- ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
+- ether_addr_equal(payload, bridge_tunnel_header))) {
+-- /* remove RFC1042 or Bridge-Tunnel
+-- * encapsulation and replace EtherType */
+-- skb_pull(frame, 6);
+-- memcpy(skb_push(frame, ETH_ALEN), src, ETH_ALEN);
+-- memcpy(skb_push(frame, ETH_ALEN), dst, ETH_ALEN);
+-- } else {
+-- memcpy(skb_push(frame, sizeof(__be16)), &len,
+-- sizeof(__be16));
+-- memcpy(skb_push(frame, ETH_ALEN), src, ETH_ALEN);
+-- memcpy(skb_push(frame, ETH_ALEN), dst, ETH_ALEN);
+-+ eth.h_proto = htons(ethertype);
+-+ skb_pull(frame, ETH_ALEN + 2);
+- }
+-+
+-+ memcpy(skb_push(frame, sizeof(eth)), ð, sizeof(eth));
+- __skb_queue_tail(list, frame);
+- }
+-
+-+ if (!reuse_skb)
+-+ dev_kfree_skb(skb);
+-+
+- return;
+-
+- purge:
+diff --git a/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch b/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch
+deleted file mode 100644
+index c4155a1..0000000
+--- a/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch
++++ /dev/null
+@@ -1,155 +0,0 @@
+-From: Sven Eckelmann <sven@narfation.org>
+-Date: Tue, 26 Jan 2016 17:11:13 +0100
+-Subject: [PATCH] mac80211: Parse legacy and HT rate in injected frames
+-
+-Drivers/devices without their own rate control algorithm can get the
+-information what rates they should use from either the radiotap header of
+-injected frames or from the rate control algorithm. But the parsing of the
+-legacy rate information from the radiotap header was removed in commit
+-e6a9854b05c1 ("mac80211/drivers: rewrite the rate control API").
+-
+-The removal of this feature heavily reduced the usefulness of frame
+-injection when wanting to simulate specific transmission behavior. Having
+-rate parsing together with MCS rates and retry support allows a fine
+-grained selection of the tx behavior of injected frames for these kind of
+-tests.
+-
+-Signed-off-by: Sven Eckelmann <sven@narfation.org>
+-Cc: Simon Wunderlich <sw@simonwunderlich.de>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/include/net/mac80211.h
+-+++ b/include/net/mac80211.h
+-@@ -708,12 +708,14 @@ enum mac80211_tx_info_flags {
+- * protocol frame (e.g. EAP)
+- * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll
+- * frame (PS-Poll or uAPSD).
+-+ * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
+- *
+- * These flags are used in tx_info->control.flags.
+- */
+- enum mac80211_tx_control_flags {
+- IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0),
+- IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
+-+ IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
+- };
+-
+- /*
+---- a/net/mac80211/tx.c
+-+++ b/net/mac80211/tx.c
+-@@ -710,6 +710,10 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+-
+- info->control.short_preamble = txrc.short_preamble;
+-
+-+ /* don't ask rate control when rate already injected via radiotap */
+-+ if (info->control.flags & IEEE80211_TX_CTRL_RATE_INJECT)
+-+ return TX_CONTINUE;
+-+
+- if (tx->sta)
+- assoc = test_sta_flag(tx->sta, WLAN_STA_ASSOC);
+-
+-@@ -1665,15 +1669,24 @@ void ieee80211_xmit(struct ieee80211_sub
+- ieee80211_tx(sdata, sta, skb, false);
+- }
+-
+--static bool ieee80211_parse_tx_radiotap(struct sk_buff *skb)
+-+static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local,
+-+ struct sk_buff *skb)
+- {
+- struct ieee80211_radiotap_iterator iterator;
+- struct ieee80211_radiotap_header *rthdr =
+- (struct ieee80211_radiotap_header *) skb->data;
+- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+-+ struct ieee80211_supported_band *sband =
+-+ local->hw.wiphy->bands[info->band];
+- int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len,
+- NULL);
+- u16 txflags;
+-+ u16 rate = 0;
+-+ bool rate_found = false;
+-+ u8 rate_retries = 0;
+-+ u16 rate_flags = 0;
+-+ u8 mcs_known, mcs_flags;
+-+ int i;
+-
+- info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
+- IEEE80211_TX_CTL_DONTFRAG;
+-@@ -1724,6 +1737,35 @@ static bool ieee80211_parse_tx_radiotap(
+- info->flags |= IEEE80211_TX_CTL_NO_ACK;
+- break;
+-
+-+ case IEEE80211_RADIOTAP_RATE:
+-+ rate = *iterator.this_arg;
+-+ rate_flags = 0;
+-+ rate_found = true;
+-+ break;
+-+
+-+ case IEEE80211_RADIOTAP_DATA_RETRIES:
+-+ rate_retries = *iterator.this_arg;
+-+ break;
+-+
+-+ case IEEE80211_RADIOTAP_MCS:
+-+ mcs_known = iterator.this_arg[0];
+-+ mcs_flags = iterator.this_arg[1];
+-+ if (!(mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_MCS))
+-+ break;
+-+
+-+ rate_found = true;
+-+ rate = iterator.this_arg[2];
+-+ rate_flags = IEEE80211_TX_RC_MCS;
+-+
+-+ if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_GI &&
+-+ mcs_flags & IEEE80211_RADIOTAP_MCS_SGI)
+-+ rate_flags |= IEEE80211_TX_RC_SHORT_GI;
+-+
+-+ if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW &&
+-+ mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40)
+-+ rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+-+ break;
+-+
+- /*
+- * Please update the file
+- * Documentation/networking/mac80211-injection.txt
+-@@ -1738,6 +1780,32 @@ static bool ieee80211_parse_tx_radiotap(
+- if (ret != -ENOENT) /* ie, if we didn't simply run out of fields */
+- return false;
+-
+-+ if (rate_found) {
+-+ info->control.flags |= IEEE80211_TX_CTRL_RATE_INJECT;
+-+
+-+ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+-+ info->control.rates[i].idx = -1;
+-+ info->control.rates[i].flags = 0;
+-+ info->control.rates[i].count = 0;
+-+ }
+-+
+-+ if (rate_flags & IEEE80211_TX_RC_MCS) {
+-+ info->control.rates[0].idx = rate;
+-+ } else {
+-+ for (i = 0; i < sband->n_bitrates; i++) {
+-+ if (rate * 5 != sband->bitrates[i].bitrate)
+-+ continue;
+-+
+-+ info->control.rates[0].idx = i;
+-+ break;
+-+ }
+-+ }
+-+
+-+ info->control.rates[0].flags = rate_flags;
+-+ info->control.rates[0].count = min_t(u8, rate_retries + 1,
+-+ local->hw.max_rate_tries);
+-+ }
+-+
+- /*
+- * remove the radiotap header
+- * iterator->_max_length was sanity-checked against
+-@@ -1819,7 +1887,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
+- IEEE80211_TX_CTL_INJECTED;
+-
+- /* process and remove the injection radiotap header */
+-- if (!ieee80211_parse_tx_radiotap(skb))
+-+ if (!ieee80211_parse_tx_radiotap(local, skb))
+- goto fail;
+-
+- rcu_read_lock();
+diff --git a/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch b/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch
+deleted file mode 100644
+index e7bfb9c..0000000
+--- a/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch
++++ /dev/null
+@@ -1,317 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Fri, 5 Feb 2016 01:38:51 +0100
+-Subject: [PATCH] mac80211: add A-MSDU tx support
+-
+-Requires software tx queueing support. frag_list support (for zero-copy)
+-is optional.
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/include/net/mac80211.h
+-+++ b/include/net/mac80211.h
+-@@ -709,6 +709,7 @@ enum mac80211_tx_info_flags {
+- * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll
+- * frame (PS-Poll or uAPSD).
+- * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
+-+ * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame
+- *
+- * These flags are used in tx_info->control.flags.
+- */
+-@@ -716,6 +717,7 @@ enum mac80211_tx_control_flags {
+- IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0),
+- IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
+- IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
+-+ IEEE80211_TX_CTRL_AMSDU = BIT(3),
+- };
+-
+- /*
+-@@ -1728,6 +1730,7 @@ struct ieee80211_sta_rates {
+- * size is min(max_amsdu_len, 7935) bytes.
+- * Both additional HT limits must be enforced by the low level driver.
+- * This is defined by the spec (IEEE 802.11-2012 section 8.3.2.2 NOTE 2).
+-+ * @max_rc_amsdu_len: Maximum A-MSDU size in bytes recommended by rate control.
+- * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
+- */
+- struct ieee80211_sta {
+-@@ -1748,6 +1751,7 @@ struct ieee80211_sta {
+- bool mfp;
+- u8 max_amsdu_subframes;
+- u16 max_amsdu_len;
+-+ u16 max_rc_amsdu_len;
+-
+- struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
+-
+-@@ -1961,6 +1965,15 @@ struct ieee80211_txq {
+- * order and does not need to manage its own reorder buffer or BA session
+- * timeout.
+- *
+-+ * @IEEE80211_HW_TX_AMSDU: Hardware (or driver) supports software aggregated
+-+ * A-MSDU frames. Requires software tx queueing and fast-xmit support.
+-+ * When not using minstrel/minstrel_ht rate control, the driver should
+-+ * limit the maximum A-MSDU size based on the current tx rate by setting
+-+ * max_rc_amsdu_len in struct ieee80211_sta.
+-+ *
+-+ * @IEEE80211_HW_TX_FRAG_LIST: Hardware (or driver) supports sending frag_list
+-+ * skbs, needed for zero-copy software A-MSDU.
+-+ *
+- * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
+- */
+- enum ieee80211_hw_flags {
+-@@ -1998,6 +2011,8 @@ enum ieee80211_hw_flags {
+- IEEE80211_HW_BEACON_TX_STATUS,
+- IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR,
+- IEEE80211_HW_SUPPORTS_REORDERING_BUFFER,
+-+ IEEE80211_HW_TX_AMSDU,
+-+ IEEE80211_HW_TX_FRAG_LIST,
+-
+- /* keep last, obviously */
+- NUM_IEEE80211_HW_FLAGS
+-@@ -2070,6 +2085,9 @@ enum ieee80211_hw_flags {
+- * size is smaller (an example is LinkSys WRT120N with FW v1.0.07
+- * build 002 Jun 18 2012).
+- *
+-+ * @max_tx_fragments: maximum number of tx buffers per (A)-MSDU, sum
+-+ * of 1 + skb_shinfo(skb)->nr_frags for each skb in the frag_list.
+-+ *
+- * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX
+- * (if %IEEE80211_HW_QUEUE_CONTROL is set)
+- *
+-@@ -2124,6 +2142,7 @@ struct ieee80211_hw {
+- u8 max_rate_tries;
+- u8 max_rx_aggregation_subframes;
+- u8 max_tx_aggregation_subframes;
+-+ u8 max_tx_fragments;
+- u8 offchannel_tx_hw_queue;
+- u8 radiotap_mcs_details;
+- u16 radiotap_vht_details;
+---- a/net/mac80211/agg-tx.c
+-+++ b/net/mac80211/agg-tx.c
+-@@ -935,6 +935,7 @@ void ieee80211_process_addba_resp(struct
+- size_t len)
+- {
+- struct tid_ampdu_tx *tid_tx;
+-+ struct ieee80211_txq *txq;
+- u16 capab, tid;
+- u8 buf_size;
+- bool amsdu;
+-@@ -945,6 +946,10 @@ void ieee80211_process_addba_resp(struct
+- buf_size = (capab & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) >> 6;
+- buf_size = min(buf_size, local->hw.max_tx_aggregation_subframes);
+-
+-+ txq = sta->sta.txq[tid];
+-+ if (!amsdu && txq)
+-+ set_bit(IEEE80211_TXQ_NO_AMSDU, &to_txq_info(txq)->flags);
+-+
+- mutex_lock(&sta->ampdu_mlme.mtx);
+-
+- tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
+---- a/net/mac80211/debugfs.c
+-+++ b/net/mac80211/debugfs.c
+-@@ -127,6 +127,8 @@ static const char *hw_flag_names[NUM_IEE
+- FLAG(BEACON_TX_STATUS),
+- FLAG(NEEDS_UNIQUE_STA_ADDR),
+- FLAG(SUPPORTS_REORDERING_BUFFER),
+-+ FLAG(TX_AMSDU),
+-+ FLAG(TX_FRAG_LIST),
+-
+- /* keep last for the build bug below */
+- (void *)0x1
+---- a/net/mac80211/ieee80211_i.h
+-+++ b/net/mac80211/ieee80211_i.h
+-@@ -799,6 +799,7 @@ struct mac80211_qos_map {
+- enum txq_info_flags {
+- IEEE80211_TXQ_STOP,
+- IEEE80211_TXQ_AMPDU,
+-+ IEEE80211_TXQ_NO_AMSDU,
+- };
+-
+- struct txq_info {
+---- a/net/mac80211/tx.c
+-+++ b/net/mac80211/tx.c
+-@@ -1318,6 +1318,10 @@ struct sk_buff *ieee80211_tx_dequeue(str
+- out:
+- spin_unlock_bh(&txqi->queue.lock);
+-
+-+ if (skb && skb_has_frag_list(skb) &&
+-+ !ieee80211_hw_check(&local->hw, TX_FRAG_LIST))
+-+ skb_linearize(skb);
+-+
+- return skb;
+- }
+- EXPORT_SYMBOL(ieee80211_tx_dequeue);
+-@@ -2757,6 +2761,163 @@ void ieee80211_clear_fast_xmit(struct st
+- kfree_rcu(fast_tx, rcu_head);
+- }
+-
+-+static bool ieee80211_amsdu_realloc_pad(struct ieee80211_local *local,
+-+ struct sk_buff *skb, int headroom,
+-+ int *subframe_len)
+-+{
+-+ int amsdu_len = *subframe_len + sizeof(struct ethhdr);
+-+ int padding = (4 - amsdu_len) & 3;
+-+
+-+ if (skb_headroom(skb) < headroom || skb_tailroom(skb) < padding) {
+-+ I802_DEBUG_INC(local->tx_expand_skb_head);
+-+
+-+ if (pskb_expand_head(skb, headroom, padding, GFP_ATOMIC)) {
+-+ wiphy_debug(local->hw.wiphy,
+-+ "failed to reallocate TX buffer\n");
+-+ return false;
+-+ }
+-+ }
+-+
+-+ if (padding) {
+-+ *subframe_len += padding;
+-+ memset(skb_put(skb, padding), 0, padding);
+-+ }
+-+
+-+ return true;
+-+}
+-+
+-+static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
+-+ struct ieee80211_fast_tx *fast_tx,
+-+ struct sk_buff *skb)
+-+{
+-+ struct ieee80211_local *local = sdata->local;
+-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+-+ struct ieee80211_hdr *hdr;
+-+ struct ethhdr amsdu_hdr;
+-+ int hdr_len = fast_tx->hdr_len - sizeof(rfc1042_header);
+-+ int subframe_len = skb->len - hdr_len;
+-+ void *data;
+-+ u8 *qc;
+-+
+-+ if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
+-+ return false;
+-+
+-+ if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
+-+ return true;
+-+
+-+ if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(amsdu_hdr),
+-+ &subframe_len))
+-+ return false;
+-+
+-+ amsdu_hdr.h_proto = cpu_to_be16(subframe_len);
+-+ memcpy(amsdu_hdr.h_source, skb->data + fast_tx->sa_offs, ETH_ALEN);
+-+ memcpy(amsdu_hdr.h_dest, skb->data + fast_tx->da_offs, ETH_ALEN);
+-+
+-+ data = skb_push(skb, sizeof(amsdu_hdr));
+-+ memmove(data, data + sizeof(amsdu_hdr), hdr_len);
+-+ memcpy(data + hdr_len, &amsdu_hdr, sizeof(amsdu_hdr));
+-+
+-+ hdr = data;
+-+ qc = ieee80211_get_qos_ctl(hdr);
+-+ *qc |= IEEE80211_QOS_CTL_A_MSDU_PRESENT;
+-+
+-+ info->control.flags |= IEEE80211_TX_CTRL_AMSDU;
+-+
+-+ return true;
+-+}
+-+
+-+static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
+-+ struct sta_info *sta,
+-+ struct ieee80211_fast_tx *fast_tx,
+-+ struct sk_buff *skb)
+-+{
+-+ struct ieee80211_local *local = sdata->local;
+-+ u8 tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
+-+ struct ieee80211_txq *txq = sta->sta.txq[tid];
+-+ struct txq_info *txqi;
+-+ struct sk_buff **frag_tail, *head;
+-+ int subframe_len = skb->len - ETH_ALEN;
+-+ u8 max_subframes = sta->sta.max_amsdu_subframes;
+-+ int max_frags = local->hw.max_tx_fragments;
+-+ int max_amsdu_len = sta->sta.max_amsdu_len;
+-+ __be16 len;
+-+ void *data;
+-+ bool ret = false;
+-+ int n = 1, nfrags;
+-+
+-+ if (!ieee80211_hw_check(&local->hw, TX_AMSDU))
+-+ return false;
+-+
+-+ if (!txq)
+-+ return false;
+-+
+-+ txqi = to_txq_info(txq);
+-+ if (test_bit(IEEE80211_TXQ_NO_AMSDU, &txqi->flags))
+-+ return false;
+-+
+-+ if (sta->sta.max_rc_amsdu_len)
+-+ max_amsdu_len = min_t(int, max_amsdu_len,
+-+ sta->sta.max_rc_amsdu_len);
+-+
+-+ spin_lock_bh(&txqi->queue.lock);
+-+
+-+ head = skb_peek_tail(&txqi->queue);
+-+ if (!head)
+-+ goto out;
+-+
+-+ if (skb->len + head->len > max_amsdu_len)
+-+ goto out;
+-+
+-+ /*
+-+ * HT A-MPDU limits maximum MPDU size to 4095 bytes. Since aggregation
+-+ * sessions are started/stopped without txq flush, use the limit here
+-+ * to avoid having to de-aggregate later.
+-+ */
+-+ if (skb->len + head->len > 4095 &&
+-+ !sta->sta.vht_cap.vht_supported)
+-+ goto out;
+-+
+-+ if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))
+-+ goto out;
+-+
+-+ nfrags = 1 + skb_shinfo(skb)->nr_frags;
+-+ nfrags += 1 + skb_shinfo(head)->nr_frags;
+-+ frag_tail = &skb_shinfo(head)->frag_list;
+-+ while (*frag_tail) {
+-+ nfrags += 1 + skb_shinfo(*frag_tail)->nr_frags;
+-+ frag_tail = &(*frag_tail)->next;
+-+ n++;
+-+ }
+-+
+-+ if (max_subframes && n > max_subframes)
+-+ goto out;
+-+
+-+ if (max_frags && nfrags > max_frags)
+-+ goto out;
+-+
+-+ if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(rfc1042_header) + 2,
+-+ &subframe_len))
+-+ return false;
+-+
+-+ ret = true;
+-+ data = skb_push(skb, ETH_ALEN + 2);
+-+ memmove(data, data + ETH_ALEN + 2, 2 * ETH_ALEN);
+-+
+-+ data += 2 * ETH_ALEN;
+-+ len = cpu_to_be16(subframe_len);
+-+ memcpy(data, &len, 2);
+-+ memcpy(data + 2, rfc1042_header, sizeof(rfc1042_header));
+-+
+-+ head->len += skb->len;
+-+ head->data_len += skb->len;
+-+ *frag_tail = skb;
+-+
+-+out:
+-+ spin_unlock_bh(&txqi->queue.lock);
+-+
+-+ return ret;
+-+}
+-+
+- static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
+- struct net_device *dev, struct sta_info *sta,
+- struct ieee80211_fast_tx *fast_tx,
+-@@ -2811,6 +2972,10 @@ static bool ieee80211_xmit_fast(struct i
+-
+- ieee80211_tx_stats(dev, skb->len + extra_head);
+-
+-+ if ((hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) &&
+-+ ieee80211_amsdu_aggregate(sdata, sta, fast_tx, skb))
+-+ return true;
+-+
+- /* will not be crypto-handled beyond what we do here, so use false
+- * as the may-encrypt argument for the resize to not account for
+- * more room than we already have in 'extra_head'
+diff --git a/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch b/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch
+deleted file mode 100644
+index 9277b2c..0000000
+--- a/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch
++++ /dev/null
+@@ -1,64 +0,0 @@
+-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+-Date: Wed, 20 Jan 2016 16:46:04 +0100
+-Subject: [PATCH] brcmfmac: fix setting primary channel for 80 MHz width
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-First of all it changes the way we calculate primary channel offset. If
+-we use e.g. 80 MHz channel with primary frequency 5180 MHz (which means
+-center frequency is 5210 MHz) it makes sense to calculate primary offset
+-as -30 MHz.
+-Then it fixes values we compare primary_offset with. We were comparing
+-offset in MHz against -2 or 2 which was resulting in picking a wrong
+-primary channel.
+-
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+-@@ -247,7 +247,7 @@ static u16 chandef_to_chanspec(struct br
+- brcmf_dbg(TRACE, "chandef: control %d center %d width %d\n",
+- ch->chan->center_freq, ch->center_freq1, ch->width);
+- ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq1);
+-- primary_offset = ch->center_freq1 - ch->chan->center_freq;
+-+ primary_offset = ch->chan->center_freq - ch->center_freq1;
+- switch (ch->width) {
+- case NL80211_CHAN_WIDTH_20:
+- case NL80211_CHAN_WIDTH_20_NOHT:
+-@@ -256,24 +256,21 @@ static u16 chandef_to_chanspec(struct br
+- break;
+- case NL80211_CHAN_WIDTH_40:
+- ch_inf.bw = BRCMU_CHAN_BW_40;
+-- if (primary_offset < 0)
+-+ if (primary_offset > 0)
+- ch_inf.sb = BRCMU_CHAN_SB_U;
+- else
+- ch_inf.sb = BRCMU_CHAN_SB_L;
+- break;
+- case NL80211_CHAN_WIDTH_80:
+- ch_inf.bw = BRCMU_CHAN_BW_80;
+-- if (primary_offset < 0) {
+-- if (primary_offset < -CH_10MHZ_APART)
+-- ch_inf.sb = BRCMU_CHAN_SB_UU;
+-- else
+-- ch_inf.sb = BRCMU_CHAN_SB_UL;
+-- } else {
+-- if (primary_offset > CH_10MHZ_APART)
+-- ch_inf.sb = BRCMU_CHAN_SB_LL;
+-- else
+-- ch_inf.sb = BRCMU_CHAN_SB_LU;
+-- }
+-+ if (primary_offset == -30)
+-+ ch_inf.sb = BRCMU_CHAN_SB_LL;
+-+ else if (primary_offset == -10)
+-+ ch_inf.sb = BRCMU_CHAN_SB_LU;
+-+ else if (primary_offset == 10)
+-+ ch_inf.sb = BRCMU_CHAN_SB_UL;
+-+ else
+-+ ch_inf.sb = BRCMU_CHAN_SB_UU;
+- break;
+- case NL80211_CHAN_WIDTH_80P80:
+- case NL80211_CHAN_WIDTH_160:
+diff --git a/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch b/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch
+deleted file mode 100644
+index d7018da..0000000
+--- a/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch
++++ /dev/null
+@@ -1,51 +0,0 @@
+-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+-Date: Tue, 26 Jan 2016 17:57:01 +0100
+-Subject: [PATCH] brcmfmac: analyze descriptors of current component only
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-So far we were looking for address descriptors without a check for
+-crossing current component border. In case of dealing with unsupported
+-descriptor or descriptor missing at all the code would incorrectly get
+-data from another component.
+-
+-Consider this binary-described component from BCM4366 EROM:
+-4bf83b01 TAG==CI CID==0x83b
+-20080201 TAG==CI PORTS==0+1 WRAPPERS==0+1
+-18400035 TAG==ADDR SZ_SZD TYPE_SLAVE
+-00050000
+-18107085 TAG==ADDR SZ_4K TYPE_SWRAP
+-
+-Driver was assigning invalid base address to this core:
+-brcmfmac: [6 ] core 0x83b:32 base 0x18109000 wrap 0x18107000
+-which came from totally different component defined in EROM:
+-43b36701 TAG==CI CID==0x367
+-00000201 TAG==CI PORTS==0+1 WRAPPERS==0+0
+-18109005 TAG==ADDR SZ_4K TYPE_SLAVE
+-
+-This change will also allow us to support components without wrapper
+-address in the future.
+-
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-@@ -803,7 +803,14 @@ static int brcmf_chip_dmp_get_regaddr(st
+- *eromaddr -= 4;
+- return -EFAULT;
+- }
+-- } while (desc != DMP_DESC_ADDRESS);
+-+ } while (desc != DMP_DESC_ADDRESS &&
+-+ desc != DMP_DESC_COMPONENT);
+-+
+-+ /* stop if we crossed current component border */
+-+ if (desc == DMP_DESC_COMPONENT) {
+-+ *eromaddr -= 4;
+-+ return 0;
+-+ }
+-
+- /* skip upper 32-bit address descriptor */
+- if (val & DMP_DESC_ADDRSIZE_GT32)
+diff --git a/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch b/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch
+deleted file mode 100644
+index 045ab49..0000000
+--- a/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch
++++ /dev/null
+@@ -1,28 +0,0 @@
+-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+-Date: Tue, 26 Jan 2016 17:57:02 +0100
+-Subject: [PATCH] brcmfmac: allow storing PMU core without wrapper address
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-Separated PMU core can be found in new devices and should be used for
+-accessing PMU registers (which were routed through ChipCommon so far).
+-This core is one of exceptions that doesn't have or need wrapper address
+-to be still safely accessible.
+-
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-@@ -883,7 +883,8 @@ int brcmf_chip_dmp_erom_scan(struct brcm
+- rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S;
+-
+- /* need core with ports */
+-- if (nmw + nsw == 0)
+-+ if (nmw + nsw == 0 &&
+-+ id != BCMA_CORE_PMU)
+- continue;
+-
+- /* try to obtain register address info */
+diff --git a/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch b/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch
+deleted file mode 100644
+index 7b7ba4f..0000000
+--- a/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch
++++ /dev/null
+@@ -1,43 +0,0 @@
+-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+-Date: Tue, 26 Jan 2016 17:57:03 +0100
+-Subject: [PATCH] brcmfmac: read extended capabilities of ChipCommon core
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-This is an extra bitfield with info about some present hardware.
+-
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-@@ -1025,6 +1025,9 @@ static int brcmf_chip_setup(struct brcmf
+- /* get chipcommon capabilites */
+- pub->cc_caps = chip->ops->read32(chip->ctx,
+- CORE_CC_REG(base, capabilities));
+-+ pub->cc_caps_ext = chip->ops->read32(chip->ctx,
+-+ CORE_CC_REG(base,
+-+ capabilities_ext));
+-
+- /* get pmu caps & rev */
+- if (pub->cc_caps & CC_CAP_PMU) {
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
+-@@ -27,6 +27,7 @@
+- * @chip: chip identifier.
+- * @chiprev: chip revision.
+- * @cc_caps: chipcommon core capabilities.
+-+ * @cc_caps_ext: chipcommon core extended capabilities.
+- * @pmucaps: PMU capabilities.
+- * @pmurev: PMU revision.
+- * @rambase: RAM base address (only applicable for ARM CR4 chips).
+-@@ -38,6 +39,7 @@ struct brcmf_chip {
+- u32 chip;
+- u32 chiprev;
+- u32 cc_caps;
+-+ u32 cc_caps_ext;
+- u32 pmucaps;
+- u32 pmurev;
+- u32 rambase;
+diff --git a/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch b/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch
+deleted file mode 100644
+index 2af6fd9..0000000
+--- a/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch
++++ /dev/null
+@@ -1,148 +0,0 @@
+-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+-Date: Tue, 26 Jan 2016 17:57:04 +0100
+-Subject: [PATCH] brcmfmac: access PMU registers using standalone PMU core if
+- available
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-On recent Broadcom chipsets PMU is present as separated core and it
+-can't be accessed using ChipCommon anymore as it fails with e.g.:
+-[ 18.198412] Unhandled fault: imprecise external abort (0x1406) at 0xb6da200f
+-
+-Add a new helper function that will return a proper core that should be
+-used for accessing PMU registers.
+-
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+-@@ -1014,6 +1014,7 @@ static int brcmf_chip_setup(struct brcmf
+- {
+- struct brcmf_chip *pub;
+- struct brcmf_core_priv *cc;
+-+ struct brcmf_core *pmu;
+- u32 base;
+- u32 val;
+- int ret = 0;
+-@@ -1030,9 +1031,10 @@ static int brcmf_chip_setup(struct brcmf
+- capabilities_ext));
+-
+- /* get pmu caps & rev */
+-+ pmu = brcmf_chip_get_pmu(pub); /* after reading cc_caps_ext */
+- if (pub->cc_caps & CC_CAP_PMU) {
+- val = chip->ops->read32(chip->ctx,
+-- CORE_CC_REG(base, pmucapabilities));
+-+ CORE_CC_REG(pmu->base, pmucapabilities));
+- pub->pmurev = val & PCAP_REV_MASK;
+- pub->pmucaps = val;
+- }
+-@@ -1131,6 +1133,23 @@ struct brcmf_core *brcmf_chip_get_chipco
+- return &cc->pub;
+- }
+-
+-+struct brcmf_core *brcmf_chip_get_pmu(struct brcmf_chip *pub)
+-+{
+-+ struct brcmf_core *cc = brcmf_chip_get_chipcommon(pub);
+-+ struct brcmf_core *pmu;
+-+
+-+ /* See if there is separated PMU core available */
+-+ if (cc->rev >= 35 &&
+-+ pub->cc_caps_ext & BCMA_CC_CAP_EXT_AOB_PRESENT) {
+-+ pmu = brcmf_chip_get_core(pub, BCMA_CORE_PMU);
+-+ if (pmu)
+-+ return pmu;
+-+ }
+-+
+-+ /* Fallback to ChipCommon core for older hardware */
+-+ return cc;
+-+}
+-+
+- bool brcmf_chip_iscoreup(struct brcmf_core *pub)
+- {
+- struct brcmf_core_priv *core;
+-@@ -1301,6 +1320,7 @@ bool brcmf_chip_sr_capable(struct brcmf_
+- {
+- u32 base, addr, reg, pmu_cc3_mask = ~0;
+- struct brcmf_chip_priv *chip;
+-+ struct brcmf_core *pmu = brcmf_chip_get_pmu(pub);
+-
+- brcmf_dbg(TRACE, "Enter\n");
+-
+-@@ -1320,9 +1340,9 @@ bool brcmf_chip_sr_capable(struct brcmf_
+- case BRCM_CC_4335_CHIP_ID:
+- case BRCM_CC_4339_CHIP_ID:
+- /* read PMU chipcontrol register 3 */
+-- addr = CORE_CC_REG(base, chipcontrol_addr);
+-+ addr = CORE_CC_REG(pmu->base, chipcontrol_addr);
+- chip->ops->write32(chip->ctx, addr, 3);
+-- addr = CORE_CC_REG(base, chipcontrol_data);
+-+ addr = CORE_CC_REG(pmu->base, chipcontrol_data);
+- reg = chip->ops->read32(chip->ctx, addr);
+- return (reg & pmu_cc3_mask) != 0;
+- case BRCM_CC_43430_CHIP_ID:
+-@@ -1330,12 +1350,12 @@ bool brcmf_chip_sr_capable(struct brcmf_
+- reg = chip->ops->read32(chip->ctx, addr);
+- return reg != 0;
+- default:
+-- addr = CORE_CC_REG(base, pmucapabilities_ext);
+-+ addr = CORE_CC_REG(pmu->base, pmucapabilities_ext);
+- reg = chip->ops->read32(chip->ctx, addr);
+- if ((reg & PCAPEXT_SR_SUPPORTED_MASK) == 0)
+- return false;
+-
+-- addr = CORE_CC_REG(base, retention_ctl);
+-+ addr = CORE_CC_REG(pmu->base, retention_ctl);
+- reg = chip->ops->read32(chip->ctx, addr);
+- return (reg & (PMU_RCTL_MACPHY_DISABLE_MASK |
+- PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
+-@@ -85,6 +85,7 @@ struct brcmf_chip *brcmf_chip_attach(voi
+- void brcmf_chip_detach(struct brcmf_chip *chip);
+- struct brcmf_core *brcmf_chip_get_core(struct brcmf_chip *chip, u16 coreid);
+- struct brcmf_core *brcmf_chip_get_chipcommon(struct brcmf_chip *chip);
+-+struct brcmf_core *brcmf_chip_get_pmu(struct brcmf_chip *pub);
+- bool brcmf_chip_iscoreup(struct brcmf_core *core);
+- void brcmf_chip_coredisable(struct brcmf_core *core, u32 prereset, u32 reset);
+- void brcmf_chip_resetcore(struct brcmf_core *core, u32 prereset, u32 reset,
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+-@@ -3615,7 +3615,6 @@ brcmf_sdio_drivestrengthinit(struct brcm
+- const struct sdiod_drive_str *str_tab = NULL;
+- u32 str_mask;
+- u32 str_shift;
+-- u32 base;
+- u32 i;
+- u32 drivestrength_sel = 0;
+- u32 cc_data_temp;
+-@@ -3658,14 +3657,15 @@ brcmf_sdio_drivestrengthinit(struct brcm
+- }
+-
+- if (str_tab != NULL) {
+-+ struct brcmf_core *pmu = brcmf_chip_get_pmu(ci);
+-+
+- for (i = 0; str_tab[i].strength != 0; i++) {
+- if (drivestrength >= str_tab[i].strength) {
+- drivestrength_sel = str_tab[i].sel;
+- break;
+- }
+- }
+-- base = brcmf_chip_get_chipcommon(ci)->base;
+-- addr = CORE_CC_REG(base, chipcontrol_addr);
+-+ addr = CORE_CC_REG(pmu->base, chipcontrol_addr);
+- brcmf_sdiod_regwl(sdiodev, addr, 1, NULL);
+- cc_data_temp = brcmf_sdiod_regrl(sdiodev, addr, NULL);
+- cc_data_temp &= ~str_mask;
+-@@ -3835,8 +3835,7 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
+- goto fail;
+-
+- /* set PMUControl so a backplane reset does PMU state reload */
+-- reg_addr = CORE_CC_REG(brcmf_chip_get_chipcommon(bus->ci)->base,
+-- pmucontrol);
+-+ reg_addr = CORE_CC_REG(brcmf_chip_get_pmu(bus->ci)->base, pmucontrol);
+- reg_val = brcmf_sdiod_regrl(bus->sdiodev, reg_addr, &err);
+- if (err)
+- goto fail;
+diff --git a/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch b/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch
+deleted file mode 100644
+index 35887fc..0000000
+--- a/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch
++++ /dev/null
+@@ -1,38 +0,0 @@
+-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+-Date: Tue, 26 Jan 2016 17:57:05 +0100
+-Subject: [PATCH] brcmfmac: add support for 14e4:4365 PCI ID with BCM4366
+- chipset
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-On Broadcom ARM routers BCM4366 cards are available with 14e4:4365 ID.
+-Unfortunately this ID was already used by Broadcom for cards with
+-BCM43142, a totally different chipset requiring SoftMAC driver. To avoid
+-a conflict between brcmfmac and bcma use more specific ID entry with
+-subvendor and subdevice specified.
+-
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-@@ -1951,6 +1951,9 @@ static const struct dev_pm_ops brcmf_pci
+-
+- #define BRCMF_PCIE_DEVICE(dev_id) { BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
+- PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
+-+#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev) { \
+-+ BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
+-+ subvend, subdev, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
+-
+- static struct pci_device_id brcmf_pcie_devid_table[] = {
+- BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
+-@@ -1966,6 +1969,7 @@ static struct pci_device_id brcmf_pcie_d
+- BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),
+- BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),
+- BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),
+-+ BRCMF_PCIE_DEVICE_SUB(0x4365, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4365),
+- BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),
+- BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
+- BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
+diff --git a/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch b/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch
+deleted file mode 100644
+index 6ce60f1..0000000
+--- a/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch
++++ /dev/null
+@@ -1,32 +0,0 @@
+-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+-Date: Sun, 31 Jan 2016 12:14:34 +0100
+-Subject: [PATCH] brcmfmac: treat NULL character in NVRAM as separator
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-Platform NVRAM (stored on a flash partition) has entries separated by a
+-NULL (\0) char. Our parsing code switches from VALUE state to IDLE
+-whenever it meets a NULL (\0). When that happens our IDLE handler should
+-simply consume it and analyze whatever is placed ahead.
+-
+-This fixes harmless warnings spamming debugging output:
+-[ 155.165624] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=20: ignoring invalid character
+-[ 155.180806] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=44: ignoring invalid character
+-[ 155.195971] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=63: ignoring invalid character
+-
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+-@@ -93,7 +93,7 @@ static enum nvram_parser_state brcmf_nvr
+- c = nvp->data[nvp->pos];
+- if (c == '\n')
+- return COMMENT;
+-- if (is_whitespace(c))
+-+ if (is_whitespace(c) || c == '\0')
+- goto proceed;
+- if (c == '#')
+- return COMMENT;
+diff --git a/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch b/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch
+deleted file mode 100644
+index 012dea1..0000000
+--- a/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch
++++ /dev/null
+@@ -1,41 +0,0 @@
+-From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+-Date: Mon, 25 Jan 2016 11:47:29 +0100
+-Subject: [PATCH] brcmfmac: sdio: Increase the default timeouts a bit
+-
+-On a Radxa Rock2 board with a Ampak AP6335 (Broadcom 4339 core) it seems
+-the card responds very quickly most of the time, unfortunately during
+-initialisation it sometimes seems to take just a bit over 2 seconds to
+-respond.
+-
+-This results intialization failing with message like:
+- brcmf_c_preinit_dcmds: Retreiving cur_etheraddr failed, -52
+- brcmf_bus_start: failed: -52
+- brcmf_sdio_firmware_callback: dongle is not responding
+-
+-Increasing the timeout to allow for a bit more headroom allows the
+-card to initialize reliably.
+-
+-A quick search online after diagnosing/fixing this showed that Google
+-has a similar patch in their ChromeOS tree, so this doesn't seem
+-specific to the board I'm using.
+-
+-Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+-Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
+-Acked-by: Arend van Spriel <arend@broadcom.com>
+-Reviewed-by: Douglas Anderson <dianders@chromium.org>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+-@@ -45,8 +45,8 @@
+- #include "chip.h"
+- #include "firmware.h"
+-
+--#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2000)
+--#define CTL_DONE_TIMEOUT msecs_to_jiffies(2000)
+-+#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)
+-+#define CTL_DONE_TIMEOUT msecs_to_jiffies(2500)
+-
+- #ifdef DEBUG
+-
+diff --git a/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch b/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch
+deleted file mode 100644
+index 71f7a40..0000000
+--- a/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch
++++ /dev/null
+@@ -1,87 +0,0 @@
+-From: Miaoqing Pan <miaoqing@codeaurora.org>
+-Date: Fri, 5 Feb 2016 09:45:50 +0800
+-Subject: [PATCH] ath9k: make NF load complete quickly and reliably
+-
+-Make NF load complete quickly and reliably. NF load execution
+-is delayed by HW to end of frame if frame Rx or Tx is ongoing.
+-Increasing timeout to max frame duration. If NF cal is ongoing
+-before NF load, stop it before load, and restart it afterwards.
+-
+-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/ath/ath9k/calib.c
+-+++ b/drivers/net/wireless/ath/ath9k/calib.c
+-@@ -241,6 +241,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
+- u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
+- struct ath_common *common = ath9k_hw_common(ah);
+- s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
+-+ u32 bb_agc_ctl = REG_READ(ah, AR_PHY_AGC_CONTROL);
+-
+- if (ah->caldata)
+- h = ah->caldata->nfCalHist;
+-@@ -264,6 +265,16 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
+- }
+-
+- /*
+-+ * stop NF cal if ongoing to ensure NF load completes immediately
+-+ * (or after end rx/tx frame if ongoing)
+-+ */
+-+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NF) {
+-+ REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
+-+ REG_RMW_BUFFER_FLUSH(ah);
+-+ ENABLE_REG_RMW_BUFFER(ah);
+-+ }
+-+
+-+ /*
+- * Load software filtered NF value into baseband internal minCCApwr
+- * variable.
+- */
+-@@ -276,18 +287,33 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
+-
+- /*
+- * Wait for load to complete, should be fast, a few 10s of us.
+-- * The max delay was changed from an original 250us to 10000us
+-- * since 250us often results in NF load timeout and causes deaf
+-- * condition during stress testing 12/12/2009
+-+ * The max delay was changed from an original 250us to 22.2 msec.
+-+ * This would increase timeout to the longest possible frame
+-+ * (11n max length 22.1 msec)
+- */
+-- for (j = 0; j < 10000; j++) {
+-+ for (j = 0; j < 22200; j++) {
+- if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &
+-- AR_PHY_AGC_CONTROL_NF) == 0)
+-+ AR_PHY_AGC_CONTROL_NF) == 0)
+- break;
+- udelay(10);
+- }
+-
+- /*
+-+ * Restart NF so it can continue.
+-+ */
+-+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NF) {
+-+ ENABLE_REG_RMW_BUFFER(ah);
+-+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_ENABLE_NF)
+-+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
+-+ AR_PHY_AGC_CONTROL_ENABLE_NF);
+-+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NO_UPDATE_NF)
+-+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
+-+ AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
+-+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
+-+ REG_RMW_BUFFER_FLUSH(ah);
+-+ }
+-+
+-+ /*
+- * We timed out waiting for the noisefloor to load, probably due to an
+- * in-progress rx. Simply return here and allow the load plenty of time
+- * to complete before the next calibration interval. We need to avoid
+-@@ -296,7 +322,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
+- * here, the baseband nf cal will just be capped by our present
+- * noisefloor until the next calibration timer.
+- */
+-- if (j == 10000) {
+-+ if (j == 22200) {
+- ath_dbg(common, ANY,
+- "Timeout while waiting for nf to load: AR_PHY_AGC_CONTROL=0x%x\n",
+- REG_READ(ah, AR_PHY_AGC_CONTROL));
+diff --git a/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch b/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch
+deleted file mode 100644
+index f7f9df9..0000000
+--- a/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch
++++ /dev/null
+@@ -1,54 +0,0 @@
+-From: Henning Rogge <hrogge@gmail.com>
+-Date: Wed, 3 Feb 2016 13:58:36 +0100
+-Subject: [PATCH] mac80211: Remove MPP table entries with MPath
+-
+-Make the mesh_path_del() function remove all mpp table entries
+-that are proxied by the removed mesh path.
+-
+-Acked-by: Bob Copeland <me@bobcopeland.com>
+-Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/mac80211/mesh_pathtbl.c
+-+++ b/net/mac80211/mesh_pathtbl.c
+-@@ -835,6 +835,29 @@ void mesh_path_flush_by_nexthop(struct s
+- rcu_read_unlock();
+- }
+-
+-+static void mpp_flush_by_proxy(struct ieee80211_sub_if_data *sdata,
+-+ const u8 *proxy)
+-+{
+-+ struct mesh_table *tbl;
+-+ struct mesh_path *mpp;
+-+ struct mpath_node *node;
+-+ int i;
+-+
+-+ rcu_read_lock();
+-+ read_lock_bh(&pathtbl_resize_lock);
+-+ tbl = resize_dereference_mpp_paths();
+-+ for_each_mesh_entry(tbl, node, i) {
+-+ mpp = node->mpath;
+-+ if (ether_addr_equal(mpp->mpp, proxy)) {
+-+ spin_lock(&tbl->hashwlock[i]);
+-+ __mesh_path_del(tbl, node);
+-+ spin_unlock(&tbl->hashwlock[i]);
+-+ }
+-+ }
+-+ read_unlock_bh(&pathtbl_resize_lock);
+-+ rcu_read_unlock();
+-+}
+-+
+- static void table_flush_by_iface(struct mesh_table *tbl,
+- struct ieee80211_sub_if_data *sdata)
+- {
+-@@ -892,6 +915,9 @@ int mesh_path_del(struct ieee80211_sub_i
+- int hash_idx;
+- int err = 0;
+-
+-+ /* flush relevant mpp entries first */
+-+ mpp_flush_by_proxy(sdata, addr);
+-+
+- read_lock_bh(&pathtbl_resize_lock);
+- tbl = resize_dereference_mesh_paths();
+- hash_idx = mesh_table_hash(addr, sdata, tbl);
+diff --git a/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch b/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch
+deleted file mode 100644
+index 740993c..0000000
+--- a/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch
++++ /dev/null
+@@ -1,104 +0,0 @@
+-From: Henning Rogge <hrogge@gmail.com>
+-Date: Wed, 3 Feb 2016 13:58:37 +0100
+-Subject: [PATCH] mac80211: let unused MPP table entries timeout
+-
+-Remember the last time when a mpp table entry is used for
+-rx or tx and remove them after MESH_PATH_EXPIRE time.
+-
+-Acked-by: Bob Copeland <me@bobcopeland.com>
+-Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/mac80211/mesh_pathtbl.c
+-+++ b/net/mac80211/mesh_pathtbl.c
+-@@ -942,6 +942,46 @@ enddel:
+- }
+-
+- /**
+-+ * mpp_path_del - delete a mesh proxy path from the table
+-+ *
+-+ * @addr: addr address (ETH_ALEN length)
+-+ * @sdata: local subif
+-+ *
+-+ * Returns: 0 if successful
+-+ */
+-+static int mpp_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
+-+{
+-+ struct mesh_table *tbl;
+-+ struct mesh_path *mpath;
+-+ struct mpath_node *node;
+-+ struct hlist_head *bucket;
+-+ int hash_idx;
+-+ int err = 0;
+-+
+-+ read_lock_bh(&pathtbl_resize_lock);
+-+ tbl = resize_dereference_mpp_paths();
+-+ hash_idx = mesh_table_hash(addr, sdata, tbl);
+-+ bucket = &tbl->hash_buckets[hash_idx];
+-+
+-+ spin_lock(&tbl->hashwlock[hash_idx]);
+-+ hlist_for_each_entry(node, bucket, list) {
+-+ mpath = node->mpath;
+-+ if (mpath->sdata == sdata &&
+-+ ether_addr_equal(addr, mpath->dst)) {
+-+ __mesh_path_del(tbl, node);
+-+ goto enddel;
+-+ }
+-+ }
+-+
+-+ err = -ENXIO;
+-+enddel:
+-+ mesh_paths_generation++;
+-+ spin_unlock(&tbl->hashwlock[hash_idx]);
+-+ read_unlock_bh(&pathtbl_resize_lock);
+-+ return err;
+-+}
+-+
+-+/**
+- * mesh_path_tx_pending - sends pending frames in a mesh path queue
+- *
+- * @mpath: mesh path to activate
+-@@ -1157,6 +1197,17 @@ void mesh_path_expire(struct ieee80211_s
+- time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE))
+- mesh_path_del(mpath->sdata, mpath->dst);
+- }
+-+
+-+ tbl = rcu_dereference(mpp_paths);
+-+ for_each_mesh_entry(tbl, node, i) {
+-+ if (node->mpath->sdata != sdata)
+-+ continue;
+-+ mpath = node->mpath;
+-+ if ((!(mpath->flags & MESH_PATH_FIXED)) &&
+-+ time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE))
+-+ mpp_path_del(mpath->sdata, mpath->dst);
+-+ }
+-+
+- rcu_read_unlock();
+- }
+-
+---- a/net/mac80211/rx.c
+-+++ b/net/mac80211/rx.c
+-@@ -2291,6 +2291,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
+- spin_lock_bh(&mppath->state_lock);
+- if (!ether_addr_equal(mppath->mpp, mpp_addr))
+- memcpy(mppath->mpp, mpp_addr, ETH_ALEN);
+-+ mppath->exp_time = jiffies;
+- spin_unlock_bh(&mppath->state_lock);
+- }
+- rcu_read_unlock();
+---- a/net/mac80211/tx.c
+-+++ b/net/mac80211/tx.c
+-@@ -2171,8 +2171,11 @@ static struct sk_buff *ieee80211_build_h
+- mpp_lookup = true;
+- }
+-
+-- if (mpp_lookup)
+-+ if (mpp_lookup) {
+- mppath = mpp_path_lookup(sdata, skb->data);
+-+ if (mppath)
+-+ mppath->exp_time = jiffies;
+-+ }
+-
+- if (mppath && mpath)
+- mesh_path_del(mpath->sdata, mpath->dst);
+diff --git a/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch b/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch
+deleted file mode 100644
+index 0c36b1d..0000000
+--- a/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch
++++ /dev/null
+@@ -1,143 +0,0 @@
+-From: Henning Rogge <hrogge@gmail.com>
+-Date: Wed, 3 Feb 2016 13:58:38 +0100
+-Subject: [PATCH] mac80211: Unify mesh and mpp path removal function
+-
+-mpp_path_del() and mesh_path_del() are mostly the same function.
+-Move common code into a new static function.
+-
+-Acked-by: Bob Copeland <me@bobcopeland.com>
+-Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/mac80211/mesh_pathtbl.c
+-+++ b/net/mac80211/mesh_pathtbl.c
+-@@ -55,16 +55,21 @@ int mpp_paths_generation;
+- static DEFINE_RWLOCK(pathtbl_resize_lock);
+-
+-
+-+static inline struct mesh_table *resize_dereference_paths(
+-+ struct mesh_table __rcu *table)
+-+{
+-+ return rcu_dereference_protected(table,
+-+ lockdep_is_held(&pathtbl_resize_lock));
+-+}
+-+
+- static inline struct mesh_table *resize_dereference_mesh_paths(void)
+- {
+-- return rcu_dereference_protected(mesh_paths,
+-- lockdep_is_held(&pathtbl_resize_lock));
+-+ return resize_dereference_paths(mesh_paths);
+- }
+-
+- static inline struct mesh_table *resize_dereference_mpp_paths(void)
+- {
+-- return rcu_dereference_protected(mpp_paths,
+-- lockdep_is_held(&pathtbl_resize_lock));
+-+ return resize_dereference_paths(mpp_paths);
+- }
+-
+- /*
+-@@ -899,14 +904,17 @@ void mesh_path_flush_by_iface(struct iee
+- }
+-
+- /**
+-- * mesh_path_del - delete a mesh path from the table
+-+ * table_path_del - delete a path from the mesh or mpp table
+- *
+-- * @addr: dst address (ETH_ALEN length)
+-+ * @tbl: mesh or mpp path table
+- * @sdata: local subif
+-+ * @addr: dst address (ETH_ALEN length)
+- *
+- * Returns: 0 if successful
+- */
+--int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
+-+static int table_path_del(struct mesh_table __rcu *rcu_tbl,
+-+ struct ieee80211_sub_if_data *sdata,
+-+ const u8 *addr)
+- {
+- struct mesh_table *tbl;
+- struct mesh_path *mpath;
+-@@ -915,11 +923,7 @@ int mesh_path_del(struct ieee80211_sub_i
+- int hash_idx;
+- int err = 0;
+-
+-- /* flush relevant mpp entries first */
+-- mpp_flush_by_proxy(sdata, addr);
+--
+-- read_lock_bh(&pathtbl_resize_lock);
+-- tbl = resize_dereference_mesh_paths();
+-+ tbl = resize_dereference_paths(rcu_tbl);
+- hash_idx = mesh_table_hash(addr, sdata, tbl);
+- bucket = &tbl->hash_buckets[hash_idx];
+-
+-@@ -935,9 +939,30 @@ int mesh_path_del(struct ieee80211_sub_i
+-
+- err = -ENXIO;
+- enddel:
+-- mesh_paths_generation++;
+- spin_unlock(&tbl->hashwlock[hash_idx]);
+-+ return err;
+-+}
+-+
+-+/**
+-+ * mesh_path_del - delete a mesh path from the table
+-+ *
+-+ * @addr: dst address (ETH_ALEN length)
+-+ * @sdata: local subif
+-+ *
+-+ * Returns: 0 if successful
+-+ */
+-+int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
+-+{
+-+ int err = 0;
+-+
+-+ /* flush relevant mpp entries first */
+-+ mpp_flush_by_proxy(sdata, addr);
+-+
+-+ read_lock_bh(&pathtbl_resize_lock);
+-+ err = table_path_del(mesh_paths, sdata, addr);
+-+ mesh_paths_generation++;
+- read_unlock_bh(&pathtbl_resize_lock);
+-+
+- return err;
+- }
+-
+-@@ -951,33 +976,13 @@ enddel:
+- */
+- static int mpp_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
+- {
+-- struct mesh_table *tbl;
+-- struct mesh_path *mpath;
+-- struct mpath_node *node;
+-- struct hlist_head *bucket;
+-- int hash_idx;
+- int err = 0;
+-
+- read_lock_bh(&pathtbl_resize_lock);
+-- tbl = resize_dereference_mpp_paths();
+-- hash_idx = mesh_table_hash(addr, sdata, tbl);
+-- bucket = &tbl->hash_buckets[hash_idx];
+--
+-- spin_lock(&tbl->hashwlock[hash_idx]);
+-- hlist_for_each_entry(node, bucket, list) {
+-- mpath = node->mpath;
+-- if (mpath->sdata == sdata &&
+-- ether_addr_equal(addr, mpath->dst)) {
+-- __mesh_path_del(tbl, node);
+-- goto enddel;
+-- }
+-- }
+--
+-- err = -ENXIO;
+--enddel:
+-- mesh_paths_generation++;
+-- spin_unlock(&tbl->hashwlock[hash_idx]);
+-+ err = table_path_del(mpp_paths, sdata, addr);
+-+ mpp_paths_generation++;
+- read_unlock_bh(&pathtbl_resize_lock);
+-+
+- return err;
+- }
+-
+diff --git a/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch b/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch
+deleted file mode 100644
+index 4dc6d66..0000000
+--- a/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch
++++ /dev/null
+@@ -1,51 +0,0 @@
+-From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
+-Date: Tue, 2 Feb 2016 08:12:26 +0100
+-Subject: [PATCH] mac80211: minstrel: Change expected throughput unit back to
+- Kbps
+-
+-The change from cur_tp to the function
+-minstrel_get_tp_avg/minstrel_ht_get_tp_avg changed the unit used for the
+-current throughput. For example in minstrel_ht the correct
+-conversion between them would be:
+-
+- mrs->cur_tp / 10 == minstrel_ht_get_tp_avg(..).
+-
+-This factor 10 must also be included in the calculation of
+-minstrel_get_expected_throughput and minstrel_ht_get_expected_throughput to
+-return values with the unit [Kbps] instead of [10Kbps]. Otherwise routing
+-algorithms like B.A.T.M.A.N. V will make incorrect decision based on these
+-values. Its kernel based implementation expects expected_throughput always
+-to have the unit [Kbps] and not sometimes [10Kbps] and sometimes [Kbps].
+-
+-The same requirement has iw or olsrdv2's nl80211 based statistics module
+-which retrieve the same data via NL80211_STA_INFO_TX_BITRATE.
+-
+-Cc: stable@vger.kernel.org
+-Fixes: 6a27b2c40b48 ("mac80211: restructure per-rate throughput calculation into function")
+-Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/mac80211/rc80211_minstrel.c
+-+++ b/net/mac80211/rc80211_minstrel.c
+-@@ -711,7 +711,7 @@ static u32 minstrel_get_expected_through
+- * computing cur_tp
+- */
+- tmp_mrs = &mi->r[idx].stats;
+-- tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma);
+-+ tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma) * 10;
+- tmp_cur_tp = tmp_cur_tp * 1200 * 8 / 1024;
+-
+- return tmp_cur_tp;
+---- a/net/mac80211/rc80211_minstrel_ht.c
+-+++ b/net/mac80211/rc80211_minstrel_ht.c
+-@@ -1335,7 +1335,8 @@ static u32 minstrel_ht_get_expected_thro
+- prob = mi->groups[i].rates[j].prob_ewma;
+-
+- /* convert tp_avg from pkt per second in kbps */
+-- tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * AVG_PKT_SIZE * 8 / 1024;
+-+ tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * 10;
+-+ tp_avg = tp_avg * AVG_PKT_SIZE * 8 / 1024;
+-
+- return tp_avg;
+- }
+diff --git a/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch b/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch
+deleted file mode 100644
+index 1fd016f..0000000
+--- a/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch
++++ /dev/null
+@@ -1,307 +0,0 @@
+-From: Hante Meuleman <meuleman@broadcom.com>
+-Date: Sun, 7 Feb 2016 18:08:24 +0100
+-Subject: [PATCH] brcmfmac: Increase nr of supported flowrings.
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-New generation devices have firmware which has more than 256 flowrings.
+-E.g. following debugging message comes from 14e4:4365 BCM4366:
+-[ 194.606245] brcmfmac: brcmf_pcie_init_ringbuffers Nr of flowrings is 264
+-
+-At various code places (related to flowrings) we were using u8 which
+-could lead to storing wrong number or infinite loops when indexing with
+-this type. This issue was quite easy to spot in brcmf_flowring_detach
+-where it led to infinite loop e.g. on failed initialization.
+-
+-This patch switches code to proper types and increases the maximum
+-number of supported flowrings to 512.
+-
+-Originally this change was sent in September 2015, but back it was
+-causing a regression on BCM43602 resulting in:
+-Unable to handle kernel NULL pointer dereference at virtual address ...
+-
+-The reason for this regression was missing update (s/u8/u16) of struct
+-brcmf_flowring_ring. This problem was handled in 9f64df9 ("brcmfmac: Fix
+-bug in flowring management."). Starting with that it's safe to apply
+-this original patch as it doesn't cause a regression anymore.
+-
+-This patch fixes an infinite loop on BCM4366 which is supported since
+-4.4 so it makes sense to apply it to stable 4.4+.
+-
+-Cc: <stable@vger.kernel.org> # 4.4+
+-Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+-Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+-Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+-Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+-Signed-off-by: Arend van Spriel <arend@broadcom.com>
+-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
+-@@ -32,7 +32,7 @@
+- #define BRCMF_FLOWRING_LOW (BRCMF_FLOWRING_HIGH - 256)
+- #define BRCMF_FLOWRING_INVALID_IFIDX 0xff
+-
+--#define BRCMF_FLOWRING_HASH_AP(da, fifo, ifidx) (da[5] + fifo + ifidx * 16)
+-+#define BRCMF_FLOWRING_HASH_AP(da, fifo, ifidx) (da[5] * 2 + fifo + ifidx * 16)
+- #define BRCMF_FLOWRING_HASH_STA(fifo, ifidx) (fifo + ifidx * 16)
+-
+- static const u8 brcmf_flowring_prio2fifo[] = {
+-@@ -68,7 +68,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
+- u8 prio, u8 ifidx)
+- {
+- struct brcmf_flowring_hash *hash;
+-- u8 hash_idx;
+-+ u16 hash_idx;
+- u32 i;
+- bool found;
+- bool sta;
+-@@ -88,6 +88,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
+- }
+- hash_idx = sta ? BRCMF_FLOWRING_HASH_STA(fifo, ifidx) :
+- BRCMF_FLOWRING_HASH_AP(mac, fifo, ifidx);
+-+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
+- found = false;
+- hash = flow->hash;
+- for (i = 0; i < BRCMF_FLOWRING_HASHSIZE; i++) {
+-@@ -98,6 +99,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
+- break;
+- }
+- hash_idx++;
+-+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
+- }
+- if (found)
+- return hash[hash_idx].flowid;
+-@@ -111,7 +113,7 @@ u32 brcmf_flowring_create(struct brcmf_f
+- {
+- struct brcmf_flowring_ring *ring;
+- struct brcmf_flowring_hash *hash;
+-- u8 hash_idx;
+-+ u16 hash_idx;
+- u32 i;
+- bool found;
+- u8 fifo;
+-@@ -131,6 +133,7 @@ u32 brcmf_flowring_create(struct brcmf_f
+- }
+- hash_idx = sta ? BRCMF_FLOWRING_HASH_STA(fifo, ifidx) :
+- BRCMF_FLOWRING_HASH_AP(mac, fifo, ifidx);
+-+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
+- found = false;
+- hash = flow->hash;
+- for (i = 0; i < BRCMF_FLOWRING_HASHSIZE; i++) {
+-@@ -140,6 +143,7 @@ u32 brcmf_flowring_create(struct brcmf_f
+- break;
+- }
+- hash_idx++;
+-+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
+- }
+- if (found) {
+- for (i = 0; i < flow->nrofrings; i++) {
+-@@ -169,7 +173,7 @@ u32 brcmf_flowring_create(struct brcmf_f
+- }
+-
+-
+--u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u8 flowid)
+-+u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u16 flowid)
+- {
+- struct brcmf_flowring_ring *ring;
+-
+-@@ -179,7 +183,7 @@ u8 brcmf_flowring_tid(struct brcmf_flowr
+- }
+-
+-
+--static void brcmf_flowring_block(struct brcmf_flowring *flow, u8 flowid,
+-+static void brcmf_flowring_block(struct brcmf_flowring *flow, u16 flowid,
+- bool blocked)
+- {
+- struct brcmf_flowring_ring *ring;
+-@@ -228,10 +232,10 @@ static void brcmf_flowring_block(struct
+- }
+-
+-
+--void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid)
+-+void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid)
+- {
+- struct brcmf_flowring_ring *ring;
+-- u8 hash_idx;
+-+ u16 hash_idx;
+- struct sk_buff *skb;
+-
+- ring = flow->rings[flowid];
+-@@ -253,7 +257,7 @@ void brcmf_flowring_delete(struct brcmf_
+- }
+-
+-
+--u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u8 flowid,
+-+u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u16 flowid,
+- struct sk_buff *skb)
+- {
+- struct brcmf_flowring_ring *ring;
+-@@ -279,7 +283,7 @@ u32 brcmf_flowring_enqueue(struct brcmf_
+- }
+-
+-
+--struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u8 flowid)
+-+struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u16 flowid)
+- {
+- struct brcmf_flowring_ring *ring;
+- struct sk_buff *skb;
+-@@ -300,7 +304,7 @@ struct sk_buff *brcmf_flowring_dequeue(s
+- }
+-
+-
+--void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u8 flowid,
+-+void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u16 flowid,
+- struct sk_buff *skb)
+- {
+- struct brcmf_flowring_ring *ring;
+-@@ -311,7 +315,7 @@ void brcmf_flowring_reinsert(struct brcm
+- }
+-
+-
+--u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u8 flowid)
+-+u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u16 flowid)
+- {
+- struct brcmf_flowring_ring *ring;
+-
+-@@ -326,7 +330,7 @@ u32 brcmf_flowring_qlen(struct brcmf_flo
+- }
+-
+-
+--void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid)
+-+void brcmf_flowring_open(struct brcmf_flowring *flow, u16 flowid)
+- {
+- struct brcmf_flowring_ring *ring;
+-
+-@@ -340,10 +344,10 @@ void brcmf_flowring_open(struct brcmf_fl
+- }
+-
+-
+--u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u8 flowid)
+-+u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u16 flowid)
+- {
+- struct brcmf_flowring_ring *ring;
+-- u8 hash_idx;
+-+ u16 hash_idx;
+-
+- ring = flow->rings[flowid];
+- hash_idx = ring->hash_id;
+-@@ -384,7 +388,7 @@ void brcmf_flowring_detach(struct brcmf_
+- struct brcmf_pub *drvr = bus_if->drvr;
+- struct brcmf_flowring_tdls_entry *search;
+- struct brcmf_flowring_tdls_entry *remove;
+-- u8 flowid;
+-+ u16 flowid;
+-
+- for (flowid = 0; flowid < flow->nrofrings; flowid++) {
+- if (flow->rings[flowid])
+-@@ -408,7 +412,7 @@ void brcmf_flowring_configure_addr_mode(
+- struct brcmf_bus *bus_if = dev_get_drvdata(flow->dev);
+- struct brcmf_pub *drvr = bus_if->drvr;
+- u32 i;
+-- u8 flowid;
+-+ u16 flowid;
+-
+- if (flow->addr_mode[ifidx] != addr_mode) {
+- for (i = 0; i < ARRAY_SIZE(flow->hash); i++) {
+-@@ -434,7 +438,7 @@ void brcmf_flowring_delete_peer(struct b
+- struct brcmf_flowring_tdls_entry *prev;
+- struct brcmf_flowring_tdls_entry *search;
+- u32 i;
+-- u8 flowid;
+-+ u16 flowid;
+- bool sta;
+-
+- sta = (flow->addr_mode[ifidx] == ADDR_INDIRECT);
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
+-@@ -16,7 +16,7 @@
+- #define BRCMFMAC_FLOWRING_H
+-
+-
+--#define BRCMF_FLOWRING_HASHSIZE 256
+-+#define BRCMF_FLOWRING_HASHSIZE 512 /* has to be 2^x */
+- #define BRCMF_FLOWRING_INVALID_ID 0xFFFFFFFF
+-
+-
+-@@ -24,7 +24,7 @@ struct brcmf_flowring_hash {
+- u8 mac[ETH_ALEN];
+- u8 fifo;
+- u8 ifidx;
+-- u8 flowid;
+-+ u16 flowid;
+- };
+-
+- enum ring_status {
+-@@ -61,16 +61,16 @@ u32 brcmf_flowring_lookup(struct brcmf_f
+- u8 prio, u8 ifidx);
+- u32 brcmf_flowring_create(struct brcmf_flowring *flow, u8 da[ETH_ALEN],
+- u8 prio, u8 ifidx);
+--void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid);
+--void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid);
+--u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u8 flowid);
+--u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u8 flowid,
+-+void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid);
+-+void brcmf_flowring_open(struct brcmf_flowring *flow, u16 flowid);
+-+u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u16 flowid);
+-+u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u16 flowid,
+- struct sk_buff *skb);
+--struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u8 flowid);
+--void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u8 flowid,
+-+struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u16 flowid);
+-+void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u16 flowid,
+- struct sk_buff *skb);
+--u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u8 flowid);
+--u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u8 flowid);
+-+u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u16 flowid);
+-+u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u16 flowid);
+- struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings);
+- void brcmf_flowring_detach(struct brcmf_flowring *flow);
+- void brcmf_flowring_configure_addr_mode(struct brcmf_flowring *flow, int ifidx,
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+-@@ -677,7 +677,7 @@ static u32 brcmf_msgbuf_flowring_create(
+- }
+-
+-
+--static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u8 flowid)
+-+static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
+- {
+- struct brcmf_flowring *flow = msgbuf->flow;
+- struct brcmf_commonring *commonring;
+-@@ -1310,7 +1310,7 @@ int brcmf_proto_msgbuf_rx_trigger(struct
+- }
+-
+-
+--void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u8 flowid)
+-+void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid)
+- {
+- struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;
+- struct msgbuf_tx_flowring_delete_req *delete;
+-@@ -1415,6 +1415,13 @@ int brcmf_proto_msgbuf_attach(struct brc
+- u32 count;
+-
+- if_msgbuf = drvr->bus_if->msgbuf;
+-+
+-+ if (if_msgbuf->nrof_flowrings >= BRCMF_FLOWRING_HASHSIZE) {
+-+ brcmf_err("driver not configured for this many flowrings %d\n",
+-+ if_msgbuf->nrof_flowrings);
+-+ if_msgbuf->nrof_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
+-+ }
+-+
+- msgbuf = kzalloc(sizeof(*msgbuf), GFP_KERNEL);
+- if (!msgbuf)
+- goto fail;
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
+-@@ -33,7 +33,7 @@
+-
+-
+- int brcmf_proto_msgbuf_rx_trigger(struct device *dev);
+--void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u8 flowid);
+-+void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid);
+- int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr);
+- void brcmf_proto_msgbuf_detach(struct brcmf_pub *drvr);
+- #else
+diff --git a/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch b/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch
+deleted file mode 100644
+index e414f23..0000000
+--- a/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch
++++ /dev/null
+@@ -1,22 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Mon, 8 Feb 2016 14:24:36 +0100
+-Subject: [PATCH] cfg80211: fix faulty variable initialization in
+- ieee80211_amsdu_to_8023s
+-
+-reuse_skb is set to true if the code decides to use the last segment.
+-Fixes a memory leak
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/net/wireless/util.c
+-+++ b/net/wireless/util.c
+-@@ -676,7 +676,7 @@ void ieee80211_amsdu_to_8023s(struct sk_
+- u8 *payload;
+- int offset = 0, remaining, err;
+- struct ethhdr eth;
+-- bool reuse_skb = true;
+-+ bool reuse_skb = false;
+- bool last = false;
+-
+- if (has_80211_header) {
+diff --git a/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch b/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch
+deleted file mode 100644
+index 6e2d0cf..0000000
+--- a/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch
++++ /dev/null
+@@ -1,132 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Mon, 8 Feb 2016 14:33:19 +0100
+-Subject: [PATCH] cfg80211: reuse existing page fragments in A-MSDU rx
+-
+-This massively reduces data copying and thus improves rx performance
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/net/wireless/util.c
+-+++ b/net/wireless/util.c
+-@@ -644,23 +644,93 @@ int ieee80211_data_from_8023(struct sk_b
+- }
+- EXPORT_SYMBOL(ieee80211_data_from_8023);
+-
+-+static void
+-+__frame_add_frag(struct sk_buff *skb, struct page *page,
+-+ void *ptr, int len, int size)
+-+{
+-+ struct skb_shared_info *sh = skb_shinfo(skb);
+-+ int page_offset;
+-+
+-+ atomic_inc(&page->_count);
+-+ page_offset = ptr - page_address(page);
+-+ skb_add_rx_frag(skb, sh->nr_frags, page, page_offset, len, size);
+-+}
+-+
+-+static void
+-+__ieee80211_amsdu_copy_frag(struct sk_buff *skb, struct sk_buff *frame,
+-+ int offset, int len)
+-+{
+-+ struct skb_shared_info *sh = skb_shinfo(skb);
+-+ const skb_frag_t *frag = &sh->frags[-1];
+-+ struct page *frag_page;
+-+ void *frag_ptr;
+-+ int frag_len, frag_size;
+-+ int head_size = skb->len - skb->data_len;
+-+ int cur_len;
+-+
+-+ frag_page = virt_to_head_page(skb->head);
+-+ frag_ptr = skb->data;
+-+ frag_size = head_size;
+-+
+-+ while (offset >= frag_size) {
+-+ offset -= frag_size;
+-+ frag++;
+-+ frag_page = skb_frag_page(frag);
+-+ frag_ptr = skb_frag_address(frag);
+-+ frag_size = skb_frag_size(frag);
+-+ }
+-+
+-+ frag_ptr += offset;
+-+ frag_len = frag_size - offset;
+-+
+-+ cur_len = min(len, frag_len);
+-+
+-+ __frame_add_frag(frame, frag_page, frag_ptr, cur_len, frag_size);
+-+ len -= cur_len;
+-+
+-+ while (len > 0) {
+-+ frag++;
+-+ frag_len = skb_frag_size(frag);
+-+ cur_len = min(len, frag_len);
+-+ __frame_add_frag(frame, skb_frag_page(frag),
+-+ skb_frag_address(frag), cur_len, frag_len);
+-+ len -= cur_len;
+-+ }
+-+}
+-+
+- static struct sk_buff *
+- __ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
+-- int offset, int len)
+-+ int offset, int len, bool reuse_frag)
+- {
+- struct sk_buff *frame;
+-+ int cur_len = len;
+-
+- if (skb->len - offset < len)
+- return NULL;
+-
+- /*
+-+ * When reusing framents, copy some data to the head to simplify
+-+ * ethernet header handling and speed up protocol header processing
+-+ * in the stack later.
+-+ */
+-+ if (reuse_frag)
+-+ cur_len = min_t(int, len, 32);
+-+
+-+ /*
+- * Allocate and reserve two bytes more for payload
+- * alignment since sizeof(struct ethhdr) is 14.
+- */
+-- frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + len);
+-+ frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + cur_len);
+-
+- skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
+-- skb_copy_bits(skb, offset, skb_put(frame, len), len);
+-+ skb_copy_bits(skb, offset, skb_put(frame, cur_len), cur_len);
+-+
+-+ len -= cur_len;
+-+ if (!len)
+-+ return frame;
+-+
+-+ offset += cur_len;
+-+ __ieee80211_amsdu_copy_frag(skb, frame, offset, len);
+-
+- return frame;
+- }
+-@@ -676,6 +746,7 @@ void ieee80211_amsdu_to_8023s(struct sk_
+- u8 *payload;
+- int offset = 0, remaining, err;
+- struct ethhdr eth;
+-+ bool reuse_frag = skb->head_frag && !skb_has_frag_list(skb);
+- bool reuse_skb = false;
+- bool last = false;
+-
+-@@ -703,12 +774,13 @@ void ieee80211_amsdu_to_8023s(struct sk_
+- offset += sizeof(struct ethhdr);
+- /* reuse skb for the last subframe */
+- last = remaining <= subframe_len + padding;
+-- if (!skb_is_nonlinear(skb) && last) {
+-+ if (!skb_is_nonlinear(skb) && !reuse_frag && last) {
+- skb_pull(skb, offset);
+- frame = skb;
+- reuse_skb = true;
+- } else {
+-- frame = __ieee80211_amsdu_copy(skb, hlen, offset, len);
+-+ frame = __ieee80211_amsdu_copy(skb, hlen, offset, len,
+-+ reuse_frag);
+- if (!frame)
+- goto purge;
+-
+diff --git a/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch b/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch
+deleted file mode 100644
+index f8f4f09..0000000
+--- a/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch
++++ /dev/null
+@@ -1,36 +0,0 @@
+-From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+-Date: Wed, 10 Feb 2016 16:08:17 +0100
+-Subject: [PATCH] mac80211: fix wiphy supported_band access
+-
+-Fix wiphy supported_band access in tx radiotap parsing. In particular,
+-info->band is always set to 0 (IEEE80211_BAND_2GHZ) since it has not
+-assigned yet. This cause a kernel crash on 5GHz only devices.
+-Move ieee80211_parse_tx_radiotap() after info->band assignment
+-
+-Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+----
+-
+---- a/net/mac80211/tx.c
+-+++ b/net/mac80211/tx.c
+-@@ -1890,10 +1890,6 @@ netdev_tx_t ieee80211_monitor_start_xmit
+- info->flags = IEEE80211_TX_CTL_REQ_TX_STATUS |
+- IEEE80211_TX_CTL_INJECTED;
+-
+-- /* process and remove the injection radiotap header */
+-- if (!ieee80211_parse_tx_radiotap(local, skb))
+-- goto fail;
+--
+- rcu_read_lock();
+-
+- /*
+-@@ -1955,6 +1951,10 @@ netdev_tx_t ieee80211_monitor_start_xmit
+- goto fail_rcu;
+-
+- info->band = chandef->chan->band;
+-+ /* process and remove the injection radiotap header */
+-+ if (!ieee80211_parse_tx_radiotap(local, skb))
+-+ goto fail_rcu;
+-+
+- ieee80211_xmit(sdata, NULL, skb);
+- rcu_read_unlock();
+-
+diff --git a/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch b/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch
+deleted file mode 100644
+index acaacf7..0000000
+--- a/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch
++++ /dev/null
+@@ -1,61 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Thu, 18 Feb 2016 19:30:05 +0100
+-Subject: [PATCH] mac80211: minstrel_ht: set A-MSDU tx limits based on selected
+- max_prob_rate
+-
+-Prevents excessive A-MSDU aggregation at low data rates or bad
+-conditions.
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/net/mac80211/rc80211_minstrel_ht.c
+-+++ b/net/mac80211/rc80211_minstrel_ht.c
+-@@ -883,6 +883,39 @@ minstrel_ht_set_rate(struct minstrel_pri
+- ratetbl->rate[offset].flags = flags;
+- }
+-
+-+static int
+-+minstrel_ht_get_max_amsdu_len(struct minstrel_ht_sta *mi)
+-+{
+-+ int group = mi->max_prob_rate / MCS_GROUP_RATES;
+-+ const struct mcs_group *g = &minstrel_mcs_groups[group];
+-+ int rate = mi->max_prob_rate % MCS_GROUP_RATES;
+-+
+-+ /* Disable A-MSDU if max_prob_rate is bad */
+-+ if (mi->groups[group].rates[rate].prob_ewma < MINSTREL_FRAC(50, 100))
+-+ return 1;
+-+
+-+ /* If the rate is slower than single-stream MCS1, make A-MSDU limit small */
+-+ if (g->duration[rate] > MCS_DURATION(1, 0, 52))
+-+ return 500;
+-+
+-+ /*
+-+ * If the rate is slower than single-stream MCS4, limit A-MSDU to usual
+-+ * data packet size
+-+ */
+-+ if (g->duration[rate] > MCS_DURATION(1, 0, 104))
+-+ return 1500;
+-+
+-+ /*
+-+ * If the rate is slower than single-stream MCS7, limit A-MSDU to twice
+-+ * the usual data packet size
+-+ */
+-+ if (g->duration[rate] > MCS_DURATION(1, 0, 260))
+-+ return 3000;
+-+
+-+ /* unlimited */
+-+ return 0;
+-+}
+-+
+- static void
+- minstrel_ht_update_rates(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
+- {
+-@@ -907,6 +940,7 @@ minstrel_ht_update_rates(struct minstrel
+- minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_prob_rate);
+- }
+-
+-+ mi->sta->max_rc_amsdu_len = minstrel_ht_get_max_amsdu_len(mi);
+- rates->rate[i].idx = -1;
+- rate_control_set_rates(mp->hw, mi->sta, rates);
+- }
+diff --git a/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch b/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch
+deleted file mode 100644
+index 32a2ad6..0000000
+--- a/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch
++++ /dev/null
+@@ -1,31 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Thu, 18 Feb 2016 19:45:33 +0100
+-Subject: [PATCH] mac80211: minstrel_ht: set default tx aggregation timeout to
+- 0
+-
+-The value 5000 was put here with the addition of the timeout field to
+-ieee80211_start_tx_ba_session. It was originally added in mac80211 to
+-save resources for drivers like iwlwifi, which only supports a limited
+-number of concurrent aggregation sessions.
+-
+-Since iwlwifi does not use minstrel_ht and other drivers don't need
+-this, 0 is a better default - especially since there have been
+-recent reports of aggregation setup related issues reproduced with
+-ath9k. This should improve stability without causing any adverse
+-effects.
+-
+-Cc: stable@vger.kernel.org
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/net/mac80211/rc80211_minstrel_ht.c
+-+++ b/net/mac80211/rc80211_minstrel_ht.c
+-@@ -692,7 +692,7 @@ minstrel_aggr_check(struct ieee80211_sta
+- if (likely(sta->ampdu_mlme.tid_tx[tid]))
+- return;
+-
+-- ieee80211_start_tx_ba_session(pubsta, tid, 5000);
+-+ ieee80211_start_tx_ba_session(pubsta, tid, 0);
+- }
+-
+- static void
+diff --git a/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch b/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch
+deleted file mode 100644
+index 229351b..0000000
+--- a/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch
++++ /dev/null
+@@ -1,26 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Wed, 24 Feb 2016 12:03:13 +0100
+-Subject: [PATCH] mac80211: minstrel_ht: fix a logic error in RTS/CTS handling
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-RTS/CTS needs to be enabled if the rate is a fallback rate *or* if it's
+-a dual-stream rate and the sta is in dynamic SMPS mode.
+-
+-Fixes: a3ebb4e1b763 ("mac80211: minstrel_ht: handle peers in dynamic SMPS")
+-Reported-by: MatÃÂas Richart <mrichart@fing.edu.uy>
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/net/mac80211/rc80211_minstrel_ht.c
+-+++ b/net/mac80211/rc80211_minstrel_ht.c
+-@@ -872,7 +872,7 @@ minstrel_ht_set_rate(struct minstrel_pri
+- * - if station is in dynamic SMPS (and streams > 1)
+- * - for fallback rates, to increase chances of getting through
+- */
+-- if (offset > 0 &&
+-+ if (offset > 0 ||
+- (mi->sta->smps_mode == IEEE80211_SMPS_DYNAMIC &&
+- group->streams > 1)) {
+- ratetbl->rate[offset].count = ratetbl->rate[offset].count_rts;
+diff --git a/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch b/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch
+deleted file mode 100644
+index 56cd94a..0000000
+--- a/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch
++++ /dev/null
+@@ -1,35 +0,0 @@
+-From: Jouni Malinen <jouni@qca.qualcomm.com>
+-Date: Tue, 1 Mar 2016 00:29:00 +0200
+-Subject: [PATCH] mac80211: Fix Public Action frame RX in AP mode
+-
+-Public Action frames use special rules for how the BSSID field (Address
+-3) is set. A wildcard BSSID is used in cases where the transmitter and
+-recipient are not members of the same BSS. As such, we need to accept
+-Public Action frames with wildcard BSSID.
+-
+-Commit db8e17324553 ("mac80211: ignore frames between TDLS peers when
+-operating as AP") added a rule that drops Action frames to TDLS-peers
+-based on an Action frame having different DA (Address 1) and BSSID
+-(Address 3) values. This is not correct since it misses the possibility
+-of BSSID being a wildcard BSSID in which case the Address 1 would not
+-necessarily match.
+-
+-Fix this by allowing mac80211 to accept wildcard BSSID in an Action
+-frame when in AP mode.
+-
+-Fixes: db8e17324553 ("mac80211: ignore frames between TDLS peers when operating as AP")
+-Cc: stable@vger.kernel.org
+-Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/mac80211/rx.c
+-+++ b/net/mac80211/rx.c
+-@@ -3374,6 +3374,7 @@ static bool ieee80211_accept_frame(struc
+- return false;
+- /* ignore action frames to TDLS-peers */
+- if (ieee80211_is_action(hdr->frame_control) &&
+-+ !is_broadcast_ether_addr(bssid) &&
+- !ether_addr_equal(bssid, hdr->addr1))
+- return false;
+- }
+diff --git a/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch b/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch
+deleted file mode 100644
+index 15d6cd0..0000000
+--- a/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch
++++ /dev/null
+@@ -1,21 +0,0 @@
+-From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+-Date: Fri, 19 Feb 2016 11:43:04 +0100
+-Subject: [PATCH] cfg80211: add radiotap VHT info to rtap_namespace_sizes
+-
+-Add IEEE80211_RADIOTAP_VHT entry to rtap_namespace_sizes array in order to
+-define alignment and size of VHT info in tx radiotap
+-
+-Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+----
+-
+---- a/net/wireless/radiotap.c
+-+++ b/net/wireless/radiotap.c
+-@@ -43,6 +43,7 @@ static const struct radiotap_align_size
+- [IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
+- [IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
+- [IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
+-+ [IEEE80211_RADIOTAP_VHT] = { .align = 2, .size = 12, },
+- /*
+- * add more here as they are defined in radiotap.h
+- */
+diff --git a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch b/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch
+deleted file mode 100644
+index de1b386..0000000
+--- a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch
++++ /dev/null
+@@ -1,36 +0,0 @@
+-From: Sven Eckelmann <sven@narfation.org>
+-Date: Wed, 24 Feb 2016 16:25:49 +0100
+-Subject: [PATCH] mac80211: fix parsing of 40Mhz in injected radiotap
+- header
+-
+-The MCS bandwidth part of the radiotap header is 2 bits wide. The full 2
+-bit have to compared against IEEE80211_RADIOTAP_MCS_BW_40 and not only if
+-the first bit is set. Otherwise IEEE80211_RADIOTAP_MCS_BW_40 can be
+-confused with IEEE80211_RADIOTAP_MCS_BW_20U.
+-
+-Fixes: 5ec3aed9ba4c ("mac80211: Parse legacy and HT rate in injected frames")
+-Signed-off-by: Sven Eckelmann <sven@narfation.org>
+----
+-
+---- a/net/mac80211/tx.c
+-+++ b/net/mac80211/tx.c
+-@@ -1689,7 +1689,7 @@ static bool ieee80211_parse_tx_radiotap(
+- bool rate_found = false;
+- u8 rate_retries = 0;
+- u16 rate_flags = 0;
+-- u8 mcs_known, mcs_flags;
+-+ u8 mcs_known, mcs_flags, mcs_bw;
+- int i;
+-
+- info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
+-@@ -1765,8 +1765,9 @@ static bool ieee80211_parse_tx_radiotap(
+- mcs_flags & IEEE80211_RADIOTAP_MCS_SGI)
+- rate_flags |= IEEE80211_TX_RC_SHORT_GI;
+-
+-+ mcs_bw = mcs_flags & IEEE80211_RADIOTAP_MCS_BW_MASK;
+- if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW &&
+-- mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40)
+-+ mcs_bw == IEEE80211_RADIOTAP_MCS_BW_40)
+- rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+- break;
+-
+diff --git a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch b/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch
+deleted file mode 100644
+index ac1f251..0000000
+--- a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch
++++ /dev/null
+@@ -1,65 +0,0 @@
+-From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+-Date: Tue, 23 Feb 2016 15:43:35 +0100
+-Subject: [PATCH] mac80211: parse VHT info in injected frames
+-
+-Add VHT radiotap parsing support to ieee80211_parse_tx_radiotap().
+-That capability has been tested using a d-link dir-860l rev b1 running
+-OpenWrt trunk and mt76 driver
+-
+-Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+----
+-
+---- a/net/mac80211/tx.c
+-+++ b/net/mac80211/tx.c
+-@@ -1690,6 +1690,8 @@ static bool ieee80211_parse_tx_radiotap(
+- u8 rate_retries = 0;
+- u16 rate_flags = 0;
+- u8 mcs_known, mcs_flags, mcs_bw;
+-+ u16 vht_known;
+-+ u8 vht_mcs = 0, vht_nss = 0;
+- int i;
+-
+- info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
+-@@ -1771,6 +1773,32 @@ static bool ieee80211_parse_tx_radiotap(
+- rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+- break;
+-
+-+ case IEEE80211_RADIOTAP_VHT:
+-+ vht_known = get_unaligned_le16(iterator.this_arg);
+-+ rate_found = true;
+-+
+-+ rate_flags = IEEE80211_TX_RC_VHT_MCS;
+-+ if ((vht_known & IEEE80211_RADIOTAP_VHT_KNOWN_GI) &&
+-+ (iterator.this_arg[2] &
+-+ IEEE80211_RADIOTAP_VHT_FLAG_SGI))
+-+ rate_flags |= IEEE80211_TX_RC_SHORT_GI;
+-+ if (vht_known &
+-+ IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH) {
+-+ if (iterator.this_arg[3] == 1)
+-+ rate_flags |=
+-+ IEEE80211_TX_RC_40_MHZ_WIDTH;
+-+ else if (iterator.this_arg[3] == 4)
+-+ rate_flags |=
+-+ IEEE80211_TX_RC_80_MHZ_WIDTH;
+-+ else if (iterator.this_arg[3] == 11)
+-+ rate_flags |=
+-+ IEEE80211_TX_RC_160_MHZ_WIDTH;
+-+ }
+-+
+-+ vht_mcs = iterator.this_arg[4] >> 4;
+-+ vht_nss = iterator.this_arg[4] & 0xF;
+-+ break;
+-+
+- /*
+- * Please update the file
+- * Documentation/networking/mac80211-injection.txt
+-@@ -1796,6 +1824,9 @@ static bool ieee80211_parse_tx_radiotap(
+-
+- if (rate_flags & IEEE80211_TX_RC_MCS) {
+- info->control.rates[0].idx = rate;
+-+ } else if (rate_flags & IEEE80211_TX_RC_VHT_MCS) {
+-+ ieee80211_rate_set_vht(info->control.rates, vht_mcs,
+-+ vht_nss);
+- } else {
+- for (i = 0; i < sband->n_bitrates; i++) {
+- if (rate * 5 != sband->bitrates[i].bitrate)
+diff --git a/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch b/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch
+deleted file mode 100644
+index d7452c2..0000000
+--- a/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch
++++ /dev/null
+@@ -1,23 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Wed, 2 Mar 2016 15:51:40 +0100
+-Subject: [PATCH] mac80211: do not pass injected frames without a valid rate to
+- the driver
+-
+-Fall back to rate control if the requested bitrate was not found.
+-
+-Fixes: dfdfc2beb0dd ("mac80211: Parse legacy and HT rate in injected frames")
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/net/mac80211/tx.c
+-+++ b/net/mac80211/tx.c
+-@@ -1837,6 +1837,9 @@ static bool ieee80211_parse_tx_radiotap(
+- }
+- }
+-
+-+ if (info->control.rates[0].idx < 0)
+-+ info->control.flags &= ~IEEE80211_TX_CTRL_RATE_INJECT;
+-+
+- info->control.rates[0].flags = rate_flags;
+- info->control.rates[0].count = min_t(u8, rate_retries + 1,
+- local->hw.max_rate_tries);
+diff --git a/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch b/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch
+deleted file mode 100644
+index 55ff817..0000000
+--- a/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch
++++ /dev/null
+@@ -1,77 +0,0 @@
+-From: Felix Fietkau <nbd@openwrt.org>
+-Date: Thu, 3 Mar 2016 23:20:06 +0100
+-Subject: [PATCH] mac80211: minstrel_ht: improve sample rate skip logic
+-
+-There were a few issues that were slowing down the process of finding
+-the optimal rate, especially on devices with multi-rate retry
+-limitations:
+-
+-When max_tp_rate[0] was slower than max_tp_rate[1], the code did not
+-sample max_tp_rate[1], which would often allow it to switch places with
+-max_tp_rate[0] (e.g. if only the first sampling attempts were bad, but the
+-rate is otherwise good).
+-
+-Also, sample attempts of rates between max_tp_rate[0] and [1] were being
+-ignored in this case, because the code only checked if the rate was
+-slower than [1].
+-
+-Fix this by checking against the fastest / second fastest max_tp_rate
+-instead of assuming a specific order between the two.
+-
+-In my tests this patch significantly reduces the time until minstrel_ht
+-finds the optimal rate right after assoc
+-
+-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+----
+-
+---- a/net/mac80211/rc80211_minstrel_ht.c
+-+++ b/net/mac80211/rc80211_minstrel_ht.c
+-@@ -958,6 +958,7 @@ minstrel_get_sample_rate(struct minstrel
+- struct minstrel_rate_stats *mrs;
+- struct minstrel_mcs_group_data *mg;
+- unsigned int sample_dur, sample_group, cur_max_tp_streams;
+-+ int tp_rate1, tp_rate2;
+- int sample_idx = 0;
+-
+- if (mi->sample_wait > 0) {
+-@@ -979,14 +980,22 @@ minstrel_get_sample_rate(struct minstrel
+- mrs = &mg->rates[sample_idx];
+- sample_idx += sample_group * MCS_GROUP_RATES;
+-
+-+ /* Set tp_rate1, tp_rate2 to the highest / second highest max_tp_rate */
+-+ if (minstrel_get_duration(mi->max_tp_rate[0]) >
+-+ minstrel_get_duration(mi->max_tp_rate[1])) {
+-+ tp_rate1 = mi->max_tp_rate[1];
+-+ tp_rate2 = mi->max_tp_rate[0];
+-+ } else {
+-+ tp_rate1 = mi->max_tp_rate[0];
+-+ tp_rate2 = mi->max_tp_rate[1];
+-+ }
+-+
+- /*
+- * Sampling might add some overhead (RTS, no aggregation)
+-- * to the frame. Hence, don't use sampling for the currently
+-- * used rates.
+-+ * to the frame. Hence, don't use sampling for the highest currently
+-+ * used highest throughput or probability rate.
+- */
+-- if (sample_idx == mi->max_tp_rate[0] ||
+-- sample_idx == mi->max_tp_rate[1] ||
+-- sample_idx == mi->max_prob_rate)
+-+ if (sample_idx == mi->max_tp_rate[0] || sample_idx == mi->max_prob_rate)
+- return -1;
+-
+- /*
+-@@ -1001,10 +1010,10 @@ minstrel_get_sample_rate(struct minstrel
+- * if the link is working perfectly.
+- */
+-
+-- cur_max_tp_streams = minstrel_mcs_groups[mi->max_tp_rate[0] /
+-+ cur_max_tp_streams = minstrel_mcs_groups[tp_rate1 /
+- MCS_GROUP_RATES].streams;
+- sample_dur = minstrel_get_duration(sample_idx);
+-- if (sample_dur >= minstrel_get_duration(mi->max_tp_rate[1]) &&
+-+ if (sample_dur >= minstrel_get_duration(tp_rate2) &&
+- (cur_max_tp_streams - 1 <
+- minstrel_mcs_groups[sample_group].streams ||
+- sample_dur >= minstrel_get_duration(mi->max_prob_rate))) {
+diff --git a/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch b/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch
+deleted file mode 100644
+index 3de0f64..0000000
+--- a/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch
++++ /dev/null
+@@ -1,73 +0,0 @@
+-From: Hante Meuleman <meuleman@broadcom.com>
+-Date: Wed, 17 Feb 2016 11:26:57 +0100
+-Subject: [PATCH] brcmfmac: use device memsize config from fw if defined
+-
+-Newer type pcie devices have memory which get shared between fw and
+-hw. The division of this memory is done firmware compile time. As a
+-result the ramsize as used by driver needs to be adjusted for this.
+-This is done by reading the memory size from the firmware.
+-
+-Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+-Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+-Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+-Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+-Signed-off-by: Arend van Spriel <arend@broadcom.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-@@ -207,6 +207,10 @@ static struct brcmf_firmware_mapping brc
+- #define BRCMF_PCIE_CFGREG_REG_BAR3_CONFIG 0x4F4
+- #define BRCMF_PCIE_LINK_STATUS_CTRL_ASPM_ENAB 3
+-
+-+/* Magic number at a magic location to find RAM size */
+-+#define BRCMF_RAMSIZE_MAGIC 0x534d4152 /* SMAR */
+-+#define BRCMF_RAMSIZE_OFFSET 0x6c
+-+
+-
+- struct brcmf_pcie_console {
+- u32 base_addr;
+-@@ -1412,6 +1416,28 @@ static const struct brcmf_bus_ops brcmf_
+- };
+-
+-
+-+static void
+-+brcmf_pcie_adjust_ramsize(struct brcmf_pciedev_info *devinfo, u8 *data,
+-+ u32 data_len)
+-+{
+-+ __le32 *field;
+-+ u32 newsize;
+-+
+-+ if (data_len < BRCMF_RAMSIZE_OFFSET + 8)
+-+ return;
+-+
+-+ field = (__le32 *)&data[BRCMF_RAMSIZE_OFFSET];
+-+ if (le32_to_cpup(field) != BRCMF_RAMSIZE_MAGIC)
+-+ return;
+-+ field++;
+-+ newsize = le32_to_cpup(field);
+-+
+-+ brcmf_dbg(PCIE, "Found ramsize info in FW, adjusting to 0x%x\n",
+-+ newsize);
+-+ devinfo->ci->ramsize = newsize;
+-+}
+-+
+-+
+- static int
+- brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
+- u32 sharedram_addr)
+-@@ -1694,6 +1720,13 @@ static void brcmf_pcie_setup(struct devi
+-
+- brcmf_pcie_attach(devinfo);
+-
+-+ /* Some of the firmwares have the size of the memory of the device
+-+ * defined inside the firmware. This is because part of the memory in
+-+ * the device is shared and the devision is determined by FW. Parse
+-+ * the firmware and adjust the chip memory size now.
+-+ */
+-+ brcmf_pcie_adjust_ramsize(devinfo, (u8 *)fw->data, fw->size);
+-+
+- ret = brcmf_pcie_download_fw_nvram(devinfo, fw, nvram, nvram_len);
+- if (ret)
+- goto fail;
+diff --git a/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch b/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch
+deleted file mode 100644
+index ca03ffe..0000000
+--- a/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch
++++ /dev/null
+@@ -1,58 +0,0 @@
+-From: Hante Meuleman <meuleman@broadcom.com>
+-Date: Wed, 17 Feb 2016 11:26:58 +0100
+-Subject: [PATCH] brcmfmac: use bar1 window size as provided by pci subsystem
+-
+-The PCIE bar1 window size is specified by chip. Currently the
+-ioremap of bar1 was using a define which always matched the size
+-of bar1, but newer chips can have a different bar1 sizes. With
+-this patch the ioremap will be called with the by chip provided
+-window size.
+-
+-Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+-Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+-Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+-Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+-Signed-off-by: Arend van Spriel <arend@broadcom.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-@@ -72,7 +72,6 @@ static struct brcmf_firmware_mapping brc
+-
+- #define BRCMF_PCIE_FW_UP_TIMEOUT 2000 /* msec */
+-
+--#define BRCMF_PCIE_TCM_MAP_SIZE (4096 * 1024)
+- #define BRCMF_PCIE_REG_MAP_SIZE (32 * 1024)
+-
+- /* backplane addres space accessed by BAR0 */
+-@@ -252,7 +251,6 @@ struct brcmf_pciedev_info {
+- char nvram_name[BRCMF_FW_NAME_LEN];
+- void __iomem *regs;
+- void __iomem *tcm;
+-- u32 tcm_size;
+- u32 ram_base;
+- u32 ram_size;
+- struct brcmf_chip *ci;
+-@@ -1592,8 +1590,7 @@ static int brcmf_pcie_get_resource(struc
+- }
+-
+- devinfo->regs = ioremap_nocache(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);
+-- devinfo->tcm = ioremap_nocache(bar1_addr, BRCMF_PCIE_TCM_MAP_SIZE);
+-- devinfo->tcm_size = BRCMF_PCIE_TCM_MAP_SIZE;
+-+ devinfo->tcm = ioremap_nocache(bar1_addr, bar1_size);
+-
+- if (!devinfo->regs || !devinfo->tcm) {
+- brcmf_err("ioremap() failed (%p,%p)\n", devinfo->regs,
+-@@ -1602,8 +1599,9 @@ static int brcmf_pcie_get_resource(struc
+- }
+- brcmf_dbg(PCIE, "Phys addr : reg space = %p base addr %#016llx\n",
+- devinfo->regs, (unsigned long long)bar0_addr);
+-- brcmf_dbg(PCIE, "Phys addr : mem space = %p base addr %#016llx\n",
+-- devinfo->tcm, (unsigned long long)bar1_addr);
+-+ brcmf_dbg(PCIE, "Phys addr : mem space = %p base addr %#016llx size 0x%x\n",
+-+ devinfo->tcm, (unsigned long long)bar1_addr,
+-+ (unsigned int)bar1_size);
+-
+- return 0;
+- }
+diff --git a/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch b/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch
+deleted file mode 100644
+index e4a8f30..0000000
+--- a/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch
++++ /dev/null
+@@ -1,34 +0,0 @@
+-From: Hante Meuleman <meuleman@broadcom.com>
+-Date: Wed, 17 Feb 2016 11:26:59 +0100
+-Subject: [PATCH] brcmfmac: add support for the PCIE 4366c0 chip
+-
+-A newer version of the 4366 PCIE chip has been released. Add
+-support for this version of the chip.
+-
+-Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+-Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+-Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+-Signed-off-by: Arend van Spriel <arend@broadcom.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+-@@ -53,6 +53,7 @@ BRCMF_FW_NVRAM_DEF(4358, "brcmfmac4358-p
+- BRCMF_FW_NVRAM_DEF(4359, "brcmfmac4359-pcie.bin", "brcmfmac4359-pcie.txt");
+- BRCMF_FW_NVRAM_DEF(4365B, "brcmfmac4365b-pcie.bin", "brcmfmac4365b-pcie.txt");
+- BRCMF_FW_NVRAM_DEF(4366B, "brcmfmac4366b-pcie.bin", "brcmfmac4366b-pcie.txt");
+-+BRCMF_FW_NVRAM_DEF(4366C, "brcmfmac4366c-pcie.bin", "brcmfmac4366c-pcie.txt");
+- BRCMF_FW_NVRAM_DEF(4371, "brcmfmac4371-pcie.bin", "brcmfmac4371-pcie.txt");
+-
+- static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
+-@@ -66,7 +67,8 @@ static struct brcmf_firmware_mapping brc
+- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
+- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
+- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFFF, 4365B),
+-- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFFF, 4366B),
+-+ BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
+-+ BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
+- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
+- };
+-
+diff --git a/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch b/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch
+deleted file mode 100644
+index c529ff2..0000000
+--- a/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch
++++ /dev/null
+@@ -1,30 +0,0 @@
+-From: Hante Meuleman <meuleman@broadcom.com>
+-Date: Wed, 17 Feb 2016 11:27:01 +0100
+-Subject: [PATCH] brcmfmac: increase timeout for tx eapol
+-
+-When keys get set and updated this has to happen after eapol got
+-transmitted (without key or old key) before the key can be updated.
+-To make sure the order of sending eapol and configuring key is done
+-correctly a timeout for tx of eapol is applied. This timeout is set
+-to 50 msec, which is not always enough. Especially in AP mode and
+-key updates the timeout may need to be much longer because client(s)
+-can be in powersave. Increase the timeout from 50 to 950 msec.
+-
+-Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+-Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+-Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
+-Signed-off-by: Arend van Spriel <arend@broadcom.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+-@@ -40,7 +40,7 @@ MODULE_AUTHOR("Broadcom Corporation");
+- MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
+- MODULE_LICENSE("Dual BSD/GPL");
+-
+--#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(50)
+-+#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(950)
+-
+- /* AMPDU rx reordering definitions */
+- #define BRCMF_RXREORDER_FLOWID_OFFSET 0
+diff --git a/package/kernel/mac80211/patches/345-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch b/package/kernel/mac80211/patches/345-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
+deleted file mode 100644
+index f293401..0000000
+--- a/package/kernel/mac80211/patches/345-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
++++ /dev/null
+@@ -1,114 +0,0 @@
+-From: Hante Meuleman <hante.meuleman@broadcom.com>
+-Date: Mon, 11 Apr 2016 11:35:23 +0200
+-Subject: [PATCH] brcmfmac: insert default boardrev in nvram data if
+- missing
+-
+-Some nvram files/stores come without the boardrev information,
+-but firmware requires this to be set. When not found in nvram then
+-add a default boardrev string to the nvram data.
+-
+-Reported-by: Rafal Milecki <zajec5@gmail.com>
+-Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+-Reviewed-by: Franky (Zhenhui) Lin <franky.lin@broadcom.com>
+-Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
+-Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
+-Signed-off-by: Arend van Spriel <arend@broadcom.com>
+-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+----
+-
+---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+-@@ -29,6 +29,7 @@
+- #define BRCMF_FW_MAX_NVRAM_SIZE 64000
+- #define BRCMF_FW_NVRAM_DEVPATH_LEN 19 /* devpath0=pcie/1/4/ */
+- #define BRCMF_FW_NVRAM_PCIEDEV_LEN 10 /* pcie/1/4/ + \0 */
+-+#define BRCMF_FW_DEFAULT_BOARDREV "boardrev=0xff"
+-
+- enum nvram_parser_state {
+- IDLE,
+-@@ -51,6 +52,7 @@ enum nvram_parser_state {
+- * @entry: start position of key,value entry.
+- * @multi_dev_v1: detect pcie multi device v1 (compressed).
+- * @multi_dev_v2: detect pcie multi device v2.
+-+ * @boardrev_found: nvram contains boardrev information.
+- */
+- struct nvram_parser {
+- enum nvram_parser_state state;
+-@@ -63,6 +65,7 @@ struct nvram_parser {
+- u32 entry;
+- bool multi_dev_v1;
+- bool multi_dev_v2;
+-+ bool boardrev_found;
+- };
+-
+- /**
+-@@ -125,6 +128,8 @@ static enum nvram_parser_state brcmf_nvr
+- nvp->multi_dev_v1 = true;
+- if (strncmp(&nvp->data[nvp->entry], "pcie/", 5) == 0)
+- nvp->multi_dev_v2 = true;
+-+ if (strncmp(&nvp->data[nvp->entry], "boardrev", 8) == 0)
+-+ nvp->boardrev_found = true;
+- } else if (!is_nvram_char(c) || c == ' ') {
+- brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n",
+- nvp->line, nvp->column);
+-@@ -284,6 +289,8 @@ static void brcmf_fw_strip_multi_v1(stru
+- while (i < nvp->nvram_len) {
+- if ((nvp->nvram[i] - '0' == id) && (nvp->nvram[i + 1] == ':')) {
+- i += 2;
+-+ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
+-+ nvp->boardrev_found = true;
+- while (nvp->nvram[i] != 0) {
+- nvram[j] = nvp->nvram[i];
+- i++;
+-@@ -335,6 +342,8 @@ static void brcmf_fw_strip_multi_v2(stru
+- while (i < nvp->nvram_len - len) {
+- if (strncmp(&nvp->nvram[i], prefix, len) == 0) {
+- i += len;
+-+ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
+-+ nvp->boardrev_found = true;
+- while (nvp->nvram[i] != 0) {
+- nvram[j] = nvp->nvram[i];
+- i++;
+-@@ -356,6 +365,18 @@ fail:
+- nvp->nvram_len = 0;
+- }
+-
+-+static void brcmf_fw_add_defaults(struct nvram_parser *nvp)
+-+{
+-+ if (nvp->boardrev_found)
+-+ return;
+-+
+-+ memcpy(&nvp->nvram[nvp->nvram_len], &BRCMF_FW_DEFAULT_BOARDREV,
+-+ strlen(BRCMF_FW_DEFAULT_BOARDREV));
+-+ nvp->nvram_len += strlen(BRCMF_FW_DEFAULT_BOARDREV);
+-+ nvp->nvram[nvp->nvram_len] = '\0';
+-+ nvp->nvram_len++;
+-+}
+-+
+- /* brcmf_nvram_strip :Takes a buffer of "<var>=<value>\n" lines read from a fil
+- * and ending in a NUL. Removes carriage returns, empty lines, comment lines,
+- * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
+-@@ -377,16 +398,21 @@ static void *brcmf_fw_nvram_strip(const
+- if (nvp.state == END)
+- break;
+- }
+-- if (nvp.multi_dev_v1)
+-+ if (nvp.multi_dev_v1) {
+-+ nvp.boardrev_found = false;
+- brcmf_fw_strip_multi_v1(&nvp, domain_nr, bus_nr);
+-- else if (nvp.multi_dev_v2)
+-+ } else if (nvp.multi_dev_v2) {
+-+ nvp.boardrev_found = false;
+- brcmf_fw_strip_multi_v2(&nvp, domain_nr, bus_nr);
+-+ }
+-
+- if (nvp.nvram_len == 0) {
+- kfree(nvp.nvram);
+- return NULL;
+- }
+-
+-+ brcmf_fw_add_defaults(&nvp);
+-+
+- pad = nvp.nvram_len;
+- *new_length = roundup(nvp.nvram_len + 1, 4);
+- while (pad != *new_length) {
+diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
+index 7351353..4634283 100644
+--- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
++++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
+@@ -8,7 +8,7 @@
+ + return;
+ +#endif
+ +
+- for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
++ for (band = 0; band < NUM_NL80211_BANDS; band++) {
+ if (!wiphy->bands[band])
+ continue;
+ @@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
+@@ -19,7 +19,7 @@
+ + return;
+ +#endif
+ +
+- sband = wiphy->bands[IEEE80211_BAND_2GHZ];
++ sband = wiphy->bands[NL80211_BAND_2GHZ];
+ if (!sband)
+ return;
+ @@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st
+@@ -30,7 +30,7 @@
+ + return;
+ +#endif
+ +
+- if (!wiphy->bands[IEEE80211_BAND_5GHZ])
++ if (!wiphy->bands[NL80211_BAND_5GHZ])
+ return;
+
+ @@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -59,7 +59,7 @@
+ ---help---
+ --- a/.local-symbols
+ +++ b/.local-symbols
+-@@ -125,6 +125,7 @@ ADM8211=
++@@ -127,6 +127,7 @@ ADM8211=
+ ATH_COMMON=
+ WLAN_VENDOR_ATH=
+ ATH_DEBUG=
+diff --git a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
+index 1a62484..819e64f 100644
+--- a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
++++ b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath9k/init.c
+ +++ b/drivers/net/wireless/ath/ath9k/init.c
+-@@ -722,6 +722,7 @@ static const struct ieee80211_iface_limi
++@@ -728,6 +728,7 @@ static const struct ieee80211_iface_limi
+ BIT(NL80211_IFTYPE_AP) },
+ { .max = 1, .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
+ BIT(NL80211_IFTYPE_P2P_GO) },
+diff --git a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+index a7f9d9f..4b6da97 100644
+--- a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
++++ b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath9k/debug.c
+ +++ b/drivers/net/wireless/ath/ath9k/debug.c
+-@@ -1301,6 +1301,53 @@ void ath9k_deinit_debug(struct ath_softc
++@@ -1319,6 +1319,53 @@ void ath9k_deinit_debug(struct ath_softc
+ ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
+ }
+
+@@ -54,7 +54,7 @@
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+ struct ath_common *common = ath9k_hw_common(ah);
+-@@ -1320,6 +1367,8 @@ int ath9k_init_debug(struct ath_hw *ah)
++@@ -1338,6 +1385,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+ ath9k_tx99_init_debug(sc);
+ ath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
+
+diff --git a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
+index 5892c3e..1825d77 100644
+--- a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
++++ b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath9k/init.c
+ +++ b/drivers/net/wireless/ath/ath9k/init.c
+-@@ -1024,23 +1024,23 @@ static int __init ath9k_init(void)
++@@ -1030,23 +1030,23 @@ static int __init ath9k_init(void)
+ {
+ int error;
+
+diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+index 5ecf528..a105d40 100644
+--- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
++++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath9k/debug.c
+ +++ b/drivers/net/wireless/ath/ath9k/debug.c
+-@@ -1348,6 +1348,52 @@ static const struct file_operations fops
++@@ -1366,6 +1366,52 @@ static const struct file_operations fops
+ .owner = THIS_MODULE
+ };
+
+@@ -53,7 +53,7 @@
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+ struct ath_common *common = ath9k_hw_common(ah);
+-@@ -1369,6 +1415,8 @@ int ath9k_init_debug(struct ath_hw *ah)
++@@ -1387,6 +1433,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+
+ debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+ &fops_eeprom);
+@@ -90,7 +90,7 @@
+ ichan->channel = chan->center_freq;
+ ichan->chan = chan;
+ @@ -308,7 +310,19 @@ static void ath9k_cmn_update_ichannel(st
+- if (chan->band == IEEE80211_BAND_5GHZ)
++ if (chan->band == NL80211_BAND_5GHZ)
+ flags |= CHANNEL_5GHZ;
+
+ - switch (chandef->width) {
+diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
+index c84d1bc..167eeff 100644
+--- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
++++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
+@@ -20,7 +20,7 @@
+ #define AR9160_DEVID_PCI 0x0027
+ --- a/drivers/net/wireless/ath/ath9k/pci.c
+ +++ b/drivers/net/wireless/ath/ath9k/pci.c
+-@@ -751,6 +751,7 @@ static const struct pci_device_id ath_pc
++@@ -761,6 +761,7 @@ static const struct pci_device_id ath_pc
+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
+ #endif
+
+diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
+index e151a12..28f5dcc 100644
+--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
++++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
+@@ -1,6 +1,6 @@
+ --- a/include/net/cfg80211.h
+ +++ b/include/net/cfg80211.h
+-@@ -2363,6 +2363,7 @@ struct cfg80211_qos_map {
++@@ -2406,6 +2406,7 @@ struct cfg80211_qos_map {
+ * (as advertised by the nl80211 feature flag.)
+ * @get_tx_power: store the current TX power into the dbm variable;
+ * return 0 if successful
+@@ -8,7 +8,7 @@
+ *
+ * @set_wds_peer: set the WDS peer for a WDS interface
+ *
+-@@ -2624,6 +2625,7 @@ struct cfg80211_ops {
++@@ -2667,6 +2668,7 @@ struct cfg80211_ops {
+ enum nl80211_tx_power_setting type, int mbm);
+ int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
+ int *dbm);
+@@ -18,7 +18,7 @@
+ const u8 *addr);
+ --- a/include/net/mac80211.h
+ +++ b/include/net/mac80211.h
+-@@ -1286,6 +1286,7 @@ enum ieee80211_smps_mode {
++@@ -1305,6 +1305,7 @@ enum ieee80211_smps_mode {
+ *
+ * @power_level: requested transmit power (in dBm), backward compatibility
+ * value only that is set to the minimum of all interfaces
+@@ -26,7 +26,7 @@
+ *
+ * @chandef: the channel definition to tune to
+ * @radar_enabled: whether radar detection is enabled
+-@@ -1306,6 +1307,7 @@ enum ieee80211_smps_mode {
++@@ -1325,6 +1326,7 @@ enum ieee80211_smps_mode {
+ struct ieee80211_conf {
+ u32 flags;
+ int power_level, dynamic_ps_timeout;
+@@ -36,9 +36,9 @@
+ u8 ps_dtim_period;
+ --- a/include/uapi/linux/nl80211.h
+ +++ b/include/uapi/linux/nl80211.h
+-@@ -1790,6 +1790,9 @@ enum nl80211_commands {
+- * between scans. The scan plans are executed sequentially.
+- * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
++@@ -1819,6 +1819,9 @@ enum nl80211_commands {
++ *
++ * @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment
+ *
+ + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
+ + * transmit power to stay within regulatory limits. u32, dBi.
+@@ -46,9 +46,9 @@
+ * @NUM_NL80211_ATTR: total number of nl80211_attrs available
+ * @NL80211_ATTR_MAX: highest attribute number currently defined
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+-@@ -2164,6 +2167,8 @@ enum nl80211_attrs {
+- NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
+- NL80211_ATTR_SCHED_SCAN_PLANS,
++@@ -2201,6 +2204,8 @@ enum nl80211_attrs {
++
++ NL80211_ATTR_PAD,
+
+ + NL80211_ATTR_WIPHY_ANTENNA_GAIN,
+ +
+@@ -57,7 +57,7 @@
+ __NL80211_ATTR_AFTER_LAST,
+ --- a/net/mac80211/cfg.c
+ +++ b/net/mac80211/cfg.c
+-@@ -2229,6 +2229,19 @@ static int ieee80211_get_tx_power(struct
++@@ -2238,6 +2238,19 @@ static int ieee80211_get_tx_power(struct
+ return 0;
+ }
+
+@@ -77,7 +77,7 @@
+ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *addr)
+ {
+-@@ -3403,6 +3416,7 @@ const struct cfg80211_ops mac80211_confi
++@@ -3412,6 +3425,7 @@ const struct cfg80211_ops mac80211_confi
+ .set_wiphy_params = ieee80211_set_wiphy_params,
+ .set_tx_power = ieee80211_set_tx_power,
+ .get_tx_power = ieee80211_get_tx_power,
+@@ -87,7 +87,7 @@
+ CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
+ --- a/net/mac80211/ieee80211_i.h
+ +++ b/net/mac80211/ieee80211_i.h
+-@@ -1318,6 +1318,7 @@ struct ieee80211_local {
++@@ -1322,6 +1322,7 @@ struct ieee80211_local {
+ int dynamic_ps_forced_timeout;
+
+ int user_power_level; /* in dBm, for all interfaces */
+@@ -119,7 +119,7 @@
+ if (local->hw.conf.power_level != power) {
+ changed |= IEEE80211_CONF_CHANGE_POWER;
+ local->hw.conf.power_level = power;
+-@@ -586,6 +592,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
++@@ -588,6 +594,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+ IEEE80211_RADIOTAP_MCS_HAVE_BW;
+ local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
+ IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
+@@ -129,15 +129,15 @@
+ local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;
+ --- a/net/wireless/nl80211.c
+ +++ b/net/wireless/nl80211.c
+-@@ -403,6 +403,7 @@ static const struct nla_policy nl80211_p
+- [NL80211_ATTR_NETNS_FD] = { .type = NLA_U32 },
+- [NL80211_ATTR_SCHED_SCAN_DELAY] = { .type = NLA_U32 },
+- [NL80211_ATTR_REG_INDOOR] = { .type = NLA_FLAG },
++@@ -406,6 +406,7 @@ static const struct nla_policy nl80211_p
++ [NL80211_ATTR_PBSS] = { .type = NLA_FLAG },
++ [NL80211_ATTR_BSS_SELECT] = { .type = NLA_NESTED },
++ [NL80211_ATTR_STA_SUPPORT_P2P_PS] = { .type = NLA_U8 },
+ + [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
+ };
+
+ /* policy for the key attributes */
+-@@ -2220,6 +2221,20 @@ static int nl80211_set_wiphy(struct sk_b
++@@ -2251,6 +2252,20 @@ static int nl80211_set_wiphy(struct sk_b
+ if (result)
+ return result;
+ }
+diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+index 5a5e464..6001266 100644
+--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
++++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+@@ -1,16 +1,16 @@
+ --- a/drivers/net/wireless/ath/ath9k/ath9k.h
+ +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+-@@ -814,6 +814,9 @@ static inline int ath9k_dump_btcoex(stru
++@@ -813,6 +813,9 @@ static inline int ath9k_dump_btcoex(stru
++ #ifdef CPTCFG_MAC80211_LEDS
+ void ath_init_leds(struct ath_softc *sc);
+ void ath_deinit_leds(struct ath_softc *sc);
+- void ath_fill_led_pin(struct ath_softc *sc);
+ +int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
+-+ const char *trigger, bool active_low);
+++ const char *trigger, bool active_low);
+ +
+ #else
+ static inline void ath_init_leds(struct ath_softc *sc)
+ {
+-@@ -953,6 +956,13 @@ void ath_ant_comb_scan(struct ath_softc
++@@ -949,6 +952,13 @@ void ath_ant_comb_scan(struct ath_softc
+
+ #define ATH9K_NUM_CHANCTX 2 /* supports 2 operating channels */
+
+@@ -24,7 +24,7 @@
+ struct ath_softc {
+ struct ieee80211_hw *hw;
+ struct device *dev;
+-@@ -1005,9 +1015,8 @@ struct ath_softc {
++@@ -1001,9 +1011,8 @@ struct ath_softc {
+ spinlock_t chan_lock;
+
+ #ifdef CPTCFG_MAC80211_LEDS
+@@ -38,24 +38,33 @@
+ #ifdef CPTCFG_ATH9K_DEBUGFS
+ --- a/drivers/net/wireless/ath/ath9k/gpio.c
+ +++ b/drivers/net/wireless/ath/ath9k/gpio.c
+-@@ -24,45 +24,102 @@
+- static void ath_led_brightness(struct led_classdev *led_cdev,
+- enum led_brightness brightness)
++@@ -22,7 +22,7 @@
++
++ #ifdef CPTCFG_MAC80211_LEDS
++
++-void ath_fill_led_pin(struct ath_softc *sc)
+++static void ath_fill_led_pin(struct ath_softc *sc)
+ {
+-- struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
+-- u32 val = (brightness == LED_OFF);
++ struct ath_hw *ah = sc->sc_ah;
++
++@@ -39,61 +39,111 @@ void ath_fill_led_pin(struct ath_softc *
++ else
++ ah->led_pin = ATH_LED_PIN_DEF;
++ }
+++}
+++
+++static void ath_led_brightness(struct led_classdev *led_cdev,
+++ enum led_brightness brightness)
+++{
+ + struct ath_led *led = container_of(led_cdev, struct ath_led, cdev);
+ + struct ath_softc *sc = led->sc;
+-
+-- if (sc->sc_ah->config.led_active_high)
+-- val = !val;
+++
+ + ath9k_ps_wakeup(sc);
+ + ath9k_hw_set_gpio(sc->sc_ah, led->gpio->gpio,
+ + (brightness != LED_OFF) ^ led->gpio->active_low);
+ + ath9k_ps_restore(sc);
+ +}
+-
+-- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
+++
+ +static int ath_add_led(struct ath_softc *sc, struct ath_led *led)
+ +{
+ + const struct gpio_led *gpio = led->gpio;
+@@ -71,30 +80,40 @@
+ +
+ + led->sc = sc;
+ + list_add(&led->list, &sc->leds);
+-+
+-+ /* Configure gpio for output */
+-+ ath9k_hw_cfg_output(sc->sc_ah, gpio->gpio,
+-+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+-+
++
++ /* Configure gpio for output */
++- ath9k_hw_gpio_request_out(ah, ah->led_pin, "ath9k-led",
+++ ath9k_hw_gpio_request_out(sc->sc_ah, gpio->gpio, gpio->name,
++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
++
++- /* LED off, active low */
++- ath9k_hw_set_gpio(ah, ah->led_pin, ah->config.led_active_high ? 0 : 1);
+ + /* LED off */
+ + ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
+ +
+ + return 0;
+-+}
+-+
++ }
++
++-static void ath_led_brightness(struct led_classdev *led_cdev,
++- enum led_brightness brightness)
+ +int ath_create_gpio_led(struct ath_softc *sc, int gpio_num, const char *name,
+ + const char *trigger, bool active_low)
+-+{
++ {
++- struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
++- u32 val = (brightness == LED_OFF);
+ + struct ath_led *led;
+ + struct gpio_led *gpio;
+ + char *_name;
+ + int ret;
+-+
++
++- if (sc->sc_ah->config.led_active_high)
++- val = !val;
+ + led = kzalloc(sizeof(*led) + sizeof(*gpio) + strlen(name) + 1,
+ + GFP_KERNEL);
+ + if (!led)
+ + return -ENOMEM;
+-+
++
++- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
+ + led->gpio = gpio = (struct gpio_led *) (led + 1);
+ + _name = (char *) (led->gpio + 1);
+ +
+@@ -115,15 +134,18 @@
+ {
+ - if (!sc->led_registered)
+ - return;
+-+ struct ath_led *led;
+-
++-
+ - ath_led_brightness(&sc->led_cdev, LED_OFF);
+ - led_classdev_unregister(&sc->led_cdev);
+++ struct ath_led *led;
++
++- ath9k_hw_gpio_free(sc->sc_ah, sc->sc_ah->led_pin);
+ + while (!list_empty(&sc->leds)) {
+ + led = list_first_entry(&sc->leds, struct ath_led, list);
+ + list_del(&led->list);
+ + ath_led_brightness(&led->cdev, LED_OFF);
+ + led_classdev_unregister(&led->cdev);
+++ ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
+ + kfree(led);
+ + }
+ }
+@@ -139,6 +161,8 @@
+ if (AR_SREV_9100(sc->sc_ah))
+ return;
+
++ ath_fill_led_pin(sc);
++
+ - if (!ath9k_led_blink)
+ - sc->led_cdev.default_trigger =
+ - ieee80211_get_radio_led_name(sc->hw);
+@@ -159,13 +183,14 @@
+ + trigger = ieee80211_get_radio_led_name(sc->hw);
+
+ - sc->led_registered = true;
+-+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high);
+++ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
+++ !sc->sc_ah->config.led_active_high);
+ }
++ #endif
+
+- void ath_fill_led_pin(struct ath_softc *sc)
+ --- a/drivers/net/wireless/ath/ath9k/init.c
+ +++ b/drivers/net/wireless/ath/ath9k/init.c
+-@@ -936,7 +936,7 @@ int ath9k_init_device(u16 devid, struct
++@@ -942,7 +942,7 @@ int ath9k_init_device(u16 devid, struct
+
+ #ifdef CPTCFG_MAC80211_LEDS
+ /* must be initialized before ieee80211_register_hw */
+@@ -176,7 +201,7 @@
+ #endif
+ --- a/drivers/net/wireless/ath/ath9k/debug.c
+ +++ b/drivers/net/wireless/ath/ath9k/debug.c
+-@@ -1393,6 +1393,61 @@ static const struct file_operations fops
++@@ -1411,6 +1411,61 @@ static const struct file_operations fops
+ .llseek = default_llseek,
+ };
+
+@@ -238,7 +263,7 @@
+
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+-@@ -1417,6 +1472,10 @@ int ath9k_init_debug(struct ath_hw *ah)
++@@ -1435,6 +1490,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+ &fops_eeprom);
+ debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+ sc, &fops_chanbw);
+diff --git a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
+index 7c10ea6..f656697 100644
+--- a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
++++ b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
+@@ -1,6 +1,6 @@
+ --- a/include/linux/ath9k_platform.h
+ +++ b/include/linux/ath9k_platform.h
+-@@ -41,6 +41,9 @@ struct ath9k_platform_data {
++@@ -45,6 +45,9 @@ struct ath9k_platform_data {
+ int (*external_reset)(void);
+
+ bool use_eeprom;
+@@ -20,7 +20,7 @@
+
+ /********************************/
+ /* LED functions */
+-@@ -88,6 +89,24 @@ int ath_create_gpio_led(struct ath_softc
++@@ -108,6 +109,24 @@ int ath_create_gpio_led(struct ath_softc
+ return ret;
+ }
+
+@@ -45,7 +45,7 @@
+ void ath_deinit_leds(struct ath_softc *sc)
+ {
+ struct ath_led *led;
+-@@ -103,8 +122,10 @@ void ath_deinit_leds(struct ath_softc *s
++@@ -124,8 +143,10 @@ void ath_deinit_leds(struct ath_softc *s
+
+ void ath_init_leds(struct ath_softc *sc)
+ {
+@@ -56,10 +56,10 @@
+
+ INIT_LIST_HEAD(&sc->leds);
+
+-@@ -120,6 +141,12 @@ void ath_init_leds(struct ath_softc *sc)
+- trigger = ieee80211_get_radio_led_name(sc->hw);
++@@ -144,6 +165,12 @@ void ath_init_leds(struct ath_softc *sc)
+
+- ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high);
++ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
++ !sc->sc_ah->config.led_active_high);
+ +
+ + if (!pdata)
+ + return;
+@@ -67,5 +67,5 @@
+ + for (i = 0; i < pdata->num_leds; i++)
+ + ath_create_platform_led(sc, &pdata->leds[i]);
+ }
++ #endif
+
+- void ath_fill_led_pin(struct ath_softc *sc)
+diff --git a/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch b/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
+index 6d62a2b..986f155 100644
+--- a/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
++++ b/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
+@@ -1,6 +1,6 @@
+ --- a/include/linux/ath9k_platform.h
+ +++ b/include/linux/ath9k_platform.h
+-@@ -36,6 +36,7 @@ struct ath9k_platform_data {
++@@ -40,6 +40,7 @@ struct ath9k_platform_data {
+ bool tx_gain_buffalo;
+ bool disable_2ghz;
+ bool disable_5ghz;
+@@ -10,7 +10,7 @@
+ int (*external_reset)(void);
+ --- a/drivers/net/wireless/ath/ath9k/init.c
+ +++ b/drivers/net/wireless/ath/ath9k/init.c
+-@@ -577,6 +577,7 @@ static int ath9k_init_softc(u16 devid, s
++@@ -581,6 +581,7 @@ static int ath9k_init_softc(u16 devid, s
+ ah->external_reset = pdata->external_reset;
+ ah->disable_2ghz = pdata->disable_2ghz;
+ ah->disable_5ghz = pdata->disable_5ghz;
+diff --git a/package/kernel/mac80211/patches/533-mac80211_correct_4addr_skbsize.patch b/package/kernel/mac80211/patches/533-mac80211_correct_4addr_skbsize.patch
+new file mode 100644
+index 0000000..afd8cca
+--- /dev/null
++++ b/package/kernel/mac80211/patches/533-mac80211_correct_4addr_skbsize.patch
+@@ -0,0 +1,11 @@
++--- a/net/wireless/util.c
+++++ b/net/wireless/util.c
++@@ -509,7 +509,7 @@ static int __ieee80211_data_to_8023(stru
++ * replace EtherType */
++ hdrlen += ETH_ALEN + 2;
++ else
++- tmp.h_proto = htons(skb->len);
+++ tmp.h_proto = htons(skb->len - hdrlen);
++
++ pskb_pull(skb, hdrlen);
++
+diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
+index e83c6bf..f4bb0f2 100644
+--- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
++++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath9k/debug.c
+ +++ b/drivers/net/wireless/ath/ath9k/debug.c
+-@@ -1449,6 +1449,50 @@ static const struct file_operations fops
++@@ -1467,6 +1467,50 @@ static const struct file_operations fops
+ #endif
+
+
+@@ -51,7 +51,7 @@
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+ struct ath_common *common = ath9k_hw_common(ah);
+-@@ -1476,6 +1520,8 @@ int ath9k_init_debug(struct ath_hw *ah)
++@@ -1494,6 +1538,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+ debugfs_create_file("gpio_led", S_IWUSR,
+ sc->debug.debugfs_phy, sc, &fops_gpio_led);
+ #endif
+@@ -62,7 +62,7 @@
+ debugfs_create_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy,
+ --- a/drivers/net/wireless/ath/ath9k/hw.h
+ +++ b/drivers/net/wireless/ath/ath9k/hw.h
+-@@ -519,6 +519,12 @@ enum {
++@@ -520,6 +520,12 @@ enum {
+ ATH9K_RESET_COLD,
+ };
+
+@@ -75,7 +75,7 @@
+ struct ath9k_hw_version {
+ u32 magic;
+ u16 devid;
+-@@ -804,6 +810,8 @@ struct ath_hw {
++@@ -805,6 +811,8 @@ struct ath_hw {
+ u32 rfkill_polarity;
+ u32 ah_flags;
+
+@@ -84,7 +84,7 @@
+ bool reset_power_on;
+ bool htc_reset_init;
+
+-@@ -1066,6 +1074,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
++@@ -1067,6 +1075,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
+ bool ath9k_hw_check_alive(struct ath_hw *ah);
+
+ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
+@@ -94,7 +94,7 @@
+ struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
+ --- a/drivers/net/wireless/ath/ath9k/hw.c
+ +++ b/drivers/net/wireless/ath/ath9k/hw.c
+-@@ -1819,6 +1819,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
++@@ -1821,6 +1821,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
+ }
+ EXPORT_SYMBOL(ath9k_hw_get_tsf_offset);
+
+@@ -115,7 +115,7 @@
+ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
+ struct ath9k_hw_cal_data *caldata, bool fastcc)
+ {
+-@@ -2027,6 +2041,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
++@@ -2029,6 +2043,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ ar9003_hw_disable_phy_restart(ah);
+
+ ath9k_hw_apply_gpio_override(ah);
+diff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
+index d7bb5a1..7da7165 100644
+--- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
++++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath9k/hw.h
+ +++ b/drivers/net/wireless/ath/ath9k/hw.h
+-@@ -720,6 +720,7 @@ struct ath_spec_scan {
++@@ -721,6 +721,7 @@ struct ath_spec_scan {
+ * @config_pci_powersave:
+ * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
+ *
+@@ -8,7 +8,7 @@
+ * @spectral_scan_config: set parameters for spectral scan and enable/disable it
+ * @spectral_scan_trigger: trigger a spectral scan run
+ * @spectral_scan_wait: wait for a spectral scan run to finish
+-@@ -742,6 +743,7 @@ struct ath_hw_ops {
++@@ -743,6 +744,7 @@ struct ath_hw_ops {
+ struct ath_hw_antcomb_conf *antconf);
+ void (*antdiv_comb_conf_set)(struct ath_hw *ah,
+ struct ath_hw_antcomb_conf *antconf);
+@@ -18,7 +18,7 @@
+ void (*spectral_scan_trigger)(struct ath_hw *ah);
+ --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+ +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+-@@ -1998,6 +1998,26 @@ void ar9003_hw_init_rate_txpower(struct
++@@ -1945,6 +1945,26 @@ void ar9003_hw_init_rate_txpower(struct
+ }
+ }
+
+@@ -45,7 +45,7 @@
+ void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
+ {
+ struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
+-@@ -2034,6 +2054,7 @@ void ar9003_hw_attach_phy_ops(struct ath
++@@ -1981,6 +2001,7 @@ void ar9003_hw_attach_phy_ops(struct ath
+ priv_ops->set_radar_params = ar9003_hw_set_radar_params;
+ priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;
+
+@@ -55,9 +55,9 @@
+ ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
+ --- a/drivers/net/wireless/ath/ath9k/init.c
+ +++ b/drivers/net/wireless/ath/ath9k/init.c
+-@@ -711,7 +711,8 @@ static void ath9k_init_txpower_limits(st
++@@ -717,7 +717,8 @@ static void ath9k_init_txpower_limits(st
+ if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
+- ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
++ ath9k_init_band_txpower(sc, NL80211_BAND_5GHZ);
+
+ - ah->curchan = curchan;
+ + if (curchan)
+@@ -65,7 +65,7 @@
+ }
+
+ static const struct ieee80211_iface_limit if_limits[] = {
+-@@ -897,6 +898,18 @@ static void ath9k_set_hw_capab(struct at
++@@ -903,6 +904,18 @@ static void ath9k_set_hw_capab(struct at
+ SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
+ }
+
+@@ -84,7 +84,7 @@
+ int ath9k_init_device(u16 devid, struct ath_softc *sc,
+ const struct ath_bus_ops *bus_ops)
+ {
+-@@ -942,6 +955,8 @@ int ath9k_init_device(u16 devid, struct
++@@ -948,6 +961,8 @@ int ath9k_init_device(u16 devid, struct
+ ARRAY_SIZE(ath9k_tpt_blink));
+ #endif
+
+@@ -110,7 +110,7 @@
+ static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
+ --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+ +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+-@@ -1327,9 +1327,30 @@ void ar5008_hw_init_rate_txpower(struct
++@@ -1325,9 +1325,30 @@ void ar5008_hw_init_rate_txpower(struct
+ }
+ }
+
+@@ -141,7 +141,7 @@
+ static const u32 ar5416_cca_regs[6] = {
+ AR_PHY_CCA,
+ AR_PHY_CH1_CCA,
+-@@ -1344,6 +1365,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
++@@ -1342,6 +1363,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
+ if (ret)
+ return ret;
+
+diff --git a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
+index 8768c5d..9462fca 100644
+--- a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
++++ b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
+@@ -40,7 +40,7 @@
+ return true;
+ }
+
+-@@ -1797,8 +1816,14 @@ static int ath9k_hw_do_fastcc(struct ath
++@@ -1799,8 +1818,14 @@ static int ath9k_hw_do_fastcc(struct ath
+ if (AR_SREV_9271(ah))
+ ar9002_hw_load_ani_reg(ah, chan);
+
+@@ -55,7 +55,7 @@
+ return -EINVAL;
+ }
+
+-@@ -2052,6 +2077,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
++@@ -2054,6 +2079,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ ath9k_hw_set_radar_params(ah);
+ }
+
+diff --git a/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch b/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
+index 3d24ccd..b639f97 100644
+--- a/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
++++ b/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+ +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+-@@ -956,55 +956,6 @@ static bool ar5008_hw_ani_control_new(st
++@@ -954,55 +954,6 @@ static bool ar5008_hw_ani_control_new(st
+ * on == 0 means more noise imm
+ */
+ u32 on = param ? 1 : 0;
+@@ -58,7 +58,7 @@
+ REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
+ --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+ +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+-@@ -41,20 +41,6 @@ static const int cycpwrThr1_table[] =
++@@ -42,20 +42,6 @@ static const int cycpwrThr1_table[] =
+ /* level: 0 1 2 3 4 5 6 7 8 */
+ { -6, -4, -2, 0, 2, 4, 6, 8 }; /* lvl 0-7, default 3 */
+
+@@ -79,7 +79,7 @@
+ static const u8 ofdm2pwr[] = {
+ ALL_TARGET_LEGACY_6_24,
+ ALL_TARGET_LEGACY_6_24,
+-@@ -1089,11 +1075,6 @@ static bool ar9003_hw_ani_control(struct
++@@ -1095,11 +1081,6 @@ static bool ar9003_hw_ani_control(struct
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ath9k_channel *chan = ah->curchan;
+ struct ar5416AniState *aniState = &ah->ani;
+@@ -91,7 +91,7 @@
+ s32 value, value2;
+
+ switch (cmd & ah->ani_function) {
+-@@ -1107,61 +1088,6 @@ static bool ar9003_hw_ani_control(struct
++@@ -1113,61 +1094,6 @@ static bool ar9003_hw_ani_control(struct
+ */
+ u32 on = param ? 1 : 0;
+
+diff --git a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
+new file mode 100644
+index 0000000..ced72c6
+--- /dev/null
++++ b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
+@@ -0,0 +1,39 @@
++From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++Date: Sun, 31 Jan 2016 20:45:57 +0100
++Subject: [PATCH v4 1/8] mac80211: ath9k: enable platform WLAN LED name
++
++Enable platform-supplied WLAN LED name for ath9k device. It replaces generic
++'ath9k-phy*' label with string set during platform initialization.
++
++Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++---
++ drivers/net/wireless/ath/ath9k/gpio.c | 10 +++++++---
++ include/linux/ath9k_platform.h | 1 +
++ 2 files changed, 8 insertions(+), 3 deletions(-)
++
++--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++++ b/drivers/net/wireless/ath/ath9k/gpio.c
++@@ -155,8 +155,11 @@ void ath_init_leds(struct ath_softc *sc)
++
++ ath_fill_led_pin(sc);
++
++- snprintf(led_name, sizeof(led_name), "ath9k-%s",
++- wiphy_name(sc->hw->wiphy));
+++ if (pdata && pdata->led_name)
+++ strncpy(led_name, pdata->led_name, sizeof(led_name));
+++ else
+++ snprintf(led_name, sizeof(led_name), "ath9k-%s",
+++ wiphy_name(sc->hw->wiphy));
++
++ if (ath9k_led_blink)
++ trigger = sc->led_default_trigger;
++--- a/include/linux/ath9k_platform.h
+++++ b/include/linux/ath9k_platform.h
++@@ -49,6 +49,7 @@ struct ath9k_platform_data {
++
++ int num_leds;
++ const struct gpio_led *leds;
+++ const char *led_name;
++ };
++
++ #endif /* _LINUX_ATH9K_PLATFORM_H */
+diff --git a/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
+new file mode 100644
+index 0000000..5d84cf0
+--- /dev/null
++++ b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
+@@ -0,0 +1,29 @@
++From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++Date: Sun, 31 Jan 2016 20:48:49 +0100
++Subject: [PATCH v4 2/8] mac80211: ath9k: set default state for platform LEDs
++
++Support default state for platform LEDs connected to ath9k device.
++Now LEDs are correctly set on or off at ath9k module initialization.
++Very useful if power LED is connected to wireless chip.
++
++Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++---
++ gpio.c | 7 +++++--
++ 1 file changed, 5 insertions(+), 2 deletions(-)
++
++--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++++ b/drivers/net/wireless/ath/ath9k/gpio.c
++@@ -74,8 +74,11 @@ static int ath_add_led(struct ath_softc
++ ath9k_hw_gpio_request_out(sc->sc_ah, gpio->gpio, gpio->name,
++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
++
++- /* LED off */
++- ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
+++ /* Set default LED state */
+++ if (gpio->default_state == LEDS_GPIO_DEFSTATE_ON)
+++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, !gpio->active_low);
+++ else
+++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
++
++ return 0;
++ }
+diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+new file mode 100644
+index 0000000..1c89e42
+--- /dev/null
++++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+@@ -0,0 +1,237 @@
++From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++Date: Sun, 31 Jan 2016 21:01:31 +0100
++Subject: [PATCH v4 4/8] mac80211: ath9k: enable access to GPIO
++
++Enable access to GPIO chip and its pins for Atheros AR92xx
++wireless devices. For now AR9285 and AR9287 are supported.
++
++Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
++@@ -24,6 +24,7 @@
++ #include <linux/completion.h>
++ #include <linux/time.h>
++ #include <linux/hw_random.h>
+++#include <linux/gpio/driver.h>
++
++ #include "common.h"
++ #include "debug.h"
++@@ -959,6 +960,14 @@ struct ath_led {
++ struct led_classdev cdev;
++ };
++
+++#ifdef CONFIG_GPIOLIB
+++struct ath9k_gpio_chip {
+++ struct ath_softc *sc;
+++ char label[32];
+++ struct gpio_chip gchip;
+++};
+++#endif
+++
++ struct ath_softc {
++ struct ieee80211_hw *hw;
++ struct device *dev;
++@@ -1013,6 +1022,9 @@ struct ath_softc {
++ #ifdef CPTCFG_MAC80211_LEDS
++ const char *led_default_trigger;
++ struct list_head leds;
+++#ifdef CONFIG_GPIOLIB
+++ struct ath9k_gpio_chip *gpiochip;
+++#endif
++ #endif
++
++ #ifdef CPTCFG_ATH9K_DEBUGFS
++--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++++ b/drivers/net/wireless/ath/ath9k/gpio.c
++@@ -16,13 +16,138 @@
++
++ #include "ath9k.h"
++ #include <linux/ath9k_platform.h>
+++#include <linux/gpio.h>
+++
+++#ifdef CPTCFG_MAC80211_LEDS
+++
+++#ifdef CONFIG_GPIOLIB
+++
+++/***************/
+++/* GPIO Chip */
+++/***************/
+++
+++/* gpio_chip handler : set GPIO to input */
+++static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
+++{
+++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
+++ gchip);
+++
+++ ath9k_hw_gpio_request_in(gc->sc->sc_ah, offset, "ath9k-gpio");
+++
+++ return 0;
+++}
+++
+++/* gpio_chip handler : set GPIO to output */
+++static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
+++ int value)
+++{
+++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
+++ gchip);
+++
+++ ath9k_hw_gpio_request_out(gc->sc->sc_ah, offset, "ath9k-gpio",
+++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
+++
+++ return 0;
+++}
+++
+++/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
+++static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
+++{
+++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
+++ gchip);
+++ struct ath_hw *ah = gc->sc->sc_ah;
+++
+++ return !((REG_READ(ah, AR_GPIO_OE_OUT) >> (offset * 2)) & 3);
+++}
+++
+++/* gpio_chip handler : get GPIO pin value */
+++static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
+++{
+++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
+++ gchip);
+++
+++ return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
+++}
+++
+++/* gpio_chip handler : set GPIO pin to value */
+++static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
+++ int value)
+++{
+++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
+++ gchip);
+++
+++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
+++}
+++
+++/* register GPIO chip */
+++static void ath9k_register_gpio_chip(struct ath_softc *sc)
+++{
+++ struct ath9k_gpio_chip *gc;
+++ u16 ng;
+++
+++ /* for now only AR9285 and AR9287 are recognized */
+++ if (AR_SREV_9287(sc->sc_ah))
+++ ng = AR9287_NUM_GPIO;
+++ else if (AR_SREV_9285(sc->sc_ah))
+++ ng = AR9285_NUM_GPIO;
+++ else
+++ return;
+++
+++ gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
+++ if (!gc)
+++ return;
+++
+++ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
+++ wiphy_name(sc->hw->wiphy));
+++ gc->gchip.label = gc->label;
+++ gc->gchip.base = -1; /* determine base automatically */
+++ gc->gchip.ngpio = ng;
+++ gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
+++ gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
+++ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
+++ gc->gchip.get = ath9k_gpio_pin_get;
+++ gc->gchip.set = ath9k_gpio_pin_set;
+++ gc->gchip.owner = THIS_MODULE;
+++
+++ if (gpiochip_add(&gc->gchip)) {
+++ kfree(gc);
+++ return;
+++ }
+++
+++ sc->gpiochip = gc;
+++ gc->sc = sc;
+++}
+++
+++/* remove GPIO chip */
+++static void ath9k_unregister_gpio_chip(struct ath_softc *sc)
+++{
+++ struct ath9k_gpio_chip *gc = sc->gpiochip;
+++
+++ if (!gc)
+++ return;
+++
+++ gpiochip_remove(&gc->gchip);
+++ kfree(gc);
+++ sc->gpiochip = NULL;
+++}
+++
+++#else /* CONFIG_GPIOLIB */
+++
+++static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
+++{
+++}
+++
+++static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
+++{
+++}
+++
+++#endif /* CONFIG_GPIOLIB */
++
++ /********************************/
++ /* LED functions */
++ /********************************/
++
++-#ifdef CPTCFG_MAC80211_LEDS
++-
++ static void ath_fill_led_pin(struct ath_softc *sc)
++ {
++ struct ath_hw *ah = sc->sc_ah;
++@@ -80,6 +205,12 @@ static int ath_add_led(struct ath_softc
++ else
++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
++
+++#ifdef CONFIG_GPIOLIB
+++ /* If there is GPIO chip configured, reserve LED pin */
+++ if (sc->gpiochip)
+++ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
+++#endif
+++
++ return 0;
++ }
++
++@@ -136,12 +267,18 @@ void ath_deinit_leds(struct ath_softc *s
++
++ while (!list_empty(&sc->leds)) {
++ led = list_first_entry(&sc->leds, struct ath_led, list);
+++#ifdef CONFIG_GPIOLIB
+++ /* If there is GPIO chip configured, free LED pin */
+++ if (sc->gpiochip)
+++ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
+++#endif
++ list_del(&led->list);
++ ath_led_brightness(&led->cdev, LED_OFF);
++ led_classdev_unregister(&led->cdev);
++ ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
++ kfree(led);
++ }
+++ ath9k_unregister_gpio_chip(sc);
++ }
++
++ void ath_init_leds(struct ath_softc *sc)
++@@ -158,6 +295,8 @@ void ath_init_leds(struct ath_softc *sc)
++
++ ath_fill_led_pin(sc);
++
+++ ath9k_register_gpio_chip(sc);
+++
++ if (pdata && pdata->led_name)
++ strncpy(led_name, pdata->led_name, sizeof(led_name));
++ else
++@@ -178,6 +317,7 @@ void ath_init_leds(struct ath_softc *sc)
++ for (i = 0; i < pdata->num_leds; i++)
++ ath_create_platform_led(sc, &pdata->leds[i]);
++ }
+++
++ #endif
++
++ /*******************/
+diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
+new file mode 100644
+index 0000000..c7973bb
+--- /dev/null
++++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
+@@ -0,0 +1,149 @@
++From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++Subject: [PATCH v5 5/8] mac80211: ath9k: enable GPIO buttons
++
++Enable platform-defined GPIO button support for ath9k device.
++Key poller is activated for attached platform buttons.
++Requires ath9k GPIO chip access.
++
++Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
++@@ -1024,6 +1024,7 @@ struct ath_softc {
++ struct list_head leds;
++ #ifdef CONFIG_GPIOLIB
++ struct ath9k_gpio_chip *gpiochip;
+++ struct platform_device *btnpdev; /* gpio-keys-polled */
++ #endif
++ #endif
++
++--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++++ b/drivers/net/wireless/ath/ath9k/gpio.c
++@@ -17,6 +17,8 @@
++ #include "ath9k.h"
++ #include <linux/ath9k_platform.h>
++ #include <linux/gpio.h>
+++#include <linux/platform_device.h>
+++#include <linux/gpio_keys.h>
++
++ #ifdef CPTCFG_MAC80211_LEDS
++
++@@ -132,6 +134,64 @@ static void ath9k_unregister_gpio_chip(s
++ sc->gpiochip = NULL;
++ }
++
+++/******************/
+++/* GPIO Buttons */
+++/******************/
+++
+++/* add GPIO buttons */
+++static void ath9k_init_buttons(struct ath_softc *sc)
+++{
+++ struct ath9k_platform_data *pdata = sc->dev->platform_data;
+++ struct platform_device *pdev;
+++ struct gpio_keys_platform_data gkpdata;
+++ struct gpio_keys_button *bt;
+++ int i;
+++
+++ if (!sc->gpiochip)
+++ return;
+++
+++ if (!pdata || !pdata->btns || !pdata->num_btns)
+++ return;
+++
+++ bt = devm_kmemdup(sc->dev, pdata->btns,
+++ pdata->num_btns * sizeof(struct gpio_keys_button),
+++ GFP_KERNEL);
+++ if (!bt)
+++ return;
+++
+++ for (i = 0; i < pdata->num_btns; i++) {
+++ ath9k_hw_gpio_request_in(sc->sc_ah, pdata->btns[i].gpio,
+++ "ath9k-gpio");
+++ bt[i].gpio = sc->gpiochip->gchip.base + pdata->btns[i].gpio;
+++ }
+++
+++ memset(&gkpdata, 0, sizeof(struct gpio_keys_platform_data));
+++ gkpdata.buttons = bt;
+++ gkpdata.nbuttons = pdata->num_btns;
+++ gkpdata.poll_interval = pdata->btn_poll_interval;
+++
+++ pdev = platform_device_register_data(sc->dev, "gpio-keys-polled",
+++ PLATFORM_DEVID_AUTO, &gkpdata,
+++ sizeof(gkpdata));
+++ if (!IS_ERR_OR_NULL(pdev))
+++ sc->btnpdev = pdev;
+++ else {
+++ sc->btnpdev = NULL;
+++ devm_kfree(sc->dev, bt);
+++ }
+++}
+++
+++/* remove GPIO buttons */
+++static void ath9k_deinit_buttons(struct ath_softc *sc)
+++{
+++ if (!sc->gpiochip || !sc->btnpdev)
+++ return;
+++
+++ platform_device_unregister(sc->btnpdev);
+++
+++ sc->btnpdev = NULL;
+++}
+++
++ #else /* CONFIG_GPIOLIB */
++
++ static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
++@@ -142,6 +202,14 @@ static inline void ath9k_unregister_gpio
++ {
++ }
++
+++static inline void ath9k_init_buttons(struct ath_softc *sc)
+++{
+++}
+++
+++static inline void ath9k_deinit_buttons(struct ath_softc *sc)
+++{
+++}
+++
++ #endif /* CONFIG_GPIOLIB */
++
++ /********************************/
++@@ -265,6 +333,7 @@ void ath_deinit_leds(struct ath_softc *s
++ {
++ struct ath_led *led;
++
+++ ath9k_deinit_buttons(sc);
++ while (!list_empty(&sc->leds)) {
++ led = list_first_entry(&sc->leds, struct ath_led, list);
++ #ifdef CONFIG_GPIOLIB
++@@ -296,6 +365,7 @@ void ath_init_leds(struct ath_softc *sc)
++ ath_fill_led_pin(sc);
++
++ ath9k_register_gpio_chip(sc);
+++ ath9k_init_buttons(sc);
++
++ if (pdata && pdata->led_name)
++ strncpy(led_name, pdata->led_name, sizeof(led_name));
++@@ -311,7 +381,7 @@ void ath_init_leds(struct ath_softc *sc)
++ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
++ !sc->sc_ah->config.led_active_high);
++
++- if (!pdata)
+++ if (!pdata || !pdata->leds || !pdata->num_leds)
++ return;
++
++ for (i = 0; i < pdata->num_leds; i++)
++--- a/include/linux/ath9k_platform.h
+++++ b/include/linux/ath9k_platform.h
++@@ -50,6 +50,10 @@ struct ath9k_platform_data {
++ int num_leds;
++ const struct gpio_led *leds;
++ const char *led_name;
+++
+++ unsigned num_btns;
+++ const struct gpio_keys_button *btns;
+++ unsigned btn_poll_interval;
++ };
++
++ #endif /* _LINUX_ATH9K_PLATFORM_H */
+diff --git a/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch b/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch
+new file mode 100644
+index 0000000..22e2c66
+--- /dev/null
++++ b/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch
+@@ -0,0 +1,27 @@
++From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++Date: Thu, 21 Apr 2016 23:00:54 +0200
++Subject: [PATCH] mac80211: ath9k: add GPIO support for AR9280 chip
++
++Enable access to GPIO on Atheros wireless chip AR9280.
++Support for 9280 is added to existing 9285/9287 subsystem
++because these 3 chips differ only in number of GPIO pins.
++
++Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
++---
++--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++++ b/drivers/net/wireless/ath/ath9k/gpio.c
++@@ -88,11 +88,13 @@ static void ath9k_register_gpio_chip(str
++ struct ath9k_gpio_chip *gc;
++ u16 ng;
++
++- /* for now only AR9285 and AR9287 are recognized */
+++ /* supported chips are AR9280, AR9285 and AR9287 */
++ if (AR_SREV_9287(sc->sc_ah))
++ ng = AR9287_NUM_GPIO;
++ else if (AR_SREV_9285(sc->sc_ah))
++ ng = AR9285_NUM_GPIO;
+++ else if (AR_SREV_9280(sc->sc_ah))
+++ ng = AR9280_NUM_GPIO;
++ else
++ return;
++
+diff --git a/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch b/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
+index 8245909..db70a33 100644
+--- a/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
++++ b/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
+@@ -24,7 +24,7 @@ Changes since v1:
+
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+-@@ -7722,6 +7722,7 @@ static int rt2800_probe_rt(struct rt2x00
++@@ -7726,6 +7726,7 @@ static int rt2800_probe_rt(struct rt2x00
+
+ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
+ {
+@@ -32,7 +32,7 @@ Changes since v1:
+ int retval;
+ u32 reg;
+
+-@@ -7729,6 +7730,9 @@ int rt2800_probe_hw(struct rt2x00_dev *r
++@@ -7733,6 +7734,9 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+ if (retval)
+ return retval;
+
+diff --git a/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch b/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
+index 7abfcd1..a3b62bc 100644
+--- a/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
++++ b/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
+@@ -239,7 +239,7 @@ Changes since v1: ---
+ msleep(1);
+
+ /*
+-@@ -7726,6 +7774,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
++@@ -7730,6 +7778,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+ int retval;
+ u32 reg;
+
+@@ -248,7 +248,7 @@ Changes since v1: ---
+ retval = rt2800_probe_rt(rt2x00dev);
+ if (retval)
+ return retval;
+-@@ -7809,8 +7859,11 @@ void rt2800_get_key_seq(struct ieee80211
++@@ -7813,8 +7863,11 @@ void rt2800_get_key_seq(struct ieee80211
+ return;
+
+ offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
+diff --git a/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch b/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
+index 02b2acf..f41a160 100644
+--- a/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
++++ b/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
+@@ -41,7 +41,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+ rt2800_clear_beacon_register(rt2x00dev, i);
+
+ if (rt2x00_is_usb(rt2x00dev)) {
+-@@ -7827,6 +7828,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
++@@ -7831,6 +7832,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+ if (rt2x00_rt(rt2x00dev, RT3593))
+ __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
+
+diff --git a/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch b/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
+index e909272..5099c64 100644
+--- a/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
++++ b/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
+@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+-@@ -7852,7 +7852,10 @@ int rt2800_probe_hw(struct rt2x00_dev *r
++@@ -7856,7 +7856,10 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+ if (rt2x00_rt(rt2x00dev, RT3593))
+ __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
+
+diff --git a/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch b/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
+index 7fe38e0..a2e7015 100644
+--- a/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
++++ b/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
+@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+-@@ -7822,6 +7822,7 @@ static int rt2800_probe_rt(struct rt2x00
++@@ -7826,6 +7826,7 @@ static int rt2800_probe_rt(struct rt2x00
+ case RT3390:
+ case RT3572:
+ case RT3593:
+diff --git a/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch b/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
+index 253a0c0..89bd0ac 100644
+--- a/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
++++ b/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
+@@ -98,7 +98,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+ static const struct rf_channel rf_vals_5592_xtal20[] = {
+ /* Channel, N, K, mod, R */
+ {1, 482, 4, 10, 3},
+-@@ -7669,6 +7729,11 @@ static int rt2800_probe_hw_mode(struct r
++@@ -7673,6 +7733,11 @@ static int rt2800_probe_hw_mode(struct r
+ spec->channels = rf_vals_3x;
+ break;
+
+diff --git a/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch b/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
+index f15c22b..b7efc9f 100644
+--- a/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
++++ b/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
+@@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+ case RF5360:
+ case RF5362:
+ case RF5370:
+-@@ -7848,6 +7849,7 @@ static int rt2800_probe_hw_mode(struct r
++@@ -7852,6 +7853,7 @@ static int rt2800_probe_hw_mode(struct r
+ case RF3053:
+ case RF3070:
+ case RF3290:
+diff --git a/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch b/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
+index 6ce224a..220e35f 100644
+--- a/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
++++ b/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
+@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+-@@ -8403,7 +8403,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
++@@ -8407,7 +8407,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+ if (rt2x00_rt(rt2x00dev, RT3593))
+ __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
+
+diff --git a/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch b/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
+index 25753af..2ffa5a4 100644
+--- a/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
++++ b/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
+@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+-@@ -8416,7 +8416,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
++@@ -8420,7 +8420,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+ if (retval)
+ return retval;
+
+diff --git a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
+index 7a183a4..daa5dc6 100644
+--- a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
++++ b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
+@@ -22,10 +22,10 @@
+ +#endif /* _RT2X00_PLATFORM_H */
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -38,6 +38,7 @@
+- #include <linux/kfifo.h>
++@@ -39,6 +39,7 @@
+ #include <linux/hrtimer.h>
+ #include <linux/average.h>
++ #include <linux/usb.h>
+ +#include <linux/rt2x00_platform.h>
+
+ #include <net/mac80211.h>
+diff --git a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
+index bc056cd..8ae5da3 100644
+--- a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
++++ b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
+@@ -1,6 +1,6 @@
+ --- a/.local-symbols
+ +++ b/.local-symbols
+-@@ -329,6 +329,7 @@ RT2X00_LIB_FIRMWARE=
++@@ -331,6 +331,7 @@ RT2X00_LIB_FIRMWARE=
+ RT2X00_LIB_CRYPTO=
+ RT2X00_LIB_LEDS=
+ RT2X00_LIB_DEBUGFS=
+@@ -105,7 +105,7 @@
+ .drv_init_registers = rt2800mmio_init_registers,
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -697,6 +697,7 @@ enum rt2x00_capability_flags {
++@@ -699,6 +699,7 @@ enum rt2x00_capability_flags {
+ REQUIRE_HT_TX_DESC,
+ REQUIRE_PS_AUTOWAKE,
+ REQUIRE_DELAYED_RFKILL,
+@@ -127,7 +127,7 @@
+ DECLARE_KFIFO_PTR(txstatus_fifo, u32);
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+-@@ -1335,6 +1335,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
++@@ -1334,6 +1334,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+ INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
+ INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
+
+@@ -138,7 +138,7 @@
+ /*
+ * Let the driver probe the device to detect the capabilities.
+ */
+-@@ -1475,6 +1479,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
++@@ -1477,6 +1481,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+ * Free the driver data.
+ */
+ kfree(rt2x00dev->drv_data);
+diff --git a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
+index d923e05..a2e1faf 100644
+--- a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
++++ b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
+@@ -37,7 +37,7 @@
+ num_rates += 4;
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -405,6 +405,7 @@ struct hw_mode_spec {
++@@ -406,6 +406,7 @@ struct hw_mode_spec {
+ unsigned int supported_bands;
+ #define SUPPORT_BAND_2GHZ 0x00000001
+ #define SUPPORT_BAND_5GHZ 0x00000002
+diff --git a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
+index a645ba1..6704ff8 100644
+--- a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
++++ b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
+@@ -31,7 +31,7 @@
+ {
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -1414,6 +1414,7 @@ static inline void rt2x00debug_dump_fram
++@@ -1416,6 +1416,7 @@ static inline void rt2x00debug_dump_fram
+ */
+ u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
+ struct ieee80211_vif *vif);
+diff --git a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
+index c69d330..9f10fe3 100644
+--- a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
++++ b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
+@@ -200,7 +200,7 @@
+ * EEPROM frequency
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -717,6 +717,8 @@ enum rt2x00_capability_flags {
++@@ -719,6 +719,8 @@ enum rt2x00_capability_flags {
+ CAPABILITY_DOUBLE_ANTENNA,
+ CAPABILITY_BT_COEXIST,
+ CAPABILITY_VCO_RECALIBRATION,
+diff --git a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
+index b44fe90..860fdc0 100644
+--- a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
++++ b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
+@@ -28,7 +28,7 @@
+ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
+ {
+ struct hw_mode_spec *spec = &rt2x00dev->spec;
+-@@ -8272,7 +8293,10 @@ static int rt2800_probe_hw_mode(struct r
++@@ -8276,7 +8297,10 @@ static int rt2800_probe_hw_mode(struct r
+ case RF5390:
+ case RF5392:
+ spec->num_channels = 14;
+@@ -40,7 +40,7 @@
+ break;
+
+ case RF3052:
+-@@ -8456,6 +8480,19 @@ static int rt2800_probe_rt(struct rt2x00
++@@ -8460,6 +8484,19 @@ static int rt2800_probe_rt(struct rt2x00
+ return 0;
+ }
+
+@@ -60,7 +60,7 @@
+ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
+ {
+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
+-@@ -8498,6 +8535,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
++@@ -8502,6 +8539,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+ rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
+
+ /*
+@@ -78,7 +78,7 @@
+ retval = rt2800_probe_hw_mode(rt2x00dev);
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -400,6 +400,7 @@ static inline struct rt2x00_intf* vif_to
++@@ -401,6 +401,7 @@ static inline struct rt2x00_intf* vif_to
+ * @channels: Device/chipset specific channel values (See &struct rf_channel).
+ * @channels_info: Additional information for channels (See &struct channel_info).
+ * @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap).
+@@ -86,7 +86,7 @@
+ */
+ struct hw_mode_spec {
+ unsigned int supported_bands;
+-@@ -416,6 +417,7 @@ struct hw_mode_spec {
++@@ -417,6 +418,7 @@ struct hw_mode_spec {
+ const struct channel_info *channels_info;
+
+ struct ieee80211_sta_ht_cap ht;
+diff --git a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
+index 8e3bd2a..e7b2a8c 100644
+--- a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
++++ b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
+@@ -8,7 +8,7 @@
+
+ #include "rt2x00.h"
+ #include "rt2800lib.h"
+-@@ -8482,13 +8483,14 @@ static int rt2800_probe_rt(struct rt2x00
++@@ -8486,13 +8487,14 @@ static int rt2800_probe_rt(struct rt2x00
+
+ int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
+ {
+diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
+index faa5879..44bd8a1 100644
+--- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
++++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
+@@ -240,7 +240,7 @@
+ case RF5360:
+ case RF5362:
+ case RF5370:
+-@@ -8287,6 +8398,7 @@ static int rt2800_probe_hw_mode(struct r
++@@ -8291,6 +8402,7 @@ static int rt2800_probe_hw_mode(struct r
+ case RF3290:
+ case RF3320:
+ case RF3322:
+@@ -248,7 +248,7 @@
+ case RF5360:
+ case RF5362:
+ case RF5370:
+-@@ -8426,6 +8538,7 @@ static int rt2800_probe_hw_mode(struct r
++@@ -8430,6 +8542,7 @@ static int rt2800_probe_hw_mode(struct r
+ case RF3070:
+ case RF3290:
+ case RF3853:
+@@ -256,7 +256,7 @@
+ case RF5360:
+ case RF5362:
+ case RF5370:
+-@@ -8466,6 +8579,7 @@ static int rt2800_probe_rt(struct rt2x00
++@@ -8470,6 +8583,7 @@ static int rt2800_probe_rt(struct rt2x00
+ case RT3572:
+ case RT3593:
+ case RT3883:
+@@ -266,7 +266,7 @@
+ case RT5592:
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+-@@ -169,6 +169,7 @@ struct rt2x00_chip {
++@@ -170,6 +170,7 @@ struct rt2x00_chip {
+ #define RT3572 0x3572
+ #define RT3593 0x3593
+ #define RT3883 0x3883 /* WSOC */
+diff --git a/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch b/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
+index 55452b9..dba6033 100644
+--- a/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
++++ b/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+ +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+-@@ -1284,7 +1284,7 @@ static inline void rt2x00lib_set_if_comb
++@@ -1283,7 +1283,7 @@ static inline void rt2x00lib_set_if_comb
+ */
+ if_limit = &rt2x00dev->if_limits_ap;
+ if_limit->max = rt2x00dev->ops->max_ap_intf;
+diff --git a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
+index fd885cc..02f3053 100644
+--- a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
++++ b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/marvell/libertas/cfg.c
+ +++ b/drivers/net/wireless/marvell/libertas/cfg.c
+-@@ -2084,6 +2084,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
++@@ -2122,6 +2122,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
+ goto err_wiphy_new;
+ }
+
+diff --git a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
+index b67a95f..ad30608 100644
+--- a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
++++ b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/marvell/libertas/cfg.c
+ +++ b/drivers/net/wireless/marvell/libertas/cfg.c
+-@@ -2174,6 +2174,8 @@ int lbs_cfg_register(struct lbs_private
++@@ -2212,6 +2212,8 @@ int lbs_cfg_register(struct lbs_private
+ wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
+ wdev->wiphy->reg_notifier = lbs_reg_notifier;
+
+diff --git a/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch b/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
+deleted file mode 100644
+index 74cd448..0000000
+--- a/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
++++ /dev/null
+@@ -1,17 +0,0 @@
+---- a/drivers/net/wireless/broadcom/b43/main.c
+-+++ b/drivers/net/wireless/broadcom/b43/main.c
+-@@ -1215,10 +1215,10 @@ void b43_wireless_core_phy_pll_reset(str
+- case B43_BUS_BCMA:
+- bcma_cc = &dev->dev->bdev->bus->drv_cc;
+-
+-- bcma_cc_write32(bcma_cc, BCMA_CC_CHIPCTL_ADDR, 0);
+-- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
+-- bcma_cc_set32(bcma_cc, BCMA_CC_CHIPCTL_DATA, 0x4);
+-- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
+-+ bcma_cc_write32(bcma_cc, BCMA_CC_PMU_CHIPCTL_ADDR, 0);
+-+ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
+-+ bcma_cc_set32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, 0x4);
+-+ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
+- break;
+- #endif
+- #ifdef CPTCFG_B43_SSB
+diff --git a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
+index 06c731f..b60ef76 100644
+--- a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
++++ b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
+@@ -42,7 +42,7 @@
+
+ if (wl->radio_enabled != phy->radio_on) {
+ if (wl->radio_enabled) {
+-@@ -5209,6 +5206,47 @@ static int b43_op_get_survey(struct ieee
++@@ -5207,6 +5204,47 @@ static int b43_op_get_survey(struct ieee
+ return 0;
+ }
+
+@@ -90,7 +90,7 @@
+ static const struct ieee80211_ops b43_hw_ops = {
+ .tx = b43_op_tx,
+ .conf_tx = b43_op_conf_tx,
+-@@ -5230,6 +5268,8 @@ static const struct ieee80211_ops b43_hw
++@@ -5228,6 +5266,8 @@ static const struct ieee80211_ops b43_hw
+ .sw_scan_complete = b43_op_sw_scan_complete_notifier,
+ .get_survey = b43_op_get_survey,
+ .rfkill_poll = b43_rfkill_poll,
+@@ -99,7 +99,7 @@
+ };
+
+ /* Hard-reset the chip. Do not call this directly.
+-@@ -5538,6 +5578,8 @@ static int b43_one_core_attach(struct b4
++@@ -5536,6 +5576,8 @@ static int b43_one_core_attach(struct b4
+ if (!wldev)
+ goto out;
+
+@@ -108,7 +108,7 @@
+ wldev->use_pio = b43_modparam_pio;
+ wldev->dev = dev;
+ wldev->wl = wl;
+-@@ -5628,6 +5670,9 @@ static struct b43_wl *b43_wireless_init(
++@@ -5626,6 +5668,9 @@ static struct b43_wl *b43_wireless_init(
+
+ hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
+diff --git a/package/kernel/mac80211/patches/860-brcmfmac-add-missing-eth_type_trans-call.patch b/package/kernel/mac80211/patches/860-brcmfmac-add-missing-eth_type_trans-call.patch
+new file mode 100644
+index 0000000..46227c4
+--- /dev/null
++++ b/package/kernel/mac80211/patches/860-brcmfmac-add-missing-eth_type_trans-call.patch
+@@ -0,0 +1,26 @@
++From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
++Subject: [PATCH] brcmfmac: add missing eth_type_trans call
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++There are 2 protocols supported by brcmfmac and msgbuf one was missing a
++proper skb setup before passing it to the netif. This was triggering
++"NULL pointer dereference".
++
++Fixes: 9c349892ccc9 ("brcmfmac: revise handling events in receive path")
++Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
++---
++
++--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
++@@ -1157,6 +1157,9 @@ brcmf_msgbuf_process_rx_complete(struct
++ brcmu_pkt_buf_free_skb(skb);
++ return;
++ }
+++
+++ skb->protocol = eth_type_trans(skb, ifp->ndev);
+++
++ brcmf_netif_rx(ifp, skb);
++ }
++
+diff --git a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
+index 00181f6..8cf9ea2 100644
+--- a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
++++ b/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
+@@ -13,8 +13,8 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+
+ --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+ +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+-@@ -1332,6 +1332,7 @@ static int __init brcmfmac_module_init(v
+- #endif
++@@ -1232,6 +1232,7 @@ int __init brcmf_core_init(void)
++ {
+ if (!schedule_work(&brcmf_driver_work))
+ return -EBUSY;
+ + flush_work(&brcmf_driver_work);
+diff --git a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
+index 4295b4b..4f22a4e 100644
+--- a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
++++ b/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
+@@ -10,7 +10,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+
+ --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+ +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+-@@ -615,9 +615,37 @@ static struct wireless_dev *brcmf_cfg802
++@@ -650,9 +650,37 @@ static struct wireless_dev *brcmf_cfg802
+ u32 *flags,
+ struct vif_params *params)
+ {
+@@ -42,7 +42,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+ + dev = dev_get_by_name(&init_net, name);
+ + if (dev) {
+ + dev_put(dev);
+-+ return ERR_PTR(-EEXIST);
+++ return ERR_PTR(-ENFILE);
+ + }
+ +
+ brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
+diff --git a/package/kernel/mac80211/patches/863-brcmfmac-Disable-power-management.patch b/package/kernel/mac80211/patches/863-brcmfmac-Disable-power-management.patch
+new file mode 100644
+index 0000000..f971bb7
+--- /dev/null
++++ b/package/kernel/mac80211/patches/863-brcmfmac-Disable-power-management.patch
+@@ -0,0 +1,27 @@
++From 66ae1b1750720a33e29792a177b1e696f4f005fb Mon Sep 17 00:00:00 2001
++From: Phil Elwell <phil@raspberrypi.org>
++Date: Wed, 9 Mar 2016 17:25:59 +0000
++Subject: [PATCH] brcmfmac: Disable power management
++
++Disable wireless power saving in the brcmfmac WLAN driver. This is a
++temporary measure until the connectivity loss resulting from power
++saving is resolved.
++
++Signed-off-by: Phil Elwell <phil@raspberrypi.org>
++---
++ drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 2 ++
++ 1 file changed, 2 insertions(+)
++
++--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
++@@ -2711,6 +2711,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip
++ * preference in cfg struct to apply this to
++ * FW later while initializing the dongle
++ */
+++#if defined(CONFIG_BCM2708) || defined(CONFIG_BCM2709)
+++ pr_info("power management disabled\n");
+++ enabled = false;
+++#endif
++ cfg->pwr_save = enabled;
++ if (!check_vif_up(ifp->vif)) {
++
+diff --git a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
+index f2e21ea..be210f2 100644
+--- a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
++++ b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
+@@ -1184,7 +1184,7 @@
+ break;
+ default:
+ rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
+-@@ -8423,6 +9363,7 @@ static int rt2800_probe_hw_mode(struct r
++@@ -8427,6 +9367,7 @@ static int rt2800_probe_hw_mode(struct r
+ case RF5372:
+ case RF5390:
+ case RF5392:
+@@ -1192,7 +1192,7 @@
+ spec->num_channels = 14;
+ if (spec->clk_is_20mhz)
+ spec->channels = rf_vals_xtal20mhz_3x;
+-@@ -8563,6 +9504,7 @@ static int rt2800_probe_hw_mode(struct r
++@@ -8567,6 +9508,7 @@ static int rt2800_probe_hw_mode(struct r
+ case RF5372:
+ case RF5390:
+ case RF5392:
+diff --git a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
+index 8c6d720..9322b45 100644
+--- a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
++++ b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
+@@ -14,7 +14,7 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
+
+ --- a/drivers/net/wireless/ath/ath10k/core.c
+ +++ b/drivers/net/wireless/ath/ath10k/core.c
+-@@ -1914,6 +1914,16 @@ int ath10k_core_register(struct ath10k *
++@@ -2012,6 +2012,16 @@ int ath10k_core_register(struct ath10k *
+ ar->chip_id = chip_id;
+ queue_work(ar->workqueue, &ar->register_work);
+
+diff --git a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
+index 281b447..1bfded0 100644
+--- a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
++++ b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
+@@ -1,6 +1,6 @@
+ --- a/drivers/net/wireless/ath/ath10k/mac.c
+ +++ b/drivers/net/wireless/ath/ath10k/mac.c
+-@@ -7141,6 +7141,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
++@@ -7717,6 +7717,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
+ return arvif_iter.arvif;
+ }
+
+@@ -22,7 +22,7 @@
+ int ath10k_mac_register(struct ath10k *ar)
+ {
+ static const u32 cipher_suites[] = {
+-@@ -7357,6 +7372,12 @@ int ath10k_mac_register(struct ath10k *a
++@@ -7941,6 +7956,12 @@ int ath10k_mac_register(struct ath10k *a
+ ar->hw->wiphy->cipher_suites = cipher_suites;
+ ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
+
+diff --git a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
+new file mode 100644
+index 0000000..7f51dd2
+--- /dev/null
++++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
+@@ -0,0 +1,42 @@
++--- a/drivers/net/wireless/ath/ath10k/core.c
+++++ b/drivers/net/wireless/ath/ath10k/core.c
++@@ -1168,9 +1168,6 @@ static int ath10k_core_fetch_firmware_fi
++ {
++ int ret;
++
++- /* calibration file is optional, don't check for any errors */
++- ath10k_fetch_cal_file(ar);
++-
++ ar->fw_api = 5;
++ ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
++
++@@ -1873,6 +1870,9 @@ static int ath10k_core_probe_fw(struct a
++ goto err_power_down;
++ }
++
+++ /* calibration file is optional, don't check for any errors */
+++ int calret = ath10k_fetch_cal_file(ar);
+++
++ ret = ath10k_core_fetch_firmware_files(ar);
++ if (ret) {
++ ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
++@@ -1895,11 +1895,14 @@ static int ath10k_core_probe_fw(struct a
++ "could not load pre cal data: %d\n", ret);
++ }
++
++- ret = ath10k_core_get_board_id_from_otp(ar);
++- if (ret && ret != -EOPNOTSUPP) {
++- ath10k_err(ar, "failed to get board id from otp: %d\n",
++- ret);
++- goto err_free_firmware_files;
+++ /* otp and board file not needed if calibration data is present */
+++ if (calret) {
+++ ret = ath10k_core_get_board_id_from_otp(ar);
+++ if (ret && ret != -EOPNOTSUPP) {
+++ ath10k_err(ar, "failed to get board id from otp: %d\n",
+++ ret);
+++ goto err_free_firmware_files;
+++ }
++ }
++
++ ret = ath10k_core_fetch_board_file(ar);
+diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
+index e49dd48..0f832e4 100644
+--- a/package/kernel/mt76/Makefile
++++ b/package/kernel/mt76/Makefile
+@@ -1,7 +1,7 @@
+ include $(TOPDIR)/rules.mk
+
+ PKG_NAME:=mt76
+-PKG_VERSION:=2016-03-03
++PKG_VERSION:=2016-06-17
+ PKG_RELEASE=1
+
+ PKG_LICENSE:=GPLv2
+@@ -10,23 +10,26 @@ PKG_LICENSE_FILES:=
+ PKG_SOURCE_URL:=https://github.com/openwrt/mt76
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+-PKG_SOURCE_VERSION:=310d420178c86e253a172413da30ecf479b64251
++PKG_SOURCE_VERSION:=f06ed811cda67ab2ed9932c3e87ba03229e75f4e
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+
+-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
++PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+ PKG_BUILD_PARALLEL:=1
+
++STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
++
+ include $(INCLUDE_DIR)/kernel.mk
+ include $(INCLUDE_DIR)/package.mk
+
+ define KernelPackage/mt76
+ SUBMENU:=Wireless Drivers
+- TITLE:=MediaTek MT76x2 wireless driver
+- DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT
++ TITLE:=MediaTek MT76x2/MT7603 wireless driver
++ DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT @!LINUX_3_18
+ FILES:=\
+ $(PKG_BUILD_DIR)/mt76.ko \
+- $(PKG_BUILD_DIR)/mt76x2e.ko
+- AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e)
++ $(PKG_BUILD_DIR)/mt76x2e.ko \
++ $(PKG_BUILD_DIR)/mt7603e.ko
++ AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e mt7603e)
+ endef
+
+ NOSTDINC_FLAGS = \
+@@ -54,6 +57,12 @@ endef
+ define KernelPackage/mt76/install
+ $(INSTALL_DIR) $(1)/lib/firmware
+ cp \
++ $(if $(CONFIG_TARGET_ramips_mt7628) || $(CONFIG_TARGET_ramips_mt7688), \
++ $(PKG_BUILD_DIR)/firmware/mt7628_e1.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7628_e2.bin \
++ ) \
++ $(PKG_BUILD_DIR)/firmware/mt7603_e1.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7603_e2.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7662.bin \
+ $(1)/lib/firmware
+diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
+index 091928d..6a59a02 100644
+--- a/package/kernel/mwlwifi/Makefile
++++ b/package/kernel/mwlwifi/Makefile
+@@ -8,7 +8,7 @@
+ include $(TOPDIR)/rules.mk
+
+ PKG_NAME:=mwlwifi
+-PKG_VERSION:=10.3.0.16-20160105
++PKG_VERSION:=10.3.0.17-20160520-1
+ PKG_RELEASE=1
+
+ PKG_LICENSE:=ISC
+@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=
+ PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+-PKG_SOURCE_VERSION:=99d3879cc72f2a25d44fb4bee96fd84eca028b04
++PKG_SOURCE_VERSION:=7d49296d12b44025278a52c5a26fb1b4236f320f
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+
+ PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
+diff --git a/package/kernel/mwlwifi/patches/100-drop_old_api.patch b/package/kernel/mwlwifi/patches/100-drop_old_api.patch
+index d2e149e..086edeb 100644
+--- a/package/kernel/mwlwifi/patches/100-drop_old_api.patch
++++ b/package/kernel/mwlwifi/patches/100-drop_old_api.patch
+@@ -1,6 +1,6 @@
+ --- a/main.c
+ +++ b/main.c
+-@@ -418,11 +418,7 @@ static void mwl_set_ht_caps(struct mwl_p
++@@ -423,11 +423,7 @@ static void mwl_set_ht_caps(struct mwl_p
+ band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
+ band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
+
+@@ -12,7 +12,7 @@
+ band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
+ band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
+
+-@@ -524,29 +520,16 @@ static int mwl_wl_init(struct mwl_priv *
++@@ -563,29 +559,16 @@ static int mwl_wl_init(struct mwl_priv *
+ hw->queues = SYSADPT_TX_WMM_QUEUES;
+
+ /* Set rssi values to dBm */
+@@ -41,10 +41,10 @@
+ -#endif
+
+ hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+-
++ hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
+ --- a/dev.h
+ +++ b/dev.h
+-@@ -484,10 +484,6 @@ static inline struct mwl_sta *mwl_dev_ge
++@@ -506,10 +506,6 @@ static inline struct mwl_sta *mwl_dev_ge
+ return (struct mwl_sta *)&sta->drv_priv;
+ }
+
+@@ -57,7 +57,7 @@
+
+ --- a/mac80211.c
+ +++ b/mac80211.c
+-@@ -572,19 +572,11 @@ static int mwl_mac80211_get_survey(struc
++@@ -598,19 +598,11 @@ static int mwl_mac80211_get_survey(struc
+ return 0;
+ }
+
+diff --git a/package/kernel/mwlwifi/patches/110-api_sync.patch b/package/kernel/mwlwifi/patches/110-api_sync.patch
+index ed3e06a..920cb8c 100644
+--- a/package/kernel/mwlwifi/patches/110-api_sync.patch
++++ b/package/kernel/mwlwifi/patches/110-api_sync.patch
+@@ -1,6 +1,30 @@
+ --- a/mac80211.c
+ +++ b/mac80211.c
+-@@ -597,10 +597,13 @@ static int mwl_mac80211_get_survey(struc
++@@ -260,12 +260,12 @@ static int mwl_mac80211_config(struct ie
++ if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
++ int rate = 0;
++
++- if (conf->chandef.chan->band == IEEE80211_BAND_2GHZ) {
+++ if (conf->chandef.chan->band == NL80211_BAND_2GHZ) {
++ mwl_fwcmd_set_apmode(hw, AP_MODE_2_4GHZ_11AC_MIXED);
++ mwl_fwcmd_set_linkadapt_cs_mode(hw,
++ LINK_CS_STATE_CONSERV);
++ rate = mwl_rates_24[0].hw_value;
++- } else if (conf->chandef.chan->band == IEEE80211_BAND_5GHZ) {
+++ } else if (conf->chandef.chan->band == NL80211_BAND_5GHZ) {
++ mwl_fwcmd_set_apmode(hw, AP_MODE_11AC);
++ mwl_fwcmd_set_linkadapt_cs_mode(hw,
++ LINK_CS_STATE_AUTO);
++@@ -333,7 +333,7 @@ static void mwl_mac80211_bss_info_change
++ if (idx)
++ idx--;
++
++- if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
+++ if (hw->conf.chandef.chan->band == NL80211_BAND_2GHZ)
++ rate = mwl_rates_24[idx].hw_value;
++ else
++ rate = mwl_rates_50[idx].hw_value;
++@@ -600,10 +600,13 @@ static int mwl_mac80211_get_survey(struc
+
+ static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+@@ -17,3 +41,227 @@
+ int rc = 0;
+ struct mwl_priv *priv = hw->priv;
+ struct mwl_ampdu_stream *stream;
++--- a/fwcmd.c
+++++ b/fwcmd.c
++@@ -730,9 +730,9 @@ static int mwl_fwcmd_set_country_code(st
++ bool enable = false;
++
++ if (b_inf->ie_country_ptr) {
++- if (bss_conf->chandef.chan->band == IEEE80211_BAND_2GHZ)
+++ if (bss_conf->chandef.chan->band == NL80211_BAND_2GHZ)
++ a_band = false;
++- else if (bss_conf->chandef.chan->band == IEEE80211_BAND_5GHZ)
+++ else if (bss_conf->chandef.chan->band == NL80211_BAND_5GHZ)
++ a_band = true;
++ else
++ return -EINVAL;
++@@ -1075,9 +1075,9 @@ int mwl_fwcmd_max_tx_power(struct ieee80
++ break;
++ }
++
++- if (channel->band == IEEE80211_BAND_2GHZ)
+++ if (channel->band == NL80211_BAND_2GHZ)
++ band = FREQ_BAND_2DOT4GHZ;
++- else if (channel->band == IEEE80211_BAND_5GHZ)
+++ else if (channel->band == NL80211_BAND_5GHZ)
++ band = FREQ_BAND_5GHZ;
++
++ switch (conf->chandef.width) {
++@@ -1161,9 +1161,9 @@ int mwl_fwcmd_tx_power(struct ieee80211_
++ break;
++ }
++
++- if (channel->band == IEEE80211_BAND_2GHZ)
+++ if (channel->band == NL80211_BAND_2GHZ)
++ band = FREQ_BAND_2DOT4GHZ;
++- else if (channel->band == IEEE80211_BAND_5GHZ)
+++ else if (channel->band == NL80211_BAND_5GHZ)
++ band = FREQ_BAND_5GHZ;
++
++ switch (conf->chandef.width) {
++@@ -1354,9 +1354,9 @@ int mwl_fwcmd_set_rf_channel(struct ieee
++ pcmd->action = cpu_to_le16(WL_SET);
++ pcmd->curr_chnl = channel->hw_value;
++
++- if (channel->band == IEEE80211_BAND_2GHZ) {
+++ if (channel->band == NL80211_BAND_2GHZ) {
++ freq_band = FREQ_BAND_2DOT4GHZ;
++- } else if (channel->band == IEEE80211_BAND_5GHZ) {
+++ } else if (channel->band == NL80211_BAND_5GHZ) {
++ freq_band = FREQ_BAND_5GHZ;
++ } else {
++ mutex_unlock(&priv->fwcmd_mutex);
++@@ -1923,10 +1923,10 @@ int mwl_fwcmd_set_new_stn_add(struct iee
++ }
++ ether_addr_copy(pcmd->mac_addr, sta->addr);
++
++- if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
++- rates = sta->supp_rates[IEEE80211_BAND_2GHZ];
+++ if (hw->conf.chandef.chan->band == NL80211_BAND_2GHZ)
+++ rates = sta->supp_rates[NL80211_BAND_2GHZ];
++ else
++- rates = sta->supp_rates[IEEE80211_BAND_5GHZ] << 5;
+++ rates = sta->supp_rates[NL80211_BAND_5GHZ] << 5;
++ pcmd->peer_info.legacy_rate_bitmap = cpu_to_le32(rates);
++
++ if (sta->ht_cap.ht_supported) {
++@@ -2097,9 +2097,9 @@ int mwl_fwcmd_set_switch_channel(struct
++ if (priv->csa_active)
++ return 0;
++
++- if (channel->band == IEEE80211_BAND_2GHZ)
+++ if (channel->band == NL80211_BAND_2GHZ)
++ freq_band = FREQ_BAND_2DOT4GHZ;
++- else if (channel->band == IEEE80211_BAND_5GHZ)
+++ else if (channel->band == NL80211_BAND_5GHZ)
++ freq_band = FREQ_BAND_5GHZ;
++ else
++ return -EINVAL;
++--- a/main.c
+++++ b/main.c
++@@ -63,20 +63,20 @@ static struct mwl_chip_info mwl_chip_tbl
++ };
++
++ static const struct ieee80211_channel mwl_channels_24[] = {
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2412, .hw_value = 1, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2417, .hw_value = 2, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2422, .hw_value = 3, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2427, .hw_value = 4, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2432, .hw_value = 5, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2437, .hw_value = 6, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2442, .hw_value = 7, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2447, .hw_value = 8, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2452, .hw_value = 9, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2457, .hw_value = 10, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2462, .hw_value = 11, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2467, .hw_value = 12, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2472, .hw_value = 13, },
++- { .band = IEEE80211_BAND_2GHZ, .center_freq = 2484, .hw_value = 14, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2412, .hw_value = 1, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2417, .hw_value = 2, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2422, .hw_value = 3, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2427, .hw_value = 4, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2432, .hw_value = 5, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2437, .hw_value = 6, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2442, .hw_value = 7, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2447, .hw_value = 8, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2452, .hw_value = 9, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2457, .hw_value = 10, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2462, .hw_value = 11, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2467, .hw_value = 12, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2472, .hw_value = 13, },
+++ { .band = NL80211_BAND_2GHZ, .center_freq = 2484, .hw_value = 14, },
++ };
++
++ static const struct ieee80211_rate mwl_rates_24[] = {
++@@ -96,30 +96,30 @@ static const struct ieee80211_rate mwl_r
++ };
++
++ static const struct ieee80211_channel mwl_channels_50[] = {
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5180, .hw_value = 36, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5200, .hw_value = 40, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5220, .hw_value = 44, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5240, .hw_value = 48, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5260, .hw_value = 52, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5280, .hw_value = 56, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5300, .hw_value = 60, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5320, .hw_value = 64, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5500, .hw_value = 100, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5520, .hw_value = 104, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5540, .hw_value = 108, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5560, .hw_value = 112, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5580, .hw_value = 116, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5600, .hw_value = 120, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5620, .hw_value = 124, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5640, .hw_value = 128, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5660, .hw_value = 132, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5680, .hw_value = 136, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5700, .hw_value = 140, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5720, .hw_value = 144, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5745, .hw_value = 149, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5765, .hw_value = 153, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5785, .hw_value = 157, },
++- { .band = IEEE80211_BAND_5GHZ, .center_freq = 5805, .hw_value = 161, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5180, .hw_value = 36, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5200, .hw_value = 40, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5220, .hw_value = 44, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5240, .hw_value = 48, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5260, .hw_value = 52, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5280, .hw_value = 56, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5300, .hw_value = 60, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5320, .hw_value = 64, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5500, .hw_value = 100, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5520, .hw_value = 104, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5540, .hw_value = 108, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5560, .hw_value = 112, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5580, .hw_value = 116, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5600, .hw_value = 120, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5620, .hw_value = 124, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5640, .hw_value = 128, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5660, .hw_value = 132, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5680, .hw_value = 136, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5700, .hw_value = 140, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5720, .hw_value = 144, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5745, .hw_value = 149, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5765, .hw_value = 153, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5785, .hw_value = 157, },
+++ { .band = NL80211_BAND_5GHZ, .center_freq = 5805, .hw_value = 161, },
++ };
++
++ static const struct ieee80211_rate mwl_rates_50[] = {
++@@ -478,7 +478,7 @@ static void mwl_set_caps(struct mwl_priv
++ BUILD_BUG_ON(sizeof(priv->rates_24) != sizeof(mwl_rates_24));
++ memcpy(priv->rates_24, mwl_rates_24, sizeof(mwl_rates_24));
++
++- priv->band_24.band = IEEE80211_BAND_2GHZ;
+++ priv->band_24.band = NL80211_BAND_2GHZ;
++ priv->band_24.channels = priv->channels_24;
++ priv->band_24.n_channels = ARRAY_SIZE(mwl_channels_24);
++ priv->band_24.bitrates = priv->rates_24;
++@@ -487,7 +487,7 @@ static void mwl_set_caps(struct mwl_priv
++ mwl_set_ht_caps(priv, &priv->band_24);
++ mwl_set_vht_caps(priv, &priv->band_24);
++
++- hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band_24;
+++ hw->wiphy->bands[NL80211_BAND_2GHZ] = &priv->band_24;
++ }
++
++ /* set up band information for 5G */
++@@ -500,7 +500,7 @@ static void mwl_set_caps(struct mwl_priv
++ BUILD_BUG_ON(sizeof(priv->rates_50) != sizeof(mwl_rates_50));
++ memcpy(priv->rates_50, mwl_rates_50, sizeof(mwl_rates_50));
++
++- priv->band_50.band = IEEE80211_BAND_5GHZ;
+++ priv->band_50.band = NL80211_BAND_5GHZ;
++ priv->band_50.channels = priv->channels_50;
++ priv->band_50.n_channels = ARRAY_SIZE(mwl_channels_50);
++ priv->band_50.bitrates = priv->rates_50;
++@@ -509,7 +509,7 @@ static void mwl_set_caps(struct mwl_priv
++ mwl_set_ht_caps(priv, &priv->band_50);
++ mwl_set_vht_caps(priv, &priv->band_50);
++
++- hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &priv->band_50;
+++ hw->wiphy->bands[NL80211_BAND_5GHZ] = &priv->band_50;
++ }
++ }
++
++--- a/rx.c
+++++ b/rx.c
++@@ -243,7 +243,7 @@ static inline void mwl_rx_prepare_status
++ status->rate_idx = rt;
++
++ if (pdesc->channel > BAND_24_CHANNEL_NUM) {
++- status->band = IEEE80211_BAND_5GHZ;
+++ status->band = NL80211_BAND_5GHZ;
++ if ((!(status->flag & RX_FLAG_HT)) &&
++ (!(status->flag & RX_FLAG_VHT))) {
++ status->rate_idx -= 5;
++@@ -251,7 +251,7 @@ static inline void mwl_rx_prepare_status
++ status->rate_idx = BAND_50_RATE_NUM - 1;
++ }
++ } else {
++- status->band = IEEE80211_BAND_2GHZ;
+++ status->band = NL80211_BAND_2GHZ;
++ if ((!(status->flag & RX_FLAG_HT)) &&
++ (!(status->flag & RX_FLAG_VHT))) {
++ if (status->rate_idx >= BAND_24_RATE_NUM)
+diff --git a/package/kernel/mwlwifi/patches/200-fix_excessive_delays.patch b/package/kernel/mwlwifi/patches/200-fix_excessive_delays.patch
+new file mode 100644
+index 0000000..43523ed
+--- /dev/null
++++ b/package/kernel/mwlwifi/patches/200-fix_excessive_delays.patch
+@@ -0,0 +1,73 @@
++--- a/fwcmd.c
+++++ b/fwcmd.c
++@@ -132,7 +132,7 @@ static int mwl_fwcmd_wait_complete(struc
++ int_code = le16_to_cpu(*((__le16 *)&priv->pcmd_buf[2]));
++ else
++ int_code = le16_to_cpu(*((__le16 *)&priv->pcmd_buf[0]));
++- mdelay(1);
+++ usleep_range(1000, 2000);
++ } while ((int_code != cmd) && (--curr_iteration));
++
++ if (curr_iteration == 0) {
++@@ -142,7 +142,7 @@ static int mwl_fwcmd_wait_complete(struc
++ return -EIO;
++ }
++
++- mdelay(3);
+++ usleep_range(3000, 5000);
++
++ return 0;
++ }
++--- a/fwdl.c
+++++ b/fwdl.c
++@@ -74,7 +74,7 @@ int mwl_fwdl_download_firmware(struct ie
++ /* FW before jumping to boot rom, it will enable PCIe transaction retry,
++ * wait for boot code to stop it.
++ */
++- mdelay(FW_CHECK_MSECS);
+++ usleep_range(FW_CHECK_MSECS * 1000, FW_CHECK_MSECS * 2000);
++
++ writel(MACREG_A2HRIC_BIT_MASK,
++ priv->iobase1 + MACREG_REG_A2H_INTERRUPT_CLEAR_SEL);
++@@ -95,7 +95,7 @@ int mwl_fwdl_download_firmware(struct ie
++
++ /* make sure SCRATCH2 C40 is clear, in case we are too quick */
++ while (readl(priv->iobase1 + 0xc40) == 0)
++- ;
+++ cond_resched();
++
++ while (size_fw_downloaded < fw->size) {
++ len = readl(priv->iobase1 + 0xc40);
++@@ -125,6 +125,7 @@ int mwl_fwdl_download_firmware(struct ie
++ int_code = readl(priv->iobase1 + 0xc1c);
++ if (int_code != 0)
++ break;
+++ cond_resched();
++ curr_iteration--;
++ } while (curr_iteration);
++
++@@ -133,6 +134,7 @@ int mwl_fwdl_download_firmware(struct ie
++ if ((int_code & MACREG_H2ARIC_BIT_DOOR_BELL) !=
++ MACREG_H2ARIC_BIT_DOOR_BELL)
++ break;
+++ cond_resched();
++ curr_iteration--;
++ } while (curr_iteration);
++
++@@ -167,12 +169,14 @@ int mwl_fwdl_download_firmware(struct ie
++ do {
++ curr_iteration--;
++ if (priv->mfg_mode && priv->chip_type == MWL8897) {
++- mdelay(FW_CHECK_MSECS);
+++ usleep_range(FW_CHECK_MSECS * 1000,
+++ FW_CHECK_MSECS * 2000);
++ int_code = readl(priv->iobase1 + 0xc44);
++ } else {
++ writel(HOSTCMD_SOFTAP_MODE,
++ priv->iobase1 + MACREG_REG_GEN_PTR);
++- mdelay(FW_CHECK_MSECS);
+++ usleep_range(FW_CHECK_MSECS * 1000,
+++ FW_CHECK_MSECS * 2000);
++ int_code = readl(priv->iobase1 + MACREG_REG_INT_CODE);
++ }
++ if (!(curr_iteration % 0xff) && (int_code != 0))
+diff --git a/package/kernel/mwlwifi/patches/210-fix_logspam.patch b/package/kernel/mwlwifi/patches/210-fix_logspam.patch
+new file mode 100644
+index 0000000..99b247f
+--- /dev/null
++++ b/package/kernel/mwlwifi/patches/210-fix_logspam.patch
+@@ -0,0 +1,22 @@
++--- a/fwcmd.c
+++++ b/fwcmd.c
++@@ -2393,8 +2393,6 @@ int mwl_fwcmd_check_ba(struct ieee80211_
++
++ if (pcmd->cmd_hdr.result != 0) {
++ mutex_unlock(&priv->fwcmd_mutex);
++- wiphy_err(hw->wiphy, "check ba result error %d\n",
++- le16_to_cpu(pcmd->cmd_hdr.result));
++ return -EINVAL;
++ }
++
++--- a/mac80211.c
+++++ b/mac80211.c
++@@ -644,8 +644,6 @@ static int mwl_mac80211_ampdu_action(str
++ spin_lock_bh(&priv->stream_lock);
++ if (rc) {
++ mwl_fwcmd_remove_stream(hw, stream);
++- wiphy_err(hw->wiphy,
++- "ampdu start error code: %d\n", rc);
++ rc = -EPERM;
++ break;
++ }
+diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
+index ad82081..d17cbca 100644
+--- a/package/network/utils/iw/Makefile
++++ b/package/network/utils/iw/Makefile
+@@ -12,10 +12,10 @@ PKG_VERSION:=4.3
+ PKG_RELEASE:=1
+
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+-PKG_SOURCE_URL:=https://www.kernel.org/pub/software/network/iw
++PKG_SOURCE_URL:=@KERNEL/software/network/iw
+ PKG_MD5SUM:=7adec72e91ebdd9c55429fa34a23a6f5
+
+-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
++PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+ PKG_LICENSE:=GPL-2.0
+
+ include $(INCLUDE_DIR)/package.mk
+diff --git a/package/network/utils/iw/patches/001-nl80211_h_sync.patch b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
+index 7de2258..e5ea8f7 100644
+--- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch
++++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
+@@ -8,7 +8,17 @@
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+-@@ -328,7 +329,15 @@
++@@ -321,14 +322,24 @@
++ * @NL80211_CMD_GET_SCAN: get scan results
++ * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
++ * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
++- * probe requests at CCK rate or not.
+++ * probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to
+++ * specify a BSSID to scan for; if not included, the wildcard BSSID will
+++ * be used.
++ * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
++ * NL80211_CMD_GET_SCAN and on the "scan" multicast group)
++ * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
+ * partial scan results may be available
+ *
+ * @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain
+@@ -25,7 +35,82 @@
+ * Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS)
+ * are passed, they are used in the probe requests. For
+ * broadcast, a broadcast SSID must be passed (ie. an empty
+-@@ -1761,6 +1770,22 @@ enum nl80211_commands {
++@@ -418,7 +429,11 @@
++ * @NL80211_CMD_ASSOCIATE: association request and notification; like
++ * NL80211_CMD_AUTHENTICATE but for Association and Reassociation
++ * (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
++- * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
+++ * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives). The
+++ * %NL80211_ATTR_PREV_BSSID attribute is used to specify whether the
+++ * request is for the initial association to an ESS (that attribute not
+++ * included) or for reassociation within the ESS (that attribute is
+++ * included).
++ * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
++ * NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
++ * MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
++@@ -468,6 +483,9 @@
++ * set of BSSID,frequency parameters is used (i.e., either the enforcing
++ * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict
++ * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT).
+++ * %NL80211_ATTR_PREV_BSSID can be used to request a reassociation within
+++ * the ESS in case the device is already associated and an association with
+++ * a different BSS is desired.
++ * Background scan period can optionally be
++ * specified in %NL80211_ATTR_BG_SCAN_PERIOD,
++ * if not specified default background scan configuration
++@@ -811,6 +829,10 @@
++ * as an event to indicate changes for devices with wiphy-specific regdom
++ * management.
++ *
+++ * @NL80211_CMD_ABORT_SCAN: Stop an ongoing scan. Returns -ENOENT if a scan is
+++ * not running. The driver indicates the status of the scan through
+++ * cfg80211_scan_done().
+++ *
++ * @NL80211_CMD_MAX: highest used command number
++ * @__NL80211_CMD_AFTER_LAST: internal use
++ */
++@@ -997,6 +1019,8 @@ enum nl80211_commands {
++
++ NL80211_CMD_WIPHY_REG_CHANGE,
++
+++ NL80211_CMD_ABORT_SCAN,
+++
++ /* add new commands above here */
++
++ /* used to define NL80211_CMD_MAX below */
++@@ -1270,8 +1294,11 @@ enum nl80211_commands {
++ * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
++ * sent by peer, for ROAM and successful CONNECT events.
++ *
++- * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
++- * commands to specify using a reassociate frame
+++ * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used in ASSOCIATE and CONNECT
+++ * commands to specify a request to reassociate within an ESS, i.e., to use
+++ * Reassociate Request frame (with the value of this attribute in the
+++ * Current AP address field) instead of Association Request frame which is
+++ * used for the initial association to an ESS.
++ *
++ * @NL80211_ATTR_KEY: key information in a nested attribute with
++ * %NL80211_KEY_* sub-attributes
++@@ -1712,6 +1739,8 @@ enum nl80211_commands {
++ * underlying device supports these minimal RRM features:
++ * %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
++ * %NL80211_FEATURE_QUIET,
+++ * Or, if global RRM is supported, see:
+++ * %NL80211_EXT_FEATURE_RRM
++ * If this flag is used, driver must add the Power Capabilities IE to the
++ * association request. In addition, it must also set the RRM capability
++ * flag in the association request's Capability Info field.
++@@ -1755,12 +1784,44 @@ enum nl80211_commands {
++ * over all channels.
++ *
++ * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
++- * scheduled scan (or a WoWLAN net-detect scan) is started, u32
++- * in seconds.
+++ * scheduled scan is started. Or the delay before a WoWLAN
+++ * net-detect scan is started, counting from the moment the
+++ * system is suspended. This value is a u32, in seconds.
++
+ * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
+ * is operating in an indoor environment.
+ *
+@@ -41,6 +126,21 @@
+ + * thus it must not specify the number of iterations, only the interval
+ + * between scans. The scan plans are executed sequentially.
+ + * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
+++ * @NL80211_ATTR_PBSS: flag attribute. If set it means operate
+++ * in a PBSS. Specified in %NL80211_CMD_CONNECT to request
+++ * connecting to a PCP, and in %NL80211_CMD_START_AP to start
+++ * a PCP instead of AP. Relevant for DMG networks only.
+++ * @NL80211_ATTR_BSS_SELECT: nested attribute for driver supporting the
+++ * BSS selection feature. When used with %NL80211_CMD_GET_WIPHY it contains
+++ * attributes according &enum nl80211_bss_select_attr to indicate what
+++ * BSS selection behaviours are supported. When used with %NL80211_CMD_CONNECT
+++ * it contains the behaviour-specific attribute containing the parameters for
+++ * BSS selection to be done by driver and/or firmware.
+++ *
+++ * @NL80211_ATTR_STA_SUPPORT_P2P_PS: whether P2P PS mechanism supported
+++ * or not. u8, one of the values of &enum nl80211_sta_p2p_ps_status
+++ *
+++ * @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment
+ + *
+ + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
+ + * transmit power to stay within regulatory limits. u32, dBi.
+@@ -48,7 +148,7 @@
+ * @NUM_NL80211_ATTR: total number of nl80211_attrs available
+ * @NL80211_ATTR_MAX: highest attribute number currently defined
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+-@@ -2130,6 +2155,13 @@ enum nl80211_attrs {
++@@ -2130,6 +2191,21 @@ enum nl80211_attrs {
+
+ NL80211_ATTR_REG_INDOOR,
+
+@@ -57,30 +157,147 @@
+ + NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
+ + NL80211_ATTR_SCHED_SCAN_PLANS,
+ +
+++ NL80211_ATTR_PBSS,
+++
+++ NL80211_ATTR_BSS_SELECT,
+++
+++ NL80211_ATTR_STA_SUPPORT_P2P_PS,
+++
+++ NL80211_ATTR_PAD,
+++
+ + NL80211_ATTR_WIPHY_ANTENNA_GAIN,
+ +
+ /* add attributes here, update the policy in nl80211.c */
+
+ __NL80211_ATTR_AFTER_LAST,
+-@@ -3364,6 +3396,9 @@ enum nl80211_bss_scan_width {
++@@ -2273,6 +2349,20 @@ enum nl80211_sta_flags {
++ NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
++ };
++
+++/**
+++ * enum nl80211_sta_p2p_ps_status - station support of P2P PS
+++ *
+++ * @NL80211_P2P_PS_UNSUPPORTED: station doesn't support P2P PS mechanism
+++ * @@NL80211_P2P_PS_SUPPORTED: station supports P2P PS mechanism
+++ * @NUM_NL80211_P2P_PS_STATUS: number of values
+++ */
+++enum nl80211_sta_p2p_ps_status {
+++ NL80211_P2P_PS_UNSUPPORTED = 0,
+++ NL80211_P2P_PS_SUPPORTED,
+++
+++ NUM_NL80211_P2P_PS_STATUS,
+++};
+++
++ #define NL80211_STA_FLAG_MAX_OLD_API NL80211_STA_FLAG_TDLS_PEER
++
++ /**
++@@ -2430,6 +2520,9 @@ enum nl80211_sta_bss_param {
++ * TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
++ * each one of those is again nested with &enum nl80211_tid_stats
++ * attributes carrying the actual values.
+++ * @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames
+++ * received from the station (u64, usec)
+++ * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
++ * @__NL80211_STA_INFO_AFTER_LAST: internal
++ * @NL80211_STA_INFO_MAX: highest possible station info attribute
++ */
++@@ -2466,6 +2559,8 @@ enum nl80211_sta_info {
++ NL80211_STA_INFO_BEACON_RX,
++ NL80211_STA_INFO_BEACON_SIGNAL_AVG,
++ NL80211_STA_INFO_TID_STATS,
+++ NL80211_STA_INFO_RX_DURATION,
+++ NL80211_STA_INFO_PAD,
++
++ /* keep last */
++ __NL80211_STA_INFO_AFTER_LAST,
++@@ -2482,6 +2577,7 @@ enum nl80211_sta_info {
++ * transmitted MSDUs (not counting the first attempt; u64)
++ * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
++ * MSDUs (u64)
+++ * @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment
++ * @NUM_NL80211_TID_STATS: number of attributes here
++ * @NL80211_TID_STATS_MAX: highest numbered attribute here
++ */
++@@ -2491,6 +2587,7 @@ enum nl80211_tid_stats {
++ NL80211_TID_STATS_TX_MSDU,
++ NL80211_TID_STATS_TX_MSDU_RETRIES,
++ NL80211_TID_STATS_TX_MSDU_FAILED,
+++ NL80211_TID_STATS_PAD,
++
++ /* keep last */
++ NUM_NL80211_TID_STATS,
++@@ -2927,6 +3024,7 @@ enum nl80211_user_reg_hint_type {
++ * transmitting data (on channel or globally)
++ * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
++ * (on this channel or globally)
+++ * @NL80211_SURVEY_INFO_PAD: attribute used for padding for 64-bit alignment
++ * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
++ * currently defined
++ * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
++@@ -2942,6 +3040,7 @@ enum nl80211_survey_info {
++ NL80211_SURVEY_INFO_TIME_RX,
++ NL80211_SURVEY_INFO_TIME_TX,
++ NL80211_SURVEY_INFO_TIME_SCAN,
+++ NL80211_SURVEY_INFO_PAD,
++
++ /* keep last */
++ __NL80211_SURVEY_INFO_AFTER_LAST,
++@@ -3364,6 +3463,10 @@ enum nl80211_bss_scan_width {
+ * (not present if no beacon frame has been received yet)
+ * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and
+ * @NL80211_BSS_TSF is known to be from a probe response (flag attribute)
+ + * @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry
+ + * was last updated by a received frame. The value is expected to be
+ + * accurate to about 10ms. (u64, nanoseconds)
+++ * @NL80211_BSS_PAD: attribute used for padding for 64-bit alignment
+ * @__NL80211_BSS_AFTER_LAST: internal
+ * @NL80211_BSS_MAX: highest BSS attribute
+ */
+-@@ -3383,6 +3418,7 @@ enum nl80211_bss {
++@@ -3383,6 +3486,8 @@ enum nl80211_bss {
+ NL80211_BSS_CHAN_WIDTH,
+ NL80211_BSS_BEACON_TSF,
+ NL80211_BSS_PRESP_DATA,
+ + NL80211_BSS_LAST_SEEN_BOOTTIME,
+++ NL80211_BSS_PAD,
+
+ /* keep last */
+ __NL80211_BSS_AFTER_LAST,
+-@@ -4589,4 +4625,28 @@ enum nl80211_tdls_peer_capability {
++@@ -3568,11 +3673,15 @@ enum nl80211_txrate_gi {
++ * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
++ * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
++ * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)
+++ * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace
+++ * since newer kernel versions may support more bands
++ */
++ enum nl80211_band {
++ NL80211_BAND_2GHZ,
++ NL80211_BAND_5GHZ,
++ NL80211_BAND_60GHZ,
+++
+++ NUM_NL80211_BANDS,
++ };
++
++ /**
++@@ -4358,12 +4467,18 @@ enum nl80211_feature_flags {
++ /**
++ * enum nl80211_ext_feature_index - bit index of extended features.
++ * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
+++ * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can
+++ * can request to use RRM (see %NL80211_ATTR_USE_RRM) with
+++ * %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set
+++ * the ASSOC_REQ_USE_RRM flag in the association request even if
+++ * NL80211_FEATURE_QUIET is not advertized.
++ *
++ * @NUM_NL80211_EXT_FEATURES: number of extended features.
++ * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
++ */
++ enum nl80211_ext_feature_index {
++ NL80211_EXT_FEATURE_VHT_IBSS,
+++ NL80211_EXT_FEATURE_RRM,
++
++ /* add new features before the definition below */
++ NUM_NL80211_EXT_FEATURES,
++@@ -4589,4 +4704,72 @@ enum nl80211_tdls_peer_capability {
+ NL80211_TDLS_PEER_WMM = 1<<2,
+ };
+
+@@ -108,4 +325,48 @@
+ + __NL80211_SCHED_SCAN_PLAN_AFTER_LAST - 1
+ +};
+ +
+++/**
+++ * struct nl80211_bss_select_rssi_adjust - RSSI adjustment parameters.
+++ *
+++ * @band: band of BSS that must match for RSSI value adjustment.
+++ * @delta: value used to adjust the RSSI value of matching BSS.
+++ */
+++struct nl80211_bss_select_rssi_adjust {
+++ __u8 band;
+++ __s8 delta;
+++} __attribute__((packed));
+++
+++/**
+++ * enum nl80211_bss_select_attr - attributes for bss selection.
+++ *
+++ * @__NL80211_BSS_SELECT_ATTR_INVALID: reserved.
+++ * @NL80211_BSS_SELECT_ATTR_RSSI: Flag indicating only RSSI-based BSS selection
+++ * is requested.
+++ * @NL80211_BSS_SELECT_ATTR_BAND_PREF: attribute indicating BSS
+++ * selection should be done such that the specified band is preferred.
+++ * When there are multiple BSS-es in the preferred band, the driver
+++ * shall use RSSI-based BSS selection as a second step. The value of
+++ * this attribute is according to &enum nl80211_band (u32).
+++ * @NL80211_BSS_SELECT_ATTR_RSSI_ADJUST: When present the RSSI level for
+++ * BSS-es in the specified band is to be adjusted before doing
+++ * RSSI-based BSS selection. The attribute value is a packed structure
+++ * value as specified by &struct nl80211_bss_select_rssi_adjust.
+++ * @NL80211_BSS_SELECT_ATTR_MAX: highest bss select attribute number.
+++ * @__NL80211_BSS_SELECT_ATTR_AFTER_LAST: internal use.
+++ *
+++ * One and only one of these attributes are found within %NL80211_ATTR_BSS_SELECT
+++ * for %NL80211_CMD_CONNECT. It specifies the required BSS selection behaviour
+++ * which the driver shall use.
+++ */
+++enum nl80211_bss_select_attr {
+++ __NL80211_BSS_SELECT_ATTR_INVALID,
+++ NL80211_BSS_SELECT_ATTR_RSSI,
+++ NL80211_BSS_SELECT_ATTR_BAND_PREF,
+++ NL80211_BSS_SELECT_ATTR_RSSI_ADJUST,
+++
+++ /* keep last */
+++ __NL80211_BSS_SELECT_ATTR_AFTER_LAST,
+++ NL80211_BSS_SELECT_ATTR_MAX = __NL80211_BSS_SELECT_ATTR_AFTER_LAST - 1
+++};
+++
+ #endif /* __LINUX_NL80211_H */
+diff --git a/package/network/utils/iw/patches/300-display_interface_TX_power.patch b/package/network/utils/iw/patches/300-display_interface_TX_power.patch
+index 574c490..2cdf360 100644
+--- a/package/network/utils/iw/patches/300-display_interface_TX_power.patch
++++ b/package/network/utils/iw/patches/300-display_interface_TX_power.patch
+@@ -12,11 +12,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+ interface.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+-diff --git a/interface.c b/interface.c
+-index 73ccecd..4f0821d 100644
+ --- a/interface.c
+ +++ b/interface.c
+-@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl_msg *msg, void *arg)
++@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl
+ printf("\n");
+ }
+
+diff --git a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
+index 709fbb2..0627bcc 100644
+--- a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
++++ b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
+@@ -14,8 +14,6 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+ ibss.c | 49 +++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 41 insertions(+), 8 deletions(-)
+
+-diff --git a/ibss.c b/ibss.c
+-index 7a0b707..a99a262 100644
+ --- a/ibss.c
+ +++ b/ibss.c
+ @@ -16,6 +16,39 @@
+@@ -58,7 +56,7 @@ index 7a0b707..a99a262 100644
+ static int join_ibss(struct nl80211_state *state,
+ struct nl_msg *msg,
+ int argc, char **argv,
+-@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_state *state,
++@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_stat
+ int bintval;
+ int i;
+ unsigned long freq;
+@@ -73,7 +71,7 @@ index 7a0b707..a99a262 100644
+ { .name = "HT20",
+ .width = NL80211_CHAN_WIDTH_20,
+ .freq1_diff = 0,
+-@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_state *state,
++@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_stat
+ .width = NL80211_CHAN_WIDTH_10,
+ .freq1_diff = 0,
+ .chantype = -1 },
+@@ -84,7 +82,7 @@ index 7a0b707..a99a262 100644
+ };
+
+ if (argc < 2)
+-@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_state *state,
++@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_stat
+ NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
+ chanmode_selected->width);
+ NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
+diff --git a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
+index fc44427..f96d5ea 100644
+--- a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
++++ b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
+@@ -7,11 +7,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+ ibss.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+-diff --git a/ibss.c b/ibss.c
+-index a99a262..23bda70 100644
+ --- a/ibss.c
+ +++ b/ibss.c
+-@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_state *state,
++@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_stat
+ .width = NL80211_CHAN_WIDTH_20_NOHT,
+ .freq1_diff = 0,
+ .chantype = NL80211_CHAN_NO_HT },
+diff --git a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
+index fe8dc21..956b050 100644
+--- a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
++++ b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
+@@ -15,8 +15,6 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
+ util.c | 26 ++++++++++++++++++++++++++
+ 4 files changed, 43 insertions(+), 41 deletions(-)
+
+-diff --git a/ibss.c b/ibss.c
+-index 23bda70..ac06fc5 100644
+ --- a/ibss.c
+ +++ b/ibss.c
+ @@ -16,39 +16,6 @@
+@@ -59,8 +57,6 @@ index 23bda70..ac06fc5 100644
+ static int join_ibss(struct nl80211_state *state,
+ struct nl_msg *msg,
+ int argc, char **argv,
+-diff --git a/iw.h b/iw.h
+-index cef9da8..8e1a37a 100644
+ --- a/iw.h
+ +++ b/iw.h
+ @@ -59,6 +59,13 @@ struct cmd {
+@@ -77,7 +73,7 @@ index cef9da8..8e1a37a 100644
+ #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
+ #define DIV_ROUND_UP(x, y) (((x) + (y - 1)) / (y))
+
+-@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ielen, bool unknown,
++@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ie
+ void parse_bitrate(struct nlattr *bitrate_attr, char *buf, int buflen);
+ void iw_hexdump(const char *prefix, const __u8 *data, size_t len);
+
+@@ -86,11 +82,9 @@ index cef9da8..8e1a37a 100644
+ #define SCHED_SCAN_OPTIONS "interval <in_msecs> [delay <in_secs>] " \
+ "[freqs <freq>+] [matches [ssid <ssid>]+]] [active [ssid <ssid>]+|passive] [randomise[=<addr>/<mask>]]"
+ int parse_sched_scan(struct nl_msg *msg, int *argc, char ***argv);
+-diff --git a/mesh.c b/mesh.c
+-index 0090530..930d58f 100644
+ --- a/mesh.c
+ +++ b/mesh.c
+-@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_state *state,
++@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_stat
+ int bintval, dtim_period, i, n_rates = 0;
+ char *end, *value = NULL, *sptr = NULL;
+ unsigned long freq = 0;
+@@ -105,7 +99,7 @@ index 0090530..930d58f 100644
+ { .name = "HT20",
+ .width = NL80211_CHAN_WIDTH_20,
+ .freq1_diff = 0,
+-@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_state *state,
++@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_stat
+ .width = NL80211_CHAN_WIDTH_20_NOHT,
+ .freq1_diff = 0,
+ .chantype = NL80211_CHAN_NO_HT },
+@@ -116,7 +110,7 @@ index 0090530..930d58f 100644
+ };
+
+ if (argc < 1)
+-@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_state *state,
++@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_stat
+ NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
+ chanmode_selected->width);
+ NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
+@@ -125,7 +119,7 @@ index 0090530..930d58f 100644
+ if (chanmode_selected->chantype != -1)
+ NLA_PUT_U32(msg,
+ NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+-@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_state *state,
++@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_stat
+ nla_put_failure:
+ return -ENOBUFS;
+ }
+@@ -134,11 +128,9 @@ index 0090530..930d58f 100644
+ " [basic-rates <rate in Mbps,rate2,...>]], [mcast-rate <rate in Mbps>]"
+ " [beacon-interval <time in TUs>] [dtim-period <value>]"
+ " [vendor_sync on|off] [<param>=<value>]*",
+-diff --git a/util.c b/util.c
+-index 4efc4c8..d75ffe0 100644
+ --- a/util.c
+ +++ b/util.c
+-@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, const __u8 *buf, size_t size)
++@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, cons
+ }
+ printf("\n\n");
+ }
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
+index d382453..20bb06e 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
++++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
+@@ -39,6 +39,18 @@ __init void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin)
+ }
+ }
+
++__init void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name)
++{
++ switch (wmac) {
++ case 0:
++ ap9x_wmac0_data.led_name = led_name;
++ break;
++ case 1:
++ ap9x_wmac1_data.led_name = led_name;
++ break;
++ }
++}
++
+ __init struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
+ {
+ switch (wmac) {
+@@ -81,6 +93,20 @@ __init void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
+ }
+ }
+
++__init void ap9x_pci_setup_wmac_btns(unsigned wmac,
++ struct gpio_keys_button *btns,
++ unsigned num_btns, unsigned poll_interval)
++{
++ struct ath9k_platform_data *ap9x_wmac_data;
++
++ if (!(ap9x_wmac_data = ap9x_pci_get_wmac_data(wmac)))
++ return;
++
++ ap9x_wmac_data->btns = btns;
++ ap9x_wmac_data->num_btns = num_btns;
++ ap9x_wmac_data->btn_poll_interval = poll_interval;
++}
++
+ static int ap91_pci_plat_dev_init(struct pci_dev *dev)
+ {
+ switch (PCI_SLOT(dev->devfn)) {
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
+index ad288cb..d7c0185 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
++++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
+@@ -12,6 +12,7 @@
+ #define _ATH79_DEV_AP9X_PCI_H
+
+ struct gpio_led;
++struct gpio_keys_button;
+ struct ath9k_platform_data;
+
+ #if defined(CONFIG_ATH79_DEV_AP9X_PCI)
+@@ -19,6 +20,9 @@ void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin);
+ void ap9x_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val);
+ void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
+ int num_leds);
++void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name);
++void ap9x_pci_setup_wmac_btns(unsigned wmac, struct gpio_keys_button *btns,
++ unsigned num_btns, unsigned poll_interval);
+ struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac);
+
+ void ap91_pci_init(u8 *cal_data, u8 *mac_addr);
+@@ -33,6 +37,12 @@ static inline void ap9x_pci_setup_wmac_gpio(unsigned wmac,
+ static inline void ap9x_pci_setup_wmac_leds(unsigned wmac,
+ struct gpio_led *leds,
+ int num_leds) {}
++static inline void ap9x_pci_setup_wmac_led_name(unsigned wmac,
++ const char *led_name) {}
++static inline void ap9x_pci_setup_wmac_btns(unsigned wmac,
++ struct gpio_keys_button *btns,
++ unsigned num_btns,
++ unsigned poll_interval) {}
+ static inline struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
+ {
+ return NULL;
+diff --git a/target/linux/generic/files/include/linux/ath9k_platform.h b/target/linux/generic/files/include/linux/ath9k_platform.h
+index 30ce216..2c19f3b 100644
+--- a/target/linux/generic/files/include/linux/ath9k_platform.h
++++ b/target/linux/generic/files/include/linux/ath9k_platform.h
+@@ -31,6 +31,10 @@ struct ath9k_platform_data {
+ u32 gpio_mask;
+ u32 gpio_val;
+
++ u32 bt_active_pin;
++ u32 bt_priority_pin;
++ u32 wlan_active_pin;
++
+ bool endian_check;
+ bool is_clk_25mhz;
+ bool tx_gain_buffalo;
+@@ -45,6 +49,11 @@ struct ath9k_platform_data {
+
+ int num_leds;
+ const struct gpio_led *leds;
++ const char *led_name;
++
++ unsigned num_btns;
++ const struct gpio_keys_button *btns;
++ unsigned btn_poll_interval;
+ };
+
+ #endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch b/patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
index 7586d3a27..4d5e1b86d 100644
--- a/patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
+++ b/patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
@@ -4,15 +4,15 @@ Subject: mac80211: ath10k: allow simultaneous AP+IBSS
diff --git a/package/kernel/mac80211/patches/950-ath10k_AP_IBSS.patch b/package/kernel/mac80211/patches/950-ath10k_AP_IBSS.patch
new file mode 100644
-index 0000000..33b3110
+index 0000000..956c3fd
--- /dev/null
+++ b/package/kernel/mac80211/patches/950-ath10k_AP_IBSS.patch
@@ -0,0 +1,32 @@
+--- a/drivers/net/wireless/ath/ath10k/mac.c
++++ b/drivers/net/wireless/ath/ath10k/mac.c
-+@@ -5264,6 +5264,10 @@ static const struct ieee80211_iface_limi
-+ .max = 7,
-+ .types = BIT(NL80211_IFTYPE_AP)
++@@ -7521,6 +7521,10 @@ static const struct ieee80211_iface_limi
++ | BIT(NL80211_IFTYPE_MESH_POINT)
++ #endif
+ },
++ {
++ .max = 1,
@@ -21,9 +21,9 @@ index 0000000..33b3110
+ };
+
+ static const struct ieee80211_iface_limit ath10k_10x_if_limits[] = {
-+@@ -5271,6 +5275,10 @@ static const struct ieee80211_iface_limi
-+ .max = 8,
-+ .types = BIT(NL80211_IFTYPE_AP)
++@@ -7535,6 +7539,10 @@ static const struct ieee80211_iface_limi
++ .max = 1,
++ .types = BIT(NL80211_IFTYPE_STATION)
+ },
++ {
++ .max = 1,
@@ -32,11 +32,11 @@ index 0000000..33b3110
+ };
+
+ static const struct ieee80211_iface_combination ath10k_if_comb[] = {
-+@@ -5575,6 +5583,7 @@ int ath10k_mac_register(struct ath10k *a
++@@ -7920,6 +7928,7 @@ int ath10k_mac_register(struct ath10k *a
+ ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;
+ ar->hw->wiphy->n_iface_combinations =
+ ARRAY_SIZE(ath10k_10x_if_comb);
++ ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
+ break;
-+ case ATH10K_FW_WMI_OP_VERSION_UNSET:
-+ case ATH10K_FW_WMI_OP_VERSION_MAX:
++ case ATH10K_FW_WMI_OP_VERSION_10_4:
++ ar->hw->wiphy->iface_combinations = ath10k_10_4_if_comb;
diff --git a/patches/openwrt/0086-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch b/patches/openwrt/0080-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
similarity index 89%
rename from patches/openwrt/0086-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
rename to patches/openwrt/0080-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
index ba7ef4194..61ec3d627 100644
--- a/patches/openwrt/0086-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
+++ b/patches/openwrt/0080-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
@@ -6,10 +6,10 @@ Patch-by: Stefan Rompf <stefan@loplof.de>
diff --git a/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch b/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch
new file mode 100644
-index 0000000..14d63f1
+index 0000000..8e09fee
--- /dev/null
+++ b/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch
-@@ -0,0 +1,346 @@
+@@ -0,0 +1,349 @@
+--- a/drivers/net/wireless/ath/ath9k/channel.c
++++ b/drivers/net/wireless/ath/ath9k/channel.c
+@@ -15,6 +15,8 @@
@@ -43,7 +43,7 @@ index 0000000..14d63f1
+ ath_update_survey_stats(sc);
+--- /dev/null
++++ b/drivers/net/wireless/ath/ath9k/hsr.c
-+@@ -0,0 +1,220 @@
++@@ -0,0 +1,223 @@
++/*
++ *
++ * The MIT License (MIT)
@@ -95,10 +95,13 @@ index 0000000..14d63f1
++
++
++void hsr_init(struct ath_hw* ah) {
-++ ath9k_hw_cfg_gpio_input(ah, HSR_GPIO_DIN);
-++ ath9k_hw_cfg_output(ah, HSR_GPIO_CSN, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++ ath9k_hw_cfg_output(ah, HSR_GPIO_CLK, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++ ath9k_hw_cfg_output(ah, HSR_GPIO_DOUT, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+++ ath9k_hw_gpio_request_in(ah, HSR_GPIO_DIN, NULL);
+++ ath9k_hw_gpio_request_out(ah, HSR_GPIO_CSN, NULL,
+++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+++ ath9k_hw_gpio_request_out(ah, HSR_GPIO_CLK, NULL,
+++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+++ ath9k_hw_gpio_request_out(ah, HSR_GPIO_DOUT, NULL,
+++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
++
++ ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 1);
++ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
@@ -321,9 +324,9 @@ index 0000000..14d63f1
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;
-+@@ -730,6 +733,11 @@ static int ath9k_start(struct ieee80211_
++@@ -727,6 +730,11 @@ static int ath9k_start(struct ieee80211_
++ ath9k_hw_set_gpio(ah, ah->led_pin,
+ (ah->config.led_active_high) ? 1 : 0);
-+ }
+
++ if (pdata && pdata->ubnt_hsr) {
++ hsr_init(ah);
@@ -347,7 +350,7 @@ index 0000000..14d63f1
+ ath9k-$(CPTCFG_ATH9K_PCI) += pci.o
+--- a/include/linux/ath9k_platform.h
++++ b/include/linux/ath9k_platform.h
-+@@ -50,6 +50,8 @@ struct ath9k_platform_data {
++@@ -54,6 +54,8 @@ struct ath9k_platform_data {
+ unsigned num_btns;
+ const struct gpio_keys_button *btns;
+ unsigned btn_poll_interval;
@@ -368,16 +371,25 @@ index 7803513..d865ed2 100644
+ ap91_pci_init(ee, NULL);
+
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_plus_leds_gpio),
-diff --git a/target/linux/generic/files/include/linux/ath9k_platform.h b/target/linux/generic/files/include/linux/ath9k_platform.h
-index e543a64..2cb0288 100644
---- a/target/linux/generic/files/include/linux/ath9k_platform.h
-+++ b/target/linux/generic/files/include/linux/ath9k_platform.h
-@@ -50,6 +50,8 @@ struct ath9k_platform_data {
- unsigned num_btns;
- const struct gpio_keys_button *btns;
- unsigned btn_poll_interval;
+diff --git a/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch b/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch
+new file mode 100644
+index 0000000..b8844f1
+--- /dev/null
++++ b/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch
+@@ -0,0 +1,16 @@
++Flag that this platform is an Ubiquiti UniFi Outdoor Plus
++containing a RF filter in ath9k's receive path.
+
-+ bool ubnt_hsr;
- };
-
- #endif /* _LINUX_ATH9K_PLATFORM_H */
++Signed-off-by: Stefan Rompf <stefan@loplof.de>
++
++--- a/include/linux/ath9k_platform.h
+++++ b/include/linux/ath9k_platform.h
++@@ -54,6 +54,8 @@ struct ath9k_platform_data {
++ unsigned num_btns;
++ const struct gpio_keys_button *btns;
++ unsigned btn_poll_interval;
+++
+++ bool ubnt_hsr;
++ };
++
++ #endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/patches/openwrt/0080-mac80211-ath9k-enable-platform-WLAN-LED-name.patch b/patches/openwrt/0080-mac80211-ath9k-enable-platform-WLAN-LED-name.patch
deleted file mode 100644
index e3604a4ad..000000000
--- a/patches/openwrt/0080-mac80211-ath9k-enable-platform-WLAN-LED-name.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 12:56:43 +0200
-Subject: mac80211: ath9k: enable platform WLAN LED name
-
-Enable platform-supplied WLAN LED name for ath9k device.
-
-Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-Acked-by: Hartmut Knaack <knaack.h@gmx.de>
-
-Backport of r48879
-
-diff --git a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
-new file mode 100644
-index 0000000..8d2d899
---- /dev/null
-+++ b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
-@@ -0,0 +1,48 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Date: Sun, 31 Jan 2016 20:45:57 +0100
-+Subject: [PATCH v4 1/8] mac80211: ath9k: enable platform WLAN LED name
-+
-+Enable platform-supplied WLAN LED name for ath9k device. It replaces generic
-+'ath9k-phy*' label with string set during platform initialization.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+---
-+ drivers/net/wireless/ath/ath9k/gpio.c | 10 +++++++---
-+ include/linux/ath9k_platform.h | 1 +
-+ 2 files changed, 8 insertions(+), 3 deletions(-)
-+
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -132,15 +132,19 @@ void ath_init_leds(struct ath_softc *sc)
-+ if (AR_SREV_9100(sc->sc_ah))
-+ return;
-+
-+- snprintf(led_name, sizeof(led_name), "ath9k-%s",
-+- wiphy_name(sc->hw->wiphy));
-++ if (pdata && pdata->led_name)
-++ strncpy(led_name, pdata->led_name, sizeof(led_name));
-++ else
-++ snprintf(led_name, sizeof(led_name), "ath9k-%s",
-++ wiphy_name(sc->hw->wiphy));
-+
-+ if (ath9k_led_blink)
-+ trigger = sc->led_default_trigger;
-+ else
-+ trigger = ieee80211_get_radio_led_name(sc->hw);
-+
-+- ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high);
-++ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-++ !sc->sc_ah->config.led_active_high);
-+
-+ if (!pdata)
-+ return;
-+--- a/include/linux/ath9k_platform.h
-++++ b/include/linux/ath9k_platform.h
-+@@ -45,6 +45,7 @@ struct ath9k_platform_data {
-+
-+ int num_leds;
-+ const struct gpio_led *leds;
-++ const char *led_name;
-+ };
-+
-+ #endif /* _LINUX_ATH9K_PLATFORM_H */
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-index d382453..bf80d4d 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-@@ -39,6 +39,18 @@ __init void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin)
- }
- }
-
-+__init void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name)
-+{
-+ switch (wmac) {
-+ case 0:
-+ ap9x_wmac0_data.led_name = led_name;
-+ break;
-+ case 1:
-+ ap9x_wmac1_data.led_name = led_name;
-+ break;
-+ }
-+}
-+
- __init struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
- {
- switch (wmac) {
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-index ad288cb..dcfe541 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-@@ -19,6 +19,7 @@ void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin);
- void ap9x_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val);
- void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
- int num_leds);
-+void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name);
- struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac);
-
- void ap91_pci_init(u8 *cal_data, u8 *mac_addr);
-@@ -33,6 +34,8 @@ static inline void ap9x_pci_setup_wmac_gpio(unsigned wmac,
- static inline void ap9x_pci_setup_wmac_leds(unsigned wmac,
- struct gpio_led *leds,
- int num_leds) {}
-+static inline void ap9x_pci_setup_wmac_led_name(unsigned wmac,
-+ const char *led_name) {}
- static inline struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
- {
- return NULL;
-diff --git a/target/linux/generic/files/include/linux/ath9k_platform.h b/target/linux/generic/files/include/linux/ath9k_platform.h
-index 30ce216..823e5ac 100644
---- a/target/linux/generic/files/include/linux/ath9k_platform.h
-+++ b/target/linux/generic/files/include/linux/ath9k_platform.h
-@@ -45,6 +45,7 @@ struct ath9k_platform_data {
-
- int num_leds;
- const struct gpio_led *leds;
-+ const char *led_name;
- };
-
- #endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/patches/openwrt/0087-ar71xx-Send-power-to-USB-port-on-WNR2200.patch b/patches/openwrt/0081-ar71xx-Send-power-to-USB-port-on-WNR2200.patch
similarity index 100%
rename from patches/openwrt/0087-ar71xx-Send-power-to-USB-port-on-WNR2200.patch
rename to patches/openwrt/0081-ar71xx-Send-power-to-USB-port-on-WNR2200.patch
diff --git a/patches/openwrt/0081-mac80211-ath9k-set-default-state-for-platform-LEDs.patch b/patches/openwrt/0081-mac80211-ath9k-set-default-state-for-platform-LEDs.patch
deleted file mode 100644
index 0c49ef879..000000000
--- a/patches/openwrt/0081-mac80211-ath9k-set-default-state-for-platform-LEDs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 13:37:28 +0200
-Subject: mac80211: ath9k: set default state for platform LEDs
-
-Support default state for platform LEDs connected to ath9k device.
-Now LEDs are correctly set on or off at ath9k module initialization.
-
-Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-Acked-by: Hartmut Knaack <knaack.h@gmx.de>
-
-Backport of r48880
-
-diff --git a/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
-new file mode 100644
-index 0000000..db0b619
---- /dev/null
-+++ b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
-@@ -0,0 +1,29 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Date: Sun, 31 Jan 2016 20:48:49 +0100
-+Subject: [PATCH v4 2/8] mac80211: ath9k: set default state for platform LEDs
-+
-+Support default state for platform LEDs connected to ath9k device.
-+Now LEDs are correctly set on or off at ath9k module initialization.
-+Very useful if power LED is connected to wireless chip.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+---
-+ gpio.c | 7 +++++--
-+ 1 file changed, 5 insertions(+), 2 deletions(-)
-+
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -54,8 +54,11 @@ static int ath_add_led(struct ath_softc
-+ ath9k_hw_cfg_output(sc->sc_ah, gpio->gpio,
-+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-+
-+- /* LED off */
-+- ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
-++ /* Set default LED state */
-++ if (gpio->default_state == LEDS_GPIO_DEFSTATE_ON)
-++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, !gpio->active_low);
-++ else
-++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
-+
-+ return 0;
-+ }
diff --git a/patches/openwrt/0088-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch b/patches/openwrt/0082-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch
similarity index 100%
rename from patches/openwrt/0088-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch
rename to patches/openwrt/0082-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch
diff --git a/patches/openwrt/0082-mac80211-ath9k-enable-access-to-GPIO.patch b/patches/openwrt/0082-mac80211-ath9k-enable-access-to-GPIO.patch
deleted file mode 100644
index dddcadd66..000000000
--- a/patches/openwrt/0082-mac80211-ath9k-enable-access-to-GPIO.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 13:37:59 +0200
-Subject: mac80211: ath9k: enable access to GPIO
-
-Enable access to GPIO chip and its pins for Atheros AR92xx
-wireless devices. For now AR9285 and AR9287 are supported.
-
-Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-Acked-by: Hartmut Knaack <knaack.h@gmx.de>
-
-Backport of r48881
-
-diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch
-new file mode 100644
-index 0000000..beee169
---- /dev/null
-+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch
-@@ -0,0 +1,243 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Date: Sun, 31 Jan 2016 21:01:31 +0100
-+Subject: [PATCH v4 4/8] mac80211: ath9k: enable access to GPIO
-+
-+Enable access to GPIO chip and its pins for Atheros AR92xx
-+wireless devices. For now AR9285 and AR9287 are supported.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+---
-+ ath9k.h | 23 ++++++++++++
-+ gpio.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ init.c | 2 +
-+ 3 files changed, 146 insertions(+)
-+
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -24,6 +24,7 @@
-+ #include <linux/completion.h>
-+ #include <linux/time.h>
-+ #include <linux/hw_random.h>
-++#include <linux/gpio/driver.h>
-+
-+ #include "common.h"
-+ #include "debug.h"
-+@@ -817,6 +818,13 @@ void ath_fill_led_pin(struct ath_softc *
-+ int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
-+ const char *trigger, bool active_low);
-+
-++/***************/
-++/* GPIO Chip */
-++/***************/
-++
-++void ath9k_register_gpio_chip(struct ath_softc *sc);
-++void ath9k_unregister_gpio_chip(struct ath_softc *sc);
-++
-+ #else
-+ static inline void ath_init_leds(struct ath_softc *sc)
-+ {
-+@@ -828,6 +836,14 @@ static inline void ath_deinit_leds(struc
-+ static inline void ath_fill_led_pin(struct ath_softc *sc)
-+ {
-+ }
-++
-++static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-++{
-++}
-++
-++static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-++{
-++}
-+ #endif
-+
-+ /************************/
-+@@ -963,6 +979,12 @@ struct ath_led {
-+ struct led_classdev cdev;
-+ };
-+
-++struct ath9k_gpio_chip {
-++ struct ath_softc *sc;
-++ char label[32];
-++ struct gpio_chip gchip;
-++};
-++
-+ struct ath_softc {
-+ struct ieee80211_hw *hw;
-+ struct device *dev;
-+@@ -1017,6 +1039,7 @@ struct ath_softc {
-+ #ifdef CPTCFG_MAC80211_LEDS
-+ const char *led_default_trigger;
-+ struct list_head leds;
-++ struct ath9k_gpio_chip *gpiochip;
-+ #endif
-+
-+ #ifdef CPTCFG_ATH9K_DEBUGFS
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -22,6 +22,9 @@
-+ /********************************/
-+
-+ #ifdef CPTCFG_MAC80211_LEDS
-++
-++#include <asm-generic/gpio.h>
-++
-+ static void ath_led_brightness(struct led_classdev *led_cdev,
-+ enum led_brightness brightness)
-+ {
-+@@ -60,6 +63,10 @@ static int ath_add_led(struct ath_softc
-+ else
-+ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
-+
-++ /* If there is GPIO chip configured, reserve LED pin */
-++ if (sc->gpiochip)
-++ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
-++
-+ return 0;
-+ }
-+
-+@@ -116,6 +123,9 @@ void ath_deinit_leds(struct ath_softc *s
-+
-+ while (!list_empty(&sc->leds)) {
-+ led = list_first_entry(&sc->leds, struct ath_led, list);
-++ /* If there is GPIO chip configured, free LED pin */
-++ if (sc->gpiochip)
-++ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
-+ list_del(&led->list);
-+ ath_led_brightness(&led->cdev, LED_OFF);
-+ led_classdev_unregister(&led->cdev);
-+@@ -186,6 +196,117 @@ void ath_fill_led_pin(struct ath_softc *
-+ /* LED off, active low */
-+ ath9k_hw_set_gpio(ah, ah->led_pin, (ah->config.led_active_high) ? 0 : 1);
-+ }
-++
-++/***************/
-++/* GPIO Chip */
-++/***************/
-++
-++/* gpio_chip handler : set GPIO to input */
-++static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_cfg_gpio_input(gc->sc->sc_ah, offset);
-++
-++ return 0;
-++}
-++
-++/* gpio_chip handler : set GPIO to output */
-++static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
-++ int value)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_cfg_output(gc->sc->sc_ah, offset,
-++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
-++
-++ return 0;
-++}
-++
-++/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
-++static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++ struct ath_hw *ah = gc->sc->sc_ah;
-++
-++ return !((REG_READ(ah, AR_GPIO_OE_OUT) >> (offset * 2)) & 3);
-++}
-++
-++/* gpio_chip handler : get GPIO pin value */
-++static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
-++}
-++
-++/* gpio_chip handler : set GPIO pin to value */
-++static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
-++ int value)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
-++}
-++
-++/* register GPIO chip */
-++void ath9k_register_gpio_chip(struct ath_softc *sc)
-++{
-++ struct ath9k_gpio_chip *gc;
-++ u16 ng;
-++
-++ /* for now only AR9285 and AR9287 are recognized */
-++ if (AR_SREV_9287(sc->sc_ah))
-++ ng = AR9287_NUM_GPIO;
-++ else if (AR_SREV_9285(sc->sc_ah))
-++ ng = AR9285_NUM_GPIO;
-++ else
-++ return;
-++
-++ gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
-++ if (!gc)
-++ return;
-++
-++ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
-++ wiphy_name(sc->hw->wiphy));
-++ gc->gchip.label = gc->label;
-++ gc->gchip.base = -1; /* determine base automatically */
-++ gc->gchip.ngpio = ng;
-++ gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
-++ gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
-++ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
-++ gc->gchip.get = ath9k_gpio_pin_get;
-++ gc->gchip.set = ath9k_gpio_pin_set;
-++ gc->gchip.owner = THIS_MODULE;
-++
-++ if (gpiochip_add(&gc->gchip)) {
-++ kfree(gc);
-++ return;
-++ }
-++
-++ sc->gpiochip = gc;
-++ gc->sc = sc;
-++}
-++
-++/* remove GPIO chip */
-++void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-++{
-++ struct ath9k_gpio_chip *gc = sc->gpiochip;
-++
-++ if (!gc)
-++ return;
-++
-++ gpiochip_remove(&gc->gchip);
-++ kfree(gc);
-++ sc->gpiochip = NULL;
-++}
-++
-+ #endif
-+
-+ /*******************/
-+--- a/drivers/net/wireless/ath/ath9k/init.c
-++++ b/drivers/net/wireless/ath/ath9k/init.c
-+@@ -979,6 +979,7 @@ int ath9k_init_device(u16 devid, struct
-+ goto debug_cleanup;
-+ }
-+
-++ ath9k_register_gpio_chip(sc);
-+ ath_init_leds(sc);
-+ ath_start_rfkill_poll(sc);
-+
-+@@ -1026,6 +1027,7 @@ void ath9k_deinit_device(struct ath_soft
-+
-+ wiphy_rfkill_stop_polling(sc->hw->wiphy);
-+ ath_deinit_leds(sc);
-++ ath9k_unregister_gpio_chip(sc);
-+
-+ ath9k_ps_restore(sc);
-+
diff --git a/patches/openwrt/0089-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch b/patches/openwrt/0083-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch
similarity index 100%
rename from patches/openwrt/0089-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch
rename to patches/openwrt/0083-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch
diff --git a/patches/openwrt/0083-mac80211-refresh-patch.patch b/patches/openwrt/0083-mac80211-refresh-patch.patch
deleted file mode 100644
index 79e409c9a..000000000
--- a/patches/openwrt/0083-mac80211-refresh-patch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 13:38:19 +0200
-Subject: mac80211: refresh patch
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of r48882
-
-diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch
-index beee169..55bb991 100644
---- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch
-+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch
-@@ -225,7 +225,7 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- /*******************/
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -979,6 +979,7 @@ int ath9k_init_device(u16 devid, struct
-+@@ -975,6 +975,7 @@ int ath9k_init_device(u16 devid, struct
- goto debug_cleanup;
- }
-
-@@ -233,7 +233,7 @@ Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- ath_init_leds(sc);
- ath_start_rfkill_poll(sc);
-
--@@ -1026,6 +1027,7 @@ void ath9k_deinit_device(struct ath_soft
-+@@ -1022,6 +1023,7 @@ void ath9k_deinit_device(struct ath_soft
-
- wiphy_rfkill_stop_polling(sc->hw->wiphy);
- ath_deinit_leds(sc);
diff --git a/patches/openwrt/0090-ar71xx-add-GL-AR150-support.patch b/patches/openwrt/0084-ar71xx-add-GL-AR150-support.patch
similarity index 100%
rename from patches/openwrt/0090-ar71xx-add-GL-AR150-support.patch
rename to patches/openwrt/0084-ar71xx-add-GL-AR150-support.patch
diff --git a/patches/openwrt/0084-mac80211-ath9k-enable-GPIO-buttons.patch b/patches/openwrt/0084-mac80211-ath9k-enable-GPIO-buttons.patch
deleted file mode 100644
index f2eb5bc6b..000000000
--- a/patches/openwrt/0084-mac80211-ath9k-enable-GPIO-buttons.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 13:38:45 +0200
-Subject: mac80211: ath9k: enable GPIO buttons
-
-Enable platform-defined GPIO button support for ath9k device.
-Key poller is activated for attached platform buttons.
-Requires ath9k GPIO chip access.
-
-Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-
-Backport of r48921
-
-diff --git a/package/kernel/mac80211/patches/550-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/550-ath9k_enable_gpio_buttons.patch
-new file mode 100644
-index 0000000..e3a8cec
---- /dev/null
-+++ b/package/kernel/mac80211/patches/550-ath9k_enable_gpio_buttons.patch
-@@ -0,0 +1,169 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Subject: [PATCH v5 5/8] mac80211: ath9k: enable GPIO buttons
-+
-+Enable platform-defined GPIO button support for ath9k device.
-+Key poller is activated for attached platform buttons.
-+Requires ath9k GPIO chip access.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+---
-+ drivers/net/wireless/ath/ath9k/ath9k.h | 16 ++++++
-+ drivers/net/wireless/ath/ath9k/gpio.c | 77 +++++++++++++++++++++++++++++++++
-+ drivers/net/wireless/ath/ath9k/init.c | 2
-+ include/linux/ath9k_platform.h | 4 +
-+ 4 files changed, 99 insertions(+)
-+
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -825,6 +825,13 @@ int ath_create_gpio_led(struct ath_softc
-+ void ath9k_register_gpio_chip(struct ath_softc *sc);
-+ void ath9k_unregister_gpio_chip(struct ath_softc *sc);
-+
-++/******************/
-++/* GPIO Buttons */
-++/******************/
-++
-++void ath9k_init_buttons(struct ath_softc *sc);
-++void ath9k_deinit_buttons(struct ath_softc *sc);
-++
-+ #else
-+ static inline void ath_init_leds(struct ath_softc *sc)
-+ {
-+@@ -844,6 +851,14 @@ static inline void ath9k_register_gpio_c
-+ static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-+ {
-+ }
-++
-++static inline void ath9k_init_buttons(struct ath_softc *sc)
-++{
-++}
-++
-++static inline void ath9k_deinit_buttons(struct ath_softc *sc)
-++{
-++}
-+ #endif
-+
-+ /************************/
-+@@ -1040,6 +1055,7 @@ struct ath_softc {
-+ const char *led_default_trigger;
-+ struct list_head leds;
-+ struct ath9k_gpio_chip *gpiochip;
-++ struct platform_device *btnpdev; /* gpio-keys-polled */
-+ #endif
-+
-+ #ifdef CPTCFG_ATH9K_DEBUGFS
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -24,6 +24,8 @@
-+ #ifdef CPTCFG_MAC80211_LEDS
-+
-+ #include <asm-generic/gpio.h>
-++#include <linux/platform_device.h>
-++#include <linux/gpio_keys.h>
-+
-+ static void ath_led_brightness(struct led_classdev *led_cdev,
-+ enum led_brightness brightness)
-+@@ -159,7 +161,7 @@ void ath_init_leds(struct ath_softc *sc)
-+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-+ !sc->sc_ah->config.led_active_high);
-+
-+- if (!pdata)
-++ if (!pdata || !pdata->leds || !pdata->num_leds)
-+ return;
-+
-+ for (i = 0; i < pdata->num_leds; i++)
-+@@ -307,6 +309,63 @@ void ath9k_unregister_gpio_chip(struct a
-+ sc->gpiochip = NULL;
-+ }
-+
-++/******************/
-++/* GPIO Buttons */
-++/******************/
-++
-++/* add GPIO buttons */
-++void ath9k_init_buttons(struct ath_softc *sc)
-++{
-++ struct ath9k_platform_data *pdata = sc->dev->platform_data;
-++ struct platform_device *pdev;
-++ struct gpio_keys_platform_data gkpdata;
-++ struct gpio_keys_button *bt;
-++ int i;
-++
-++ if (!sc->gpiochip)
-++ return;
-++
-++ if (!pdata || !pdata->btns || !pdata->num_btns)
-++ return;
-++
-++ bt = devm_kmemdup(sc->dev, pdata->btns,
-++ pdata->num_btns * sizeof(struct gpio_keys_button),
-++ GFP_KERNEL);
-++ if (!bt)
-++ return;
-++
-++ for (i = 0; i < pdata->num_btns; i++) {
-++ ath9k_hw_cfg_gpio_input(sc->sc_ah, pdata->btns[i].gpio);
-++ bt[i].gpio = sc->gpiochip->gchip.base + pdata->btns[i].gpio;
-++ }
-++
-++ memset(&gkpdata, 0, sizeof(struct gpio_keys_platform_data));
-++ gkpdata.buttons = bt;
-++ gkpdata.nbuttons = pdata->num_btns;
-++ gkpdata.poll_interval = pdata->btn_poll_interval;
-++
-++ pdev = platform_device_register_data(sc->dev, "gpio-keys-polled",
-++ PLATFORM_DEVID_AUTO, &gkpdata,
-++ sizeof(gkpdata));
-++ if (!IS_ERR_OR_NULL(pdev))
-++ sc->btnpdev = pdev;
-++ else {
-++ sc->btnpdev = NULL;
-++ devm_kfree(sc->dev, bt);
-++ }
-++}
-++
-++/* remove GPIO buttons */
-++void ath9k_deinit_buttons(struct ath_softc *sc)
-++{
-++ if (!sc->gpiochip || !sc->btnpdev)
-++ return;
-++
-++ platform_device_unregister(sc->btnpdev);
-++
-++ sc->btnpdev = NULL;
-++}
-++
-+ #endif
-+
-+ /*******************/
-+--- a/drivers/net/wireless/ath/ath9k/init.c
-++++ b/drivers/net/wireless/ath/ath9k/init.c
-+@@ -977,6 +977,7 @@ int ath9k_init_device(u16 devid, struct
-+
-+ ath9k_register_gpio_chip(sc);
-+ ath_init_leds(sc);
-++ ath9k_init_buttons(sc);
-+ ath_start_rfkill_poll(sc);
-+
-+ return 0;
-+@@ -1022,6 +1023,7 @@ void ath9k_deinit_device(struct ath_soft
-+ ath9k_ps_wakeup(sc);
-+
-+ wiphy_rfkill_stop_polling(sc->hw->wiphy);
-++ ath9k_deinit_buttons(sc);
-+ ath_deinit_leds(sc);
-+ ath9k_unregister_gpio_chip(sc);
-+
-+--- a/include/linux/ath9k_platform.h
-++++ b/include/linux/ath9k_platform.h
-+@@ -46,6 +46,10 @@ struct ath9k_platform_data {
-+ int num_leds;
-+ const struct gpio_led *leds;
-+ const char *led_name;
-++
-++ unsigned num_btns;
-++ const struct gpio_keys_button *btns;
-++ unsigned btn_poll_interval;
-+ };
-+
-+ #endif /* _LINUX_ATH9K_PLATFORM_H */
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-index bf80d4d..20bb06e 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-@@ -93,6 +93,20 @@ __init void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
- }
- }
-
-+__init void ap9x_pci_setup_wmac_btns(unsigned wmac,
-+ struct gpio_keys_button *btns,
-+ unsigned num_btns, unsigned poll_interval)
-+{
-+ struct ath9k_platform_data *ap9x_wmac_data;
-+
-+ if (!(ap9x_wmac_data = ap9x_pci_get_wmac_data(wmac)))
-+ return;
-+
-+ ap9x_wmac_data->btns = btns;
-+ ap9x_wmac_data->num_btns = num_btns;
-+ ap9x_wmac_data->btn_poll_interval = poll_interval;
-+}
-+
- static int ap91_pci_plat_dev_init(struct pci_dev *dev)
- {
- switch (PCI_SLOT(dev->devfn)) {
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-index dcfe541..d7c0185 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-@@ -12,6 +12,7 @@
- #define _ATH79_DEV_AP9X_PCI_H
-
- struct gpio_led;
-+struct gpio_keys_button;
- struct ath9k_platform_data;
-
- #if defined(CONFIG_ATH79_DEV_AP9X_PCI)
-@@ -20,6 +21,8 @@ void ap9x_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val);
- void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
- int num_leds);
- void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name);
-+void ap9x_pci_setup_wmac_btns(unsigned wmac, struct gpio_keys_button *btns,
-+ unsigned num_btns, unsigned poll_interval);
- struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac);
-
- void ap91_pci_init(u8 *cal_data, u8 *mac_addr);
-@@ -36,6 +39,10 @@ static inline void ap9x_pci_setup_wmac_leds(unsigned wmac,
- int num_leds) {}
- static inline void ap9x_pci_setup_wmac_led_name(unsigned wmac,
- const char *led_name) {}
-+static inline void ap9x_pci_setup_wmac_btns(unsigned wmac,
-+ struct gpio_keys_button *btns,
-+ unsigned num_btns,
-+ unsigned poll_interval) {}
- static inline struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
- {
- return NULL;
-diff --git a/target/linux/generic/files/include/linux/ath9k_platform.h b/target/linux/generic/files/include/linux/ath9k_platform.h
-index 823e5ac..e543a64 100644
---- a/target/linux/generic/files/include/linux/ath9k_platform.h
-+++ b/target/linux/generic/files/include/linux/ath9k_platform.h
-@@ -46,6 +46,10 @@ struct ath9k_platform_data {
- int num_leds;
- const struct gpio_led *leds;
- const char *led_name;
-+
-+ unsigned num_btns;
-+ const struct gpio_keys_button *btns;
-+ unsigned btn_poll_interval;
- };
-
- #endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/patches/openwrt/0085-mac80211-rework-gpio-chip-button-support-to-build-on-platforms-without-CONFIG_GPIOLIB.patch b/patches/openwrt/0085-mac80211-rework-gpio-chip-button-support-to-build-on-platforms-without-CONFIG_GPIOLIB.patch
deleted file mode 100644
index 24cd5638a..000000000
--- a/patches/openwrt/0085-mac80211-rework-gpio-chip-button-support-to-build-on-platforms-without-CONFIG_GPIOLIB.patch
+++ /dev/null
@@ -1,827 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 13:39:10 +0200
-Subject: mac80211: rework gpio chip/button support to build on platforms without CONFIG_GPIOLIB
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of r48938
-
-diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
-new file mode 100644
-index 0000000..f91d85c
---- /dev/null
-+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
-@@ -0,0 +1,235 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Date: Sun, 31 Jan 2016 21:01:31 +0100
-+Subject: [PATCH v4 4/8] mac80211: ath9k: enable access to GPIO
-+
-+Enable access to GPIO chip and its pins for Atheros AR92xx
-+wireless devices. For now AR9285 and AR9287 are supported.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-+---
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -24,6 +24,7 @@
-+ #include <linux/completion.h>
-+ #include <linux/time.h>
-+ #include <linux/hw_random.h>
-++#include <linux/gpio/driver.h>
-+
-+ #include "common.h"
-+ #include "debug.h"
-+@@ -963,6 +964,14 @@ struct ath_led {
-+ struct led_classdev cdev;
-+ };
-+
-++#ifdef CONFIG_GPIOLIB
-++struct ath9k_gpio_chip {
-++ struct ath_softc *sc;
-++ char label[32];
-++ struct gpio_chip gchip;
-++};
-++#endif
-++
-+ struct ath_softc {
-+ struct ieee80211_hw *hw;
-+ struct device *dev;
-+@@ -1017,6 +1026,9 @@ struct ath_softc {
-+ #ifdef CPTCFG_MAC80211_LEDS
-+ const char *led_default_trigger;
-+ struct list_head leds;
-++#ifdef CONFIG_GPIOLIB
-++ struct ath9k_gpio_chip *gpiochip;
-++#endif
-+ #endif
-+
-+ #ifdef CPTCFG_ATH9K_DEBUGFS
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -16,12 +16,138 @@
-+
-+ #include "ath9k.h"
-+ #include <linux/ath9k_platform.h>
-++#include <linux/gpio.h>
-++
-++#ifdef CPTCFG_MAC80211_LEDS
-++
-++#ifdef CONFIG_GPIOLIB
-++
-++/***************/
-++/* GPIO Chip */
-++/***************/
-++
-++/* gpio_chip handler : set GPIO to input */
-++static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_cfg_gpio_input(gc->sc->sc_ah, offset);
-++
-++ return 0;
-++}
-++
-++/* gpio_chip handler : set GPIO to output */
-++static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
-++ int value)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_cfg_output(gc->sc->sc_ah, offset,
-++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
-++
-++ return 0;
-++}
-++
-++/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
-++static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++ struct ath_hw *ah = gc->sc->sc_ah;
-++
-++ return !((REG_READ(ah, AR_GPIO_OE_OUT) >> (offset * 2)) & 3);
-++}
-++
-++/* gpio_chip handler : get GPIO pin value */
-++static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
-++}
-++
-++/* gpio_chip handler : set GPIO pin to value */
-++static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
-++ int value)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
-++}
-++
-++/* register GPIO chip */
-++static void ath9k_register_gpio_chip(struct ath_softc *sc)
-++{
-++ struct ath9k_gpio_chip *gc;
-++ u16 ng;
-++
-++ /* for now only AR9285 and AR9287 are recognized */
-++ if (AR_SREV_9287(sc->sc_ah))
-++ ng = AR9287_NUM_GPIO;
-++ else if (AR_SREV_9285(sc->sc_ah))
-++ ng = AR9285_NUM_GPIO;
-++ else
-++ return;
-++
-++ gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
-++ if (!gc)
-++ return;
-++
-++ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
-++ wiphy_name(sc->hw->wiphy));
-++ gc->gchip.label = gc->label;
-++ gc->gchip.base = -1; /* determine base automatically */
-++ gc->gchip.ngpio = ng;
-++ gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
-++ gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
-++ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
-++ gc->gchip.get = ath9k_gpio_pin_get;
-++ gc->gchip.set = ath9k_gpio_pin_set;
-++ gc->gchip.owner = THIS_MODULE;
-++
-++ if (gpiochip_add(&gc->gchip)) {
-++ kfree(gc);
-++ return;
-++ }
-++
-++ sc->gpiochip = gc;
-++ gc->sc = sc;
-++}
-++
-++/* remove GPIO chip */
-++static void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-++{
-++ struct ath9k_gpio_chip *gc = sc->gpiochip;
-++
-++ if (!gc)
-++ return;
-++
-++ gpiochip_remove(&gc->gchip);
-++ kfree(gc);
-++ sc->gpiochip = NULL;
-++}
-++
-++#else /* CONFIG_GPIOLIB */
-++
-++static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-++{
-++}
-++
-++static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-++{
-++}
-++
-++#endif /* CONFIG_GPIOLIB */
-+
-+ /********************************/
-+ /* LED functions */
-+ /********************************/
-+
-+-#ifdef CPTCFG_MAC80211_LEDS
-+ static void ath_led_brightness(struct led_classdev *led_cdev,
-+ enum led_brightness brightness)
-+ {
-+@@ -60,6 +186,12 @@ static int ath_add_led(struct ath_softc
-+ else
-+ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
-+
-++#ifdef CONFIG_GPIOLIB
-++ /* If there is GPIO chip configured, reserve LED pin */
-++ if (sc->gpiochip)
-++ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
-++#endif
-++
-+ return 0;
-+ }
-+
-+@@ -116,11 +248,17 @@ void ath_deinit_leds(struct ath_softc *s
-+
-+ while (!list_empty(&sc->leds)) {
-+ led = list_first_entry(&sc->leds, struct ath_led, list);
-++#ifdef CONFIG_GPIOLIB
-++ /* If there is GPIO chip configured, free LED pin */
-++ if (sc->gpiochip)
-++ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
-++#endif
-+ list_del(&led->list);
-+ ath_led_brightness(&led->cdev, LED_OFF);
-+ led_classdev_unregister(&led->cdev);
-+ kfree(led);
-+ }
-++ ath9k_unregister_gpio_chip(sc);
-+ }
-+
-+ void ath_init_leds(struct ath_softc *sc)
-+@@ -135,6 +273,8 @@ void ath_init_leds(struct ath_softc *sc)
-+ if (AR_SREV_9100(sc->sc_ah))
-+ return;
-+
-++ ath9k_register_gpio_chip(sc);
-++
-+ if (pdata && pdata->led_name)
-+ strncpy(led_name, pdata->led_name, sizeof(led_name));
-+ else
-+@@ -186,6 +326,7 @@ void ath_fill_led_pin(struct ath_softc *
-+ /* LED off, active low */
-+ ath9k_hw_set_gpio(ah, ah->led_pin, (ah->config.led_active_high) ? 0 : 1);
-+ }
-++
-+ #endif
-+
-+ /*******************/
-diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
-new file mode 100644
-index 0000000..0527406
---- /dev/null
-+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
-@@ -0,0 +1,148 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Subject: [PATCH v5 5/8] mac80211: ath9k: enable GPIO buttons
-+
-+Enable platform-defined GPIO button support for ath9k device.
-+Key poller is activated for attached platform buttons.
-+Requires ath9k GPIO chip access.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-+---
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -1028,6 +1028,7 @@ struct ath_softc {
-+ struct list_head leds;
-+ #ifdef CONFIG_GPIOLIB
-+ struct ath9k_gpio_chip *gpiochip;
-++ struct platform_device *btnpdev; /* gpio-keys-polled */
-+ #endif
-+ #endif
-+
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -17,6 +17,8 @@
-+ #include "ath9k.h"
-+ #include <linux/ath9k_platform.h>
-+ #include <linux/gpio.h>
-++#include <linux/platform_device.h>
-++#include <linux/gpio_keys.h>
-+
-+ #ifdef CPTCFG_MAC80211_LEDS
-+
-+@@ -132,6 +134,63 @@ static void ath9k_unregister_gpio_chip(s
-+ sc->gpiochip = NULL;
-+ }
-+
-++/******************/
-++/* GPIO Buttons */
-++/******************/
-++
-++/* add GPIO buttons */
-++static void ath9k_init_buttons(struct ath_softc *sc)
-++{
-++ struct ath9k_platform_data *pdata = sc->dev->platform_data;
-++ struct platform_device *pdev;
-++ struct gpio_keys_platform_data gkpdata;
-++ struct gpio_keys_button *bt;
-++ int i;
-++
-++ if (!sc->gpiochip)
-++ return;
-++
-++ if (!pdata || !pdata->btns || !pdata->num_btns)
-++ return;
-++
-++ bt = devm_kmemdup(sc->dev, pdata->btns,
-++ pdata->num_btns * sizeof(struct gpio_keys_button),
-++ GFP_KERNEL);
-++ if (!bt)
-++ return;
-++
-++ for (i = 0; i < pdata->num_btns; i++) {
-++ ath9k_hw_cfg_gpio_input(sc->sc_ah, pdata->btns[i].gpio);
-++ bt[i].gpio = sc->gpiochip->gchip.base + pdata->btns[i].gpio;
-++ }
-++
-++ memset(&gkpdata, 0, sizeof(struct gpio_keys_platform_data));
-++ gkpdata.buttons = bt;
-++ gkpdata.nbuttons = pdata->num_btns;
-++ gkpdata.poll_interval = pdata->btn_poll_interval;
-++
-++ pdev = platform_device_register_data(sc->dev, "gpio-keys-polled",
-++ PLATFORM_DEVID_AUTO, &gkpdata,
-++ sizeof(gkpdata));
-++ if (!IS_ERR_OR_NULL(pdev))
-++ sc->btnpdev = pdev;
-++ else {
-++ sc->btnpdev = NULL;
-++ devm_kfree(sc->dev, bt);
-++ }
-++}
-++
-++/* remove GPIO buttons */
-++static void ath9k_deinit_buttons(struct ath_softc *sc)
-++{
-++ if (!sc->gpiochip || !sc->btnpdev)
-++ return;
-++
-++ platform_device_unregister(sc->btnpdev);
-++
-++ sc->btnpdev = NULL;
-++}
-++
-+ #else /* CONFIG_GPIOLIB */
-+
-+ static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-+@@ -142,6 +201,14 @@ static inline void ath9k_unregister_gpio
-+ {
-+ }
-+
-++static inline void ath9k_init_buttons(struct ath_softc *sc)
-++{
-++}
-++
-++static inline void ath9k_deinit_buttons(struct ath_softc *sc)
-++{
-++}
-++
-+ #endif /* CONFIG_GPIOLIB */
-+
-+ /********************************/
-+@@ -246,6 +313,7 @@ void ath_deinit_leds(struct ath_softc *s
-+ {
-+ struct ath_led *led;
-+
-++ ath9k_deinit_buttons(sc);
-+ while (!list_empty(&sc->leds)) {
-+ led = list_first_entry(&sc->leds, struct ath_led, list);
-+ #ifdef CONFIG_GPIOLIB
-+@@ -274,6 +342,7 @@ void ath_init_leds(struct ath_softc *sc)
-+ return;
-+
-+ ath9k_register_gpio_chip(sc);
-++ ath9k_init_buttons(sc);
-+
-+ if (pdata && pdata->led_name)
-+ strncpy(led_name, pdata->led_name, sizeof(led_name));
-+@@ -289,7 +358,7 @@ void ath_init_leds(struct ath_softc *sc)
-+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-+ !sc->sc_ah->config.led_active_high);
-+
-+- if (!pdata)
-++ if (!pdata || !pdata->leds || !pdata->num_leds)
-+ return;
-+
-+ for (i = 0; i < pdata->num_leds; i++)
-+--- a/include/linux/ath9k_platform.h
-++++ b/include/linux/ath9k_platform.h
-+@@ -46,6 +46,10 @@ struct ath9k_platform_data {
-+ int num_leds;
-+ const struct gpio_led *leds;
-+ const char *led_name;
-++
-++ unsigned num_btns;
-++ const struct gpio_keys_button *btns;
-++ unsigned btn_poll_interval;
-+ };
-+
-+ #endif /* _LINUX_ATH9K_PLATFORM_H */
-diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch
-deleted file mode 100644
-index 55bb991..0000000
---- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_chip.patch
-+++ /dev/null
-@@ -1,243 +0,0 @@
--From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
--Date: Sun, 31 Jan 2016 21:01:31 +0100
--Subject: [PATCH v4 4/8] mac80211: ath9k: enable access to GPIO
--
--Enable access to GPIO chip and its pins for Atheros AR92xx
--wireless devices. For now AR9285 and AR9287 are supported.
--
--Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-----
-- ath9k.h | 23 ++++++++++++
-- gpio.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- init.c | 2 +
-- 3 files changed, 146 insertions(+)
--
----- a/drivers/net/wireless/ath/ath9k/ath9k.h
--+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
--@@ -24,6 +24,7 @@
-- #include <linux/completion.h>
-- #include <linux/time.h>
-- #include <linux/hw_random.h>
--+#include <linux/gpio/driver.h>
--
-- #include "common.h"
-- #include "debug.h"
--@@ -817,6 +818,13 @@ void ath_fill_led_pin(struct ath_softc *
-- int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
-- const char *trigger, bool active_low);
--
--+/***************/
--+/* GPIO Chip */
--+/***************/
--+
--+void ath9k_register_gpio_chip(struct ath_softc *sc);
--+void ath9k_unregister_gpio_chip(struct ath_softc *sc);
--+
-- #else
-- static inline void ath_init_leds(struct ath_softc *sc)
-- {
--@@ -828,6 +836,14 @@ static inline void ath_deinit_leds(struc
-- static inline void ath_fill_led_pin(struct ath_softc *sc)
-- {
-- }
--+
--+static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
--+{
--+}
--+
--+static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
--+{
--+}
-- #endif
--
-- /************************/
--@@ -963,6 +979,12 @@ struct ath_led {
-- struct led_classdev cdev;
-- };
--
--+struct ath9k_gpio_chip {
--+ struct ath_softc *sc;
--+ char label[32];
--+ struct gpio_chip gchip;
--+};
--+
-- struct ath_softc {
-- struct ieee80211_hw *hw;
-- struct device *dev;
--@@ -1017,6 +1039,7 @@ struct ath_softc {
-- #ifdef CPTCFG_MAC80211_LEDS
-- const char *led_default_trigger;
-- struct list_head leds;
--+ struct ath9k_gpio_chip *gpiochip;
-- #endif
--
-- #ifdef CPTCFG_ATH9K_DEBUGFS
----- a/drivers/net/wireless/ath/ath9k/gpio.c
--+++ b/drivers/net/wireless/ath/ath9k/gpio.c
--@@ -22,6 +22,9 @@
-- /********************************/
--
-- #ifdef CPTCFG_MAC80211_LEDS
--+
--+#include <asm-generic/gpio.h>
--+
-- static void ath_led_brightness(struct led_classdev *led_cdev,
-- enum led_brightness brightness)
-- {
--@@ -60,6 +63,10 @@ static int ath_add_led(struct ath_softc
-- else
-- ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
--
--+ /* If there is GPIO chip configured, reserve LED pin */
--+ if (sc->gpiochip)
--+ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
--+
-- return 0;
-- }
--
--@@ -116,6 +123,9 @@ void ath_deinit_leds(struct ath_softc *s
--
-- while (!list_empty(&sc->leds)) {
-- led = list_first_entry(&sc->leds, struct ath_led, list);
--+ /* If there is GPIO chip configured, free LED pin */
--+ if (sc->gpiochip)
--+ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
-- list_del(&led->list);
-- ath_led_brightness(&led->cdev, LED_OFF);
-- led_classdev_unregister(&led->cdev);
--@@ -186,6 +196,117 @@ void ath_fill_led_pin(struct ath_softc *
-- /* LED off, active low */
-- ath9k_hw_set_gpio(ah, ah->led_pin, (ah->config.led_active_high) ? 0 : 1);
-- }
--+
--+/***************/
--+/* GPIO Chip */
--+/***************/
--+
--+/* gpio_chip handler : set GPIO to input */
--+static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
--+{
--+ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
--+ gchip);
--+
--+ ath9k_hw_cfg_gpio_input(gc->sc->sc_ah, offset);
--+
--+ return 0;
--+}
--+
--+/* gpio_chip handler : set GPIO to output */
--+static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
--+ int value)
--+{
--+ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
--+ gchip);
--+
--+ ath9k_hw_cfg_output(gc->sc->sc_ah, offset,
--+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
--+ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
--+
--+ return 0;
--+}
--+
--+/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
--+static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
--+{
--+ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
--+ gchip);
--+ struct ath_hw *ah = gc->sc->sc_ah;
--+
--+ return !((REG_READ(ah, AR_GPIO_OE_OUT) >> (offset * 2)) & 3);
--+}
--+
--+/* gpio_chip handler : get GPIO pin value */
--+static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
--+{
--+ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
--+ gchip);
--+
--+ return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
--+}
--+
--+/* gpio_chip handler : set GPIO pin to value */
--+static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
--+ int value)
--+{
--+ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
--+ gchip);
--+
--+ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
--+}
--+
--+/* register GPIO chip */
--+void ath9k_register_gpio_chip(struct ath_softc *sc)
--+{
--+ struct ath9k_gpio_chip *gc;
--+ u16 ng;
--+
--+ /* for now only AR9285 and AR9287 are recognized */
--+ if (AR_SREV_9287(sc->sc_ah))
--+ ng = AR9287_NUM_GPIO;
--+ else if (AR_SREV_9285(sc->sc_ah))
--+ ng = AR9285_NUM_GPIO;
--+ else
--+ return;
--+
--+ gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
--+ if (!gc)
--+ return;
--+
--+ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
--+ wiphy_name(sc->hw->wiphy));
--+ gc->gchip.label = gc->label;
--+ gc->gchip.base = -1; /* determine base automatically */
--+ gc->gchip.ngpio = ng;
--+ gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
--+ gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
--+ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
--+ gc->gchip.get = ath9k_gpio_pin_get;
--+ gc->gchip.set = ath9k_gpio_pin_set;
--+ gc->gchip.owner = THIS_MODULE;
--+
--+ if (gpiochip_add(&gc->gchip)) {
--+ kfree(gc);
--+ return;
--+ }
--+
--+ sc->gpiochip = gc;
--+ gc->sc = sc;
--+}
--+
--+/* remove GPIO chip */
--+void ath9k_unregister_gpio_chip(struct ath_softc *sc)
--+{
--+ struct ath9k_gpio_chip *gc = sc->gpiochip;
--+
--+ if (!gc)
--+ return;
--+
--+ gpiochip_remove(&gc->gchip);
--+ kfree(gc);
--+ sc->gpiochip = NULL;
--+}
--+
-- #endif
--
-- /*******************/
----- a/drivers/net/wireless/ath/ath9k/init.c
--+++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -975,6 +975,7 @@ int ath9k_init_device(u16 devid, struct
-- goto debug_cleanup;
-- }
--
--+ ath9k_register_gpio_chip(sc);
-- ath_init_leds(sc);
-- ath_start_rfkill_poll(sc);
--
--@@ -1022,6 +1023,7 @@ void ath9k_deinit_device(struct ath_soft
--
-- wiphy_rfkill_stop_polling(sc->hw->wiphy);
-- ath_deinit_leds(sc);
--+ ath9k_unregister_gpio_chip(sc);
--
-- ath9k_ps_restore(sc);
--
-diff --git a/package/kernel/mac80211/patches/550-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/550-ath9k_enable_gpio_buttons.patch
-deleted file mode 100644
-index e3a8cec..0000000
---- a/package/kernel/mac80211/patches/550-ath9k_enable_gpio_buttons.patch
-+++ /dev/null
-@@ -1,169 +0,0 @@
--From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
--Subject: [PATCH v5 5/8] mac80211: ath9k: enable GPIO buttons
--
--Enable platform-defined GPIO button support for ath9k device.
--Key poller is activated for attached platform buttons.
--Requires ath9k GPIO chip access.
--
--Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-----
-- drivers/net/wireless/ath/ath9k/ath9k.h | 16 ++++++
-- drivers/net/wireless/ath/ath9k/gpio.c | 77 +++++++++++++++++++++++++++++++++
-- drivers/net/wireless/ath/ath9k/init.c | 2
-- include/linux/ath9k_platform.h | 4 +
-- 4 files changed, 99 insertions(+)
--
----- a/drivers/net/wireless/ath/ath9k/ath9k.h
--+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
--@@ -825,6 +825,13 @@ int ath_create_gpio_led(struct ath_softc
-- void ath9k_register_gpio_chip(struct ath_softc *sc);
-- void ath9k_unregister_gpio_chip(struct ath_softc *sc);
--
--+/******************/
--+/* GPIO Buttons */
--+/******************/
--+
--+void ath9k_init_buttons(struct ath_softc *sc);
--+void ath9k_deinit_buttons(struct ath_softc *sc);
--+
-- #else
-- static inline void ath_init_leds(struct ath_softc *sc)
-- {
--@@ -844,6 +851,14 @@ static inline void ath9k_register_gpio_c
-- static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-- {
-- }
--+
--+static inline void ath9k_init_buttons(struct ath_softc *sc)
--+{
--+}
--+
--+static inline void ath9k_deinit_buttons(struct ath_softc *sc)
--+{
--+}
-- #endif
--
-- /************************/
--@@ -1040,6 +1055,7 @@ struct ath_softc {
-- const char *led_default_trigger;
-- struct list_head leds;
-- struct ath9k_gpio_chip *gpiochip;
--+ struct platform_device *btnpdev; /* gpio-keys-polled */
-- #endif
--
-- #ifdef CPTCFG_ATH9K_DEBUGFS
----- a/drivers/net/wireless/ath/ath9k/gpio.c
--+++ b/drivers/net/wireless/ath/ath9k/gpio.c
--@@ -24,6 +24,8 @@
-- #ifdef CPTCFG_MAC80211_LEDS
--
-- #include <asm-generic/gpio.h>
--+#include <linux/platform_device.h>
--+#include <linux/gpio_keys.h>
--
-- static void ath_led_brightness(struct led_classdev *led_cdev,
-- enum led_brightness brightness)
--@@ -159,7 +161,7 @@ void ath_init_leds(struct ath_softc *sc)
-- ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-- !sc->sc_ah->config.led_active_high);
--
--- if (!pdata)
--+ if (!pdata || !pdata->leds || !pdata->num_leds)
-- return;
--
-- for (i = 0; i < pdata->num_leds; i++)
--@@ -307,6 +309,63 @@ void ath9k_unregister_gpio_chip(struct a
-- sc->gpiochip = NULL;
-- }
--
--+/******************/
--+/* GPIO Buttons */
--+/******************/
--+
--+/* add GPIO buttons */
--+void ath9k_init_buttons(struct ath_softc *sc)
--+{
--+ struct ath9k_platform_data *pdata = sc->dev->platform_data;
--+ struct platform_device *pdev;
--+ struct gpio_keys_platform_data gkpdata;
--+ struct gpio_keys_button *bt;
--+ int i;
--+
--+ if (!sc->gpiochip)
--+ return;
--+
--+ if (!pdata || !pdata->btns || !pdata->num_btns)
--+ return;
--+
--+ bt = devm_kmemdup(sc->dev, pdata->btns,
--+ pdata->num_btns * sizeof(struct gpio_keys_button),
--+ GFP_KERNEL);
--+ if (!bt)
--+ return;
--+
--+ for (i = 0; i < pdata->num_btns; i++) {
--+ ath9k_hw_cfg_gpio_input(sc->sc_ah, pdata->btns[i].gpio);
--+ bt[i].gpio = sc->gpiochip->gchip.base + pdata->btns[i].gpio;
--+ }
--+
--+ memset(&gkpdata, 0, sizeof(struct gpio_keys_platform_data));
--+ gkpdata.buttons = bt;
--+ gkpdata.nbuttons = pdata->num_btns;
--+ gkpdata.poll_interval = pdata->btn_poll_interval;
--+
--+ pdev = platform_device_register_data(sc->dev, "gpio-keys-polled",
--+ PLATFORM_DEVID_AUTO, &gkpdata,
--+ sizeof(gkpdata));
--+ if (!IS_ERR_OR_NULL(pdev))
--+ sc->btnpdev = pdev;
--+ else {
--+ sc->btnpdev = NULL;
--+ devm_kfree(sc->dev, bt);
--+ }
--+}
--+
--+/* remove GPIO buttons */
--+void ath9k_deinit_buttons(struct ath_softc *sc)
--+{
--+ if (!sc->gpiochip || !sc->btnpdev)
--+ return;
--+
--+ platform_device_unregister(sc->btnpdev);
--+
--+ sc->btnpdev = NULL;
--+}
--+
-- #endif
--
-- /*******************/
----- a/drivers/net/wireless/ath/ath9k/init.c
--+++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -977,6 +977,7 @@ int ath9k_init_device(u16 devid, struct
--
-- ath9k_register_gpio_chip(sc);
-- ath_init_leds(sc);
--+ ath9k_init_buttons(sc);
-- ath_start_rfkill_poll(sc);
--
-- return 0;
--@@ -1022,6 +1023,7 @@ void ath9k_deinit_device(struct ath_soft
-- ath9k_ps_wakeup(sc);
--
-- wiphy_rfkill_stop_polling(sc->hw->wiphy);
--+ ath9k_deinit_buttons(sc);
-- ath_deinit_leds(sc);
-- ath9k_unregister_gpio_chip(sc);
--
----- a/include/linux/ath9k_platform.h
--+++ b/include/linux/ath9k_platform.h
--@@ -46,6 +46,10 @@ struct ath9k_platform_data {
-- int num_leds;
-- const struct gpio_led *leds;
-- const char *led_name;
--+
--+ unsigned num_btns;
--+ const struct gpio_keys_button *btns;
--+ unsigned btn_poll_interval;
-- };
--
-- #endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/patches/openwrt/0091-scripts-feeds-fix-version-detection-for-Make-4.2.1.patch b/patches/openwrt/0085-scripts-feeds-fix-version-detection-for-Make-4.2.1.patch
similarity index 100%
rename from patches/openwrt/0091-scripts-feeds-fix-version-detection-for-Make-4.2.1.patch
rename to patches/openwrt/0085-scripts-feeds-fix-version-detection-for-Make-4.2.1.patch
diff --git a/patches/openwrt/0092-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch b/patches/openwrt/0086-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch
similarity index 100%
rename from patches/openwrt/0092-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch
rename to patches/openwrt/0086-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch
diff --git a/patches/openwrt/0093-tools-cmake-fix-parallel-build-with-Make-4.2.patch b/patches/openwrt/0087-tools-cmake-fix-parallel-build-with-Make-4.2.patch
similarity index 100%
rename from patches/openwrt/0093-tools-cmake-fix-parallel-build-with-Make-4.2.patch
rename to patches/openwrt/0087-tools-cmake-fix-parallel-build-with-Make-4.2.patch
diff --git a/patches/openwrt/0094-linux-make-IPv6-builtin-if-selected-saves-30KB.patch b/patches/openwrt/0088-linux-make-IPv6-builtin-if-selected-saves-30KB.patch
similarity index 100%
rename from patches/openwrt/0094-linux-make-IPv6-builtin-if-selected-saves-30KB.patch
rename to patches/openwrt/0088-linux-make-IPv6-builtin-if-selected-saves-30KB.patch
diff --git a/patches/openwrt/0095-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch b/patches/openwrt/0089-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch
similarity index 100%
rename from patches/openwrt/0095-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch
rename to patches/openwrt/0089-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch
diff --git a/patches/openwrt/0096-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch b/patches/openwrt/0090-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch
similarity index 90%
rename from patches/openwrt/0096-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch
rename to patches/openwrt/0090-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch
index 594c47248..b44a0ef28 100644
--- a/patches/openwrt/0096-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch
+++ b/patches/openwrt/0090-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch
@@ -107,19 +107,6 @@ index 8a2760d..ab76946 100644
endef
define KernelPackage/rxrpc/description
-diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index cd8d670..e82bdb0 100644
---- a/package/kernel/mac80211/Makefile
-+++ b/package/kernel/mac80211/Makefile
-@@ -92,7 +92,7 @@ endef
- define KernelPackage/mac80211
- $(call KernelPackage/mac80211/Default)
- TITLE:=Linux 802.11 Wireless Networking Stack
-- DEPENDS+= +kmod-cfg80211 +hostapd-common +kmod-crypto-core +kmod-crypto-arc4
-+ DEPENDS+= +kmod-cfg80211 +hostapd-common
- KCONFIG:=\
- CONFIG_AVERAGE=y
- FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 6038692..a0dc3c9 100644
--- a/target/linux/generic/config-3.18
diff --git a/patches/openwrt/0097-ar71xx-add-kernel-support-for-the-OpenMesh-OM2P-HSv3.patch b/patches/openwrt/0091-ar71xx-add-kernel-support-for-the-OpenMesh-OM2P-HSv3.patch
similarity index 100%
rename from patches/openwrt/0097-ar71xx-add-kernel-support-for-the-OpenMesh-OM2P-HSv3.patch
rename to patches/openwrt/0091-ar71xx-add-kernel-support-for-the-OpenMesh-OM2P-HSv3.patch
diff --git a/patches/openwrt/0098-ar71xx-add-user-space-support-for-the-OpenMesh-OM2P-HSv3.patch b/patches/openwrt/0092-ar71xx-add-user-space-support-for-the-OpenMesh-OM2P-HSv3.patch
similarity index 100%
rename from patches/openwrt/0098-ar71xx-add-user-space-support-for-the-OpenMesh-OM2P-HSv3.patch
rename to patches/openwrt/0092-ar71xx-add-user-space-support-for-the-OpenMesh-OM2P-HSv3.patch
diff --git a/patches/openwrt/0099-ar71xx-enable-sysupgrade-for-the-OpenMesh-OM2P-HSv3.patch b/patches/openwrt/0093-ar71xx-enable-sysupgrade-for-the-OpenMesh-OM2P-HSv3.patch
similarity index 100%
rename from patches/openwrt/0099-ar71xx-enable-sysupgrade-for-the-OpenMesh-OM2P-HSv3.patch
rename to patches/openwrt/0093-ar71xx-enable-sysupgrade-for-the-OpenMesh-OM2P-HSv3.patch
diff --git a/patches/openwrt/0100-package-om-watchdog-add-OpenMesh-OM2P-HSv3-support.patch b/patches/openwrt/0094-package-om-watchdog-add-OpenMesh-OM2P-HSv3-support.patch
similarity index 100%
rename from patches/openwrt/0100-package-om-watchdog-add-OpenMesh-OM2P-HSv3-support.patch
rename to patches/openwrt/0094-package-om-watchdog-add-OpenMesh-OM2P-HSv3-support.patch
diff --git a/patches/openwrt/0101-package-uboot-envtools-add-OpenMesh-OM2P-HSv3-support.patch b/patches/openwrt/0095-package-uboot-envtools-add-OpenMesh-OM2P-HSv3-support.patch
similarity index 100%
rename from patches/openwrt/0101-package-uboot-envtools-add-OpenMesh-OM2P-HSv3-support.patch
rename to patches/openwrt/0095-package-uboot-envtools-add-OpenMesh-OM2P-HSv3-support.patch
diff --git a/patches/openwrt/0102-ar71xx-add-OM2P-HSv3-to-the-OM2P-profile.patch b/patches/openwrt/0096-ar71xx-add-OM2P-HSv3-to-the-OM2P-profile.patch
similarity index 100%
rename from patches/openwrt/0102-ar71xx-add-OM2P-HSv3-to-the-OM2P-profile.patch
rename to patches/openwrt/0096-ar71xx-add-OM2P-HSv3-to-the-OM2P-profile.patch
diff --git a/patches/openwrt/0103-ar71xx-add-kernel-support-for-the-OpenMesh-MR1750v2.patch b/patches/openwrt/0097-ar71xx-add-kernel-support-for-the-OpenMesh-MR1750v2.patch
similarity index 100%
rename from patches/openwrt/0103-ar71xx-add-kernel-support-for-the-OpenMesh-MR1750v2.patch
rename to patches/openwrt/0097-ar71xx-add-kernel-support-for-the-OpenMesh-MR1750v2.patch
diff --git a/patches/openwrt/0104-ar71xx-add-user-space-support-for-the-OpenMesh-MR1750v2.patch b/patches/openwrt/0098-ar71xx-add-user-space-support-for-the-OpenMesh-MR1750v2.patch
similarity index 100%
rename from patches/openwrt/0104-ar71xx-add-user-space-support-for-the-OpenMesh-MR1750v2.patch
rename to patches/openwrt/0098-ar71xx-add-user-space-support-for-the-OpenMesh-MR1750v2.patch
diff --git a/patches/openwrt/0105-ar71xx-enable-sysupgrade-for-the-OpenMesh-MR1750v2.patch b/patches/openwrt/0099-ar71xx-enable-sysupgrade-for-the-OpenMesh-MR1750v2.patch
similarity index 100%
rename from patches/openwrt/0105-ar71xx-enable-sysupgrade-for-the-OpenMesh-MR1750v2.patch
rename to patches/openwrt/0099-ar71xx-enable-sysupgrade-for-the-OpenMesh-MR1750v2.patch
diff --git a/patches/openwrt/0106-package-om-watchdog-add-OpenMesh-MR1750v2-support.patch b/patches/openwrt/0100-package-om-watchdog-add-OpenMesh-MR1750v2-support.patch
similarity index 100%
rename from patches/openwrt/0106-package-om-watchdog-add-OpenMesh-MR1750v2-support.patch
rename to patches/openwrt/0100-package-om-watchdog-add-OpenMesh-MR1750v2-support.patch
diff --git a/patches/openwrt/0107-package-uboot-envtools-add-OpenMesh-MR1750v2-support.patch b/patches/openwrt/0101-package-uboot-envtools-add-OpenMesh-MR1750v2-support.patch
similarity index 100%
rename from patches/openwrt/0107-package-uboot-envtools-add-OpenMesh-MR1750v2-support.patch
rename to patches/openwrt/0101-package-uboot-envtools-add-OpenMesh-MR1750v2-support.patch
diff --git a/patches/openwrt/0108-ar71xx-extract-ath10k-wifi-board.bin-for-the-OpenMesh-MR1750v2-board.patch b/patches/openwrt/0102-ar71xx-extract-ath10k-wifi-board.bin-for-the-OpenMesh-MR1750v2-board.patch
similarity index 100%
rename from patches/openwrt/0108-ar71xx-extract-ath10k-wifi-board.bin-for-the-OpenMesh-MR1750v2-board.patch
rename to patches/openwrt/0102-ar71xx-extract-ath10k-wifi-board.bin-for-the-OpenMesh-MR1750v2-board.patch
diff --git a/patches/openwrt/0109-ar71xx-add-MR1750v2-to-the-MR1750-profile.patch b/patches/openwrt/0103-ar71xx-add-MR1750v2-to-the-MR1750-profile.patch
similarity index 100%
rename from patches/openwrt/0109-ar71xx-add-MR1750v2-to-the-MR1750-profile.patch
rename to patches/openwrt/0103-ar71xx-add-MR1750v2-to-the-MR1750-profile.patch
diff --git a/patches/openwrt/0110-x86-stop-relying-on-hexdump-for-image-build-signature.patch b/patches/openwrt/0104-x86-stop-relying-on-hexdump-for-image-build-signature.patch
similarity index 100%
rename from patches/openwrt/0110-x86-stop-relying-on-hexdump-for-image-build-signature.patch
rename to patches/openwrt/0104-x86-stop-relying-on-hexdump-for-image-build-signature.patch
diff --git a/patches/openwrt/0105-mt76-fix-build-with-kernel-3.18.patch b/patches/openwrt/0105-mt76-fix-build-with-kernel-3.18.patch
new file mode 100644
index 000000000..8a731f92d
--- /dev/null
+++ b/patches/openwrt/0105-mt76-fix-build-with-kernel-3.18.patch
@@ -0,0 +1,34 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Thu, 30 Jun 2016 21:52:02 +0200
+Subject: mt76: fix build with kernel 3.18
+
+diff --git a/package/kernel/mac80211/patches/945-netdev_alloc_frag.patch b/package/kernel/mac80211/patches/945-netdev_alloc_frag.patch
+new file mode 100644
+index 0000000..ea389cd
+--- /dev/null
++++ b/package/kernel/mac80211/patches/945-netdev_alloc_frag.patch
+@@ -0,0 +1,11 @@
++--- a/backport-include/linux/netdevice.h
+++++ b/backport-include/linux/netdevice.h
++@@ -233,7 +233,7 @@ static inline void backport_unregister_n
++ #endif
++
++ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
++-#define napi_alloc_frag(fragsz) netdev_alloc_frag(fragsz)
+++#define napi_alloc_frag netdev_alloc_frag
++ #endif
++
++ /*
+diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
+index 0f832e4..801188f 100644
+--- a/package/kernel/mt76/Makefile
++++ b/package/kernel/mt76/Makefile
+@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
+ define KernelPackage/mt76
+ SUBMENU:=Wireless Drivers
+ TITLE:=MediaTek MT76x2/MT7603 wireless driver
+- DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT @!LINUX_3_18
++ DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT
+ FILES:=\
+ $(PKG_BUILD_DIR)/mt76.ko \
+ $(PKG_BUILD_DIR)/mt76x2e.ko \
--
GitLab