mac80211: update to wireless-testing 2012-04-13

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31322 3c298f89-4303-0410-b956-a3cf2f4a3e73
author: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2012-04-16 21:08:41 +0000
committer: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2012-04-16 21:08:41 +0000
commit: 691b253e47367f64097023ba2afcc595ca120786 (patch)
tree: f3d4a3ace1fce602fa8b9fb1e3c84e817c712d49 /package
parent: c9641b552eb8ecccb7b0e31a0f7bac250a930e25 (diff)
74 files changed, 1296 insertions, 2549 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 1a576a001..8e98d261f 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2012-02-27
+PKG_VERSION:=2012-04-13
 PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
-PKG_MD5SUM:=ccd51c46813c25090ce657c8b7c67615
+PKG_MD5SUM:=0f6d364e5261fd3d26291b45f0363fd1
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
@@ -1248,8 +1248,10 @@ MAKE_OPTS:= \
 	CONFIG_USB_NET_CDCETHER= \
 	CONFIG_USB_USBNET= \
 	CONFIG_AT76C50X_USB= \
+	CONFIG_WL_TI=$(if $(CONFIG_PACKAGE_kmod-wl12xx),m) \
+	CONFIG_WLCORE=$(if $(CONFIG_PACKAGE_kmod-wl12xx),m) \
 	CONFIG_WL12XX=$(if $(CONFIG_PACKAGE_kmod-wl12xx),m) \
-	CONFIG_COMPAT_WL12XX_SDIO=$(if $(CONFIG_PACKAGE_kmod-wl12xx),m) \
+	CONFIG_WLCORE_SDIO=$(if $(CONFIG_PACKAGE_kmod-wl12xx),m) \
 	CONFIG_EEPROM_93CX6= \
 	CONFIG_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes),m) \
 	CONFIG_HERMES_CACHE_FW_ON_INIT= \
diff --git a/package/mac80211/patches/000-disable_ethernet.patch b/package/mac80211/patches/000-disable_ethernet.patch
index a6d708ec5..f89fa5329 100644
--- a/package/mac80211/patches/000-disable_ethernet.patch
+++ b/package/mac80211/patches/000-disable_ethernet.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -26,9 +26,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+@@ -29,9 +29,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
  
  obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
  
diff --git a/package/mac80211/patches/001-disable_b44.patch b/package/mac80211/patches/001-disable_b44.patch
index 8b5f3e60c..e73cf992c 100644
--- a/package/mac80211/patches/001-disable_b44.patch
+++ b/package/mac80211/patches/001-disable_b44.patch
@@ -1,13 +1,13 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -368,8 +368,8 @@ CONFIG_B43_BCMA_EXTRA=y
+@@ -362,8 +362,8 @@ export CONFIG_B43_BCMA_EXTRA=y
  
- CONFIG_P54_PCI=m
+ export CONFIG_P54_PCI=m
  
--CONFIG_B44=m
--CONFIG_B44_PCI=y
-+# CONFIG_B44=m
-+# CONFIG_B44_PCI=y
+-export CONFIG_B44=m
+-export CONFIG_B44_PCI=y
++# export CONFIG_B44=m
++# export CONFIG_B44_PCI=y
  
- CONFIG_RTL8180=m
+ export CONFIG_RTL8180=m
  
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index 94249413b..5eebf69c8 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -1,26 +1,26 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -83,7 +83,7 @@ endif # build check
+@@ -77,7 +77,7 @@ endif # build check
  endif # kernel Makefile check
  
  # These both are needed by compat-wireless || compat-bluetooth so enable them
-- CONFIG_COMPAT_RFKILL=y
-+# CONFIG_COMPAT_RFKILL=y
+- export CONFIG_COMPAT_RFKILL=y
++# export CONFIG_COMPAT_RFKILL=y
  
  ifeq ($(CONFIG_MAC80211),y)
  $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
-@@ -674,10 +674,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
+@@ -668,10 +668,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
  # We need the backported rfkill module on kernel < 2.6.31.
  # In more recent kernel versions use the in kernel rfkill module.
  ifdef CONFIG_COMPAT_KERNEL_2_6_31
--CONFIG_RFKILL_BACKPORT=m
-+# CONFIG_RFKILL_BACKPORT=m
+-export CONFIG_RFKILL_BACKPORT=m
++#export CONFIG_RFKILL_BACKPORT=m
  ifdef CONFIG_LEDS_TRIGGERS
--CONFIG_RFKILL_BACKPORT_LEDS=y
-+# CONFIG_RFKILL_BACKPORT_LEDS=y
+-export CONFIG_RFKILL_BACKPORT_LEDS=y
++#export CONFIG_RFKILL_BACKPORT_LEDS=y
  endif #CONFIG_LEDS_TRIGGERS
--CONFIG_RFKILL_BACKPORT_INPUT=y
-+# CONFIG_RFKILL_BACKPORT_INPUT=y
+-export CONFIG_RFKILL_BACKPORT_INPUT=y
++#export CONFIG_RFKILL_BACKPORT_INPUT=y
  endif #CONFIG_COMPAT_KERNEL_2_6_31
  
 --- a/include/linux/rfkill.h
diff --git a/package/mac80211/patches/003-disable_bt.patch b/package/mac80211/patches/003-disable_bt.patch
index fc433d1c0..025f9dc1a 100644
--- a/package/mac80211/patches/003-disable_bt.patch
+++ b/package/mac80211/patches/003-disable_bt.patch
@@ -1,13 +1,13 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -105,8 +105,8 @@ ifndef CONFIG_COMPAT_KERNEL_2_6_27
+@@ -99,8 +99,8 @@ ifndef CONFIG_COMPAT_KERNEL_2_6_27
  ifeq ($(CONFIG_BT),y)
  # we'll ignore compiling bluetooth
  else
-- CONFIG_COMPAT_BLUETOOTH=y
-- CONFIG_COMPAT_BLUETOOTH_MODULES=m
-+# CONFIG_COMPAT_BLUETOOTH=y
-+# CONFIG_COMPAT_BLUETOOTH_MODULES=m
+- export CONFIG_COMPAT_BLUETOOTH=y
+- export CONFIG_COMPAT_BLUETOOTH_MODULES=m
++# export CONFIG_COMPAT_BLUETOOTH=y
++# export CONFIG_COMPAT_BLUETOOTH_MODULES=m
  endif
  endif #CONFIG_COMPAT_KERNEL_2_6_27
  
diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch
index 9b39e76be..0770caadc 100644
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -26,7 +26,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+@@ -29,7 +29,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
  
  obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
  
@@ -10,15 +10,16 @@
  
 --- a/config.mk
 +++ b/config.mk
-@@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
-  CONFIG_PCI=y
-  CONFIG_USB=y
-  CONFIG_PCMCIA=y
-- CONFIG_SSB=m
+@@ -3,7 +3,7 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
+  export CONFIG_PCI=y
+  export CONFIG_USB=y
+  export CONFIG_PCMCIA=y
+- export CONFIG_SSB=m
++# export CONFIG_SSB=m
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -344,7 +343,8 @@ CONFIG_IPW2200_QOS=y
+@@ -338,7 +338,8 @@ export CONFIG_IPW2200_QOS=y
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  endif #CONFIG_WIRELESS_EXT
  
@@ -26,22 +27,23 @@
 +# disabled
 +ifdef __CONFIG_SSB
  # Sonics Silicon Backplane
- CONFIG_SSB_SPROM=y
+ export CONFIG_SSB_SPROM=y
  
-@@ -357,7 +357,7 @@ endif #CONFIG_PCMCIA
+@@ -351,7 +352,7 @@ endif #CONFIG_PCMCIA
  # CONFIG_SSB_DEBUG=y
- CONFIG_SSB_DRIVER_PCICORE=y
- CONFIG_B43_SSB=y
+ export CONFIG_SSB_DRIVER_PCICORE=y
+ export CONFIG_B43_SSB=y
 -endif #CONFIG_SSB
 +endif #__CONFIG_SSB
  
- CONFIG_BCMA=m
- CONFIG_BCMA_BLOCKIO=y
-@@ -568,7 +568,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+ export CONFIG_BCMA=m
+ export CONFIG_BCMA_BLOCKIO=y
+@@ -562,7 +563,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  
  ifdef CONFIG_MMC
  
--CONFIG_SSB_SDIOHOST=y
- CONFIG_B43_SDIO=y
+-export CONFIG_SSB_SDIOHOST=y
++# export CONFIG_SSB_SDIOHOST=y
+ export CONFIG_B43_SDIO=y
  
  ifdef CONFIG_CRC7
diff --git a/package/mac80211/patches/006-disable_bcma_build.patch b/package/mac80211/patches/006-disable_bcma_build.patch
index f79cbcbe1..33d164ba6 100644
--- a/package/mac80211/patches/006-disable_bcma_build.patch
+++ b/package/mac80211/patches/006-disable_bcma_build.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -26,7 +26,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
+@@ -29,7 +29,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
  
  obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
  
@@ -10,21 +10,21 @@
  ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
 --- a/config.mk
 +++ b/config.mk
-@@ -359,12 +359,12 @@ CONFIG_SSB_DRIVER_PCICORE=y
- CONFIG_B43_SSB=y
+@@ -354,12 +354,12 @@ export CONFIG_SSB_DRIVER_PCICORE=y
+ export CONFIG_B43_SSB=y
  endif #__CONFIG_SSB
  
--CONFIG_BCMA=m
--CONFIG_BCMA_BLOCKIO=y
--CONFIG_BCMA_HOST_PCI=y
-+# CONFIG_BCMA=m
-+# CONFIG_BCMA_BLOCKIO=y
-+# CONFIG_BCMA_HOST_PCI=y
+-export CONFIG_BCMA=m
+-export CONFIG_BCMA_BLOCKIO=y
+-export CONFIG_BCMA_HOST_PCI=y
++# export CONFIG_BCMA=m
++# export CONFIG_BCMA_BLOCKIO=y
++# export CONFIG_BCMA_HOST_PCI=y
  # CONFIG_BCMA_DEBUG=y
--CONFIG_B43_BCMA=y
--CONFIG_B43_BCMA_EXTRA=y
-+# CONFIG_B43_BCMA=y
-+# CONFIG_B43_BCMA_EXTRA=y
+-export CONFIG_B43_BCMA=y
+-export CONFIG_B43_BCMA_EXTRA=y
++# export CONFIG_B43_BCMA=y
++# export CONFIG_B43_BCMA_EXTRA=y
  
- CONFIG_P54_PCI=m
+ export CONFIG_P54_PCI=m
  
diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index 750b95d2d..99cfe73b6 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,66 +1,66 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -242,7 +242,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+@@ -237,7 +237,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
  endif #CONFIG_WIRELESS_EXT
  
  ifdef CONFIG_STAGING
--CONFIG_COMPAT_STAGING=m
-+# CONFIG_COMPAT_STAGING=m
+-export CONFIG_COMPAT_STAGING=m
++# export CONFIG_COMPAT_STAGING=m
  endif #CONFIG_STAGING
  
  # mac80211 test driver
-@@ -396,15 +396,15 @@ endif #CONFIG_CRC_ITU_T
- CONFIG_MWL8K=m
+@@ -391,15 +391,15 @@ endif #CONFIG_CRC_ITU_T
+ export CONFIG_MWL8K=m
  
  # Ethernet drivers go here
--CONFIG_ATL1=m
--CONFIG_ATL2=m
--CONFIG_ATL1E=m
-+# CONFIG_ATL1=m
-+# CONFIG_ATL2=m
-+# CONFIG_ATL1E=m
+-export CONFIG_ATL1=m
+-export CONFIG_ATL2=m
+-export CONFIG_ATL1E=m
++# export CONFIG_ATL1=m
++# export CONFIG_ATL2=m
++# export CONFIG_ATL1E=m
  ifdef CONFIG_COMPAT_KERNEL_2_6_27
--CONFIG_ATL1C=n
--CONFIG_ALX=m
-+# CONFIG_ATL1C=n
-+# CONFIG_ALX=m
+-export CONFIG_ATL1C=n
+-export CONFIG_ALX=m
++# export CONFIG_ATL1C=n
++# export CONFIG_ALX=m
  else #CONFIG_COMPAT_KERNEL_2_6_27
--CONFIG_ATL1C=n
--CONFIG_ALX=m
-+# CONFIG_ATL1C=n
-+# CONFIG_ALX=m
+-export CONFIG_ATL1C=n
+-export CONFIG_ALX=m
++# export CONFIG_ATL1C=n
++# export CONFIG_ALX=m
  endif #CONFIG_COMPAT_KERNEL_2_6_27
  
  ifdef CONFIG_WIRELESS_EXT
-@@ -465,21 +465,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
+@@ -460,21 +460,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
  # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
  # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
  ifdef CONFIG_COMPAT_KERNEL_2_6_29
--CONFIG_USB_COMPAT_USBNET=n
--CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
--CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
--CONFIG_USB_NET_COMPAT_CDCETHER=n
-+# CONFIG_USB_COMPAT_USBNET=n
-+# CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
-+# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
-+# CONFIG_USB_NET_COMPAT_CDCETHER=n
+-export CONFIG_USB_COMPAT_USBNET=n
+-export CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+-export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
+-export CONFIG_USB_NET_COMPAT_CDCETHER=n
++# export CONFIG_USB_COMPAT_USBNET=n
++# export CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
++# export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
++# export CONFIG_USB_NET_COMPAT_CDCETHER=n
  else #CONFIG_COMPAT_KERNEL_2_6_29
--CONFIG_USB_COMPAT_USBNET=m
-+# CONFIG_USB_COMPAT_USBNET=m
+-export CONFIG_USB_COMPAT_USBNET=m
++# export CONFIG_USB_COMPAT_USBNET=m
  ifdef CONFIG_USB_NET_CDCETHER
--CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
--CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
-+# CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
-+# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
+-export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
+-export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
  endif #CONFIG_USB_NET_CDCETHER
  ifdef CONFIG_USB_NET_CDCETHER_MODULE
--CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
--CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
-+# CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
-+# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
+-export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
+-export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
++# export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
  endif #CONFIG_USB_NET_CDCETHER
--CONFIG_USB_NET_COMPAT_CDCETHER=m
-+# CONFIG_USB_NET_COMPAT_CDCETHER=m
+-export CONFIG_USB_NET_COMPAT_CDCETHER=m
++# export CONFIG_USB_NET_COMPAT_CDCETHER=m
  endif #CONFIG_COMPAT_KERNEL_2_6_29
  
  
diff --git a/package/mac80211/patches/008-disable_mesh.patch b/package/mac80211/patches/008-disable_mesh.patch
index aaa27d00f..097ceb492 100644
--- a/package/mac80211/patches/008-disable_mesh.patch
+++ b/package/mac80211/patches/008-disable_mesh.patch
@@ -1,11 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -180,7 +180,7 @@ CONFIG_MAC80211_LEDS=y
+@@ -175,7 +175,7 @@ export CONFIG_MAC80211_LEDS=y
  endif #CONFIG_LEDS_TRIGGERS
  
  # enable mesh networking too
--CONFIG_MAC80211_MESH=y
-+# CONFIG_MAC80211_MESH=y
+-export CONFIG_MAC80211_MESH=y
++# export CONFIG_MAC80211_MESH=y
  
- CONFIG_CFG80211=m
- CONFIG_CFG80211_DEFAULT_PS=y
+ export CONFIG_CFG80211=m
+ export CONFIG_CFG80211_DEFAULT_PS=y
diff --git a/package/mac80211/patches/009-remove_mac80211_module_dependence.patch b/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
index 4fe13d45c..e442c5e9c 100644
--- a/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
+++ b/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -58,7 +58,7 @@ endif
+@@ -53,7 +53,7 @@ endif
  ifeq ($(KERNEL_VERSION),2)
  ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_26SUBLEVEL) -ge 27 -a $(KERNEL_26SUBLEVEL) -le 31 && echo yes),yes)
  ifeq ($(CONFIG_MAC80211),)
diff --git a/package/mac80211/patches/010-no_pcmcia.patch b/package/mac80211/patches/010-no_pcmcia.patch
index 3a1f912f1..07a7abbe1 100644
--- a/package/mac80211/patches/010-no_pcmcia.patch
+++ b/package/mac80211/patches/010-no_pcmcia.patch
@@ -1,20 +1,20 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -8,7 +8,7 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
+@@ -2,7 +2,7 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
  # These will be ignored by compat autoconf
-  CONFIG_PCI=y
-  CONFIG_USB=y
-- CONFIG_PCMCIA=y
-+# CONFIG_PCMCIA=y
+  export CONFIG_PCI=y
+  export CONFIG_USB=y
+- export CONFIG_PCMCIA=y
++# export CONFIG_PCMCIA=y
+ # export CONFIG_SSB=m
  else
  include $(KLIB_BUILD)/.config
- endif
-@@ -294,7 +294,7 @@ CONFIG_B43=m
- CONFIG_B43_HWRNG=y
- CONFIG_B43_PCI_AUTOSELECT=y
+@@ -289,7 +289,7 @@ export CONFIG_B43=m
+ export CONFIG_B43_HWRNG=y
+ export CONFIG_B43_PCI_AUTOSELECT=y
  ifdef CONFIG_PCMCIA
--CONFIG_B43_PCMCIA=y
-+# CONFIG_B43_PCMCIA=y
+-export CONFIG_B43_PCMCIA=y
++# export CONFIG_B43_PCMCIA=y
  endif #CONFIG_PCMCIA
  ifdef CONFIG_MAC80211_LEDS
- CONFIG_B43_LEDS=y
+ export CONFIG_B43_LEDS=y
diff --git a/package/mac80211/patches/011-no_sdio.patch b/package/mac80211/patches/011-no_sdio.patch
index b724d98ae..1d7c59b99 100644
--- a/package/mac80211/patches/011-no_sdio.patch
+++ b/package/mac80211/patches/011-no_sdio.patch
@@ -1,11 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -568,7 +568,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
- 
+@@ -564,7 +564,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  ifdef CONFIG_MMC
  
--CONFIG_B43_SDIO=y
-+# CONFIG_B43_SDIO=y
+ # export CONFIG_SSB_SDIOHOST=y
+-export CONFIG_B43_SDIO=y
++# export CONFIG_B43_SDIO=y
  
  ifdef CONFIG_CRC7
  ifdef CONFIG_WL12XX_PLATFORM_DATA
diff --git a/package/mac80211/patches/013-disable_b43_nphy.patch b/package/mac80211/patches/013-disable_b43_nphy.patch
index 4340dcc1e..5bd6e1ef0 100644
--- a/package/mac80211/patches/013-disable_b43_nphy.patch
+++ b/package/mac80211/patches/013-disable_b43_nphy.patch
@@ -1,13 +1,13 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -300,8 +300,8 @@ ifdef CONFIG_MAC80211_LEDS
- CONFIG_B43_LEDS=y
+@@ -295,8 +295,8 @@ ifdef CONFIG_MAC80211_LEDS
+ export CONFIG_B43_LEDS=y
  endif #CONFIG_MAC80211_LEDS
- CONFIG_B43_PHY_LP=y
--CONFIG_B43_PHY_N=y
--CONFIG_B43_PHY_HT=y
-+# CONFIG_B43_PHY_N=y
-+# CONFIG_B43_PHY_HT=y
+ export CONFIG_B43_PHY_LP=y
+-export CONFIG_B43_PHY_N=y
+-export CONFIG_B43_PHY_HT=y
++# export CONFIG_B43_PHY_N=y
++# export CONFIG_B43_PHY_HT=y
  # CONFIG_B43_PHY_LCN=y
  # CONFIG_B43_DEBUG=y
  
diff --git a/package/mac80211/patches/015-remove-rt2x00-options.patch b/package/mac80211/patches/015-remove-rt2x00-options.patch
index 259fe7fed..629c34bad 100644
--- a/package/mac80211/patches/015-remove-rt2x00-options.patch
+++ b/package/mac80211/patches/015-remove-rt2x00-options.patch
@@ -1,20 +1,20 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -375,7 +375,7 @@ CONFIG_RTL8180=m
+@@ -370,7 +370,7 @@ export CONFIG_RTL8180=m
  
- CONFIG_ADM8211=m
+ export CONFIG_ADM8211=m
  
--CONFIG_RT2X00_LIB_PCI=m
-+# CONFIG_RT2X00_LIB_PCI=m
- CONFIG_RT2400PCI=m
- CONFIG_RT2500PCI=m
+-export CONFIG_RT2X00_LIB_PCI=m
++# export CONFIG_RT2X00_LIB_PCI=m
+ export CONFIG_RT2400PCI=m
+ export CONFIG_RT2500PCI=m
  ifdef CONFIG_CRC_CCITT
-@@ -517,7 +517,7 @@ CONFIG_RT2800USB_RT35XX=y
- CONFIG_RT2800USB_RT53XX=y
- CONFIG_RT2800USB_UNKNOWN=y
+@@ -512,7 +512,7 @@ export CONFIG_RT2800USB_RT35XX=y
+ export CONFIG_RT2800USB_RT53XX=y
+ export CONFIG_RT2800USB_UNKNOWN=y
  endif #CONFIG_CRC_CCITT
--CONFIG_RT2X00_LIB_USB=m
-+# CONFIG_RT2X00_LIB_USB=m
+-export CONFIG_RT2X00_LIB_USB=m
++# export CONFIG_RT2X00_LIB_USB=m
  NEED_RT2X00=y
  # RT73USB requires firmware
  ifdef CONFIG_CRC_ITU_T
diff --git a/package/mac80211/patches/016-remove_pid_algo.patch b/package/mac80211/patches/016-remove_pid_algo.patch
index d356651a9..70d1a4c68 100644
--- a/package/mac80211/patches/016-remove_pid_algo.patch
+++ b/package/mac80211/patches/016-remove_pid_algo.patch
@@ -1,11 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -172,7 +172,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+@@ -167,7 +167,7 @@ export CONFIG_MAC80211_RC_DEFAULT_MINSTR
  # This is the one used by our compat-wireless net/mac80211/rate.c
  # in case you have and old kernel which is overriding this to pid.
- CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
--CONFIG_MAC80211_RC_PID=y
-+# CONFIG_MAC80211_RC_PID=y
- CONFIG_MAC80211_RC_MINSTREL=y
- CONFIG_MAC80211_RC_MINSTREL_HT=y
+ export CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
+-export CONFIG_MAC80211_RC_PID=y
++# export CONFIG_MAC80211_RC_PID=y
+ export CONFIG_MAC80211_RC_MINSTREL=y
+ export CONFIG_MAC80211_RC_MINSTREL_HT=y
  ifdef CONFIG_LEDS_TRIGGERS
diff --git a/package/mac80211/patches/017-remove_ath9k_rc.patch b/package/mac80211/patches/017-remove_ath9k_rc.patch
index fd818adf1..c33e1d0f8 100644
--- a/package/mac80211/patches/017-remove_ath9k_rc.patch
+++ b/package/mac80211/patches/017-remove_ath9k_rc.patch
@@ -1,11 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -266,7 +266,7 @@ CONFIG_ATH9K_COMMON=m
+@@ -261,7 +261,7 @@ export CONFIG_ATH9K_COMMON=m
  # as default once we get minstrel properly tested and blessed by
  # our systems engineering team. CCK rates also need to be used
  # for long range considerations.
--CONFIG_ATH9K_RATE_CONTROL=y
-+# CONFIG_ATH9K_RATE_CONTROL=y
+-export CONFIG_COMPAT_ATH9K_RATE_CONTROL=y
++# export CONFIG_COMPAT_ATH9K_RATE_CONTROL=y
  
- CONFIG_ATH9K_BTCOEX_SUPPORT=y
+ export CONFIG_ATH9K_BTCOEX_SUPPORT=y
  
diff --git a/package/mac80211/patches/019-remove_ath5k_pci_option.patch b/package/mac80211/patches/019-remove_ath5k_pci_option.patch
index 40a5cfc2d..c83874b14 100644
--- a/package/mac80211/patches/019-remove_ath5k_pci_option.patch
+++ b/package/mac80211/patches/019-remove_ath5k_pci_option.patch
@@ -1,11 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -273,7 +273,7 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y
+@@ -268,7 +268,7 @@ export CONFIG_ATH9K_BTCOEX_SUPPORT=y
  # PCI Drivers
  ifdef CONFIG_PCI
  
--CONFIG_ATH5K_PCI=y
-+# CONFIG_ATH5K_PCI=y
- CONFIG_ATH9K_PCI=y
+-export CONFIG_ATH5K_PCI=y
++# export CONFIG_ATH5K_PCI=y
+ export CONFIG_ATH9K_PCI=y
  
- CONFIG_IWLWIFI=m
+ export CONFIG_IWLWIFI=m
diff --git a/package/mac80211/patches/022-remove_crc8_and_cordic.patch b/package/mac80211/patches/022-remove_crc8_and_cordic.patch
index 514d56b85..f5505d96d 100644
--- a/package/mac80211/patches/022-remove_crc8_and_cordic.patch
+++ b/package/mac80211/patches/022-remove_crc8_and_cordic.patch
@@ -1,8 +1,8 @@
 --- a/compat/Makefile
 +++ b/compat/Makefile
-@@ -36,8 +36,6 @@ compat-$(CONFIG_COMPAT_KERNEL_2_6_39) +=
- compat-$(CONFIG_COMPAT_KERNEL_3_0) += compat-3.0.o
- compat-$(CONFIG_COMPAT_KERNEL_3_2) += compat-3.2.o
+@@ -38,8 +38,6 @@ compat-$(CONFIG_COMPAT_KERNEL_3_2) += co
+ compat-$(CONFIG_COMPAT_KERNEL_3_3) += compat-3.3.o
+ compat-$(CONFIG_COMPAT_KERNEL_3_5) += compat-3.5.o
  
 -compat-$(CONFIG_COMPAT_CORDIC) += cordic.o
 -compat-$(CONFIG_COMPAT_CRC8) += crc8.o
diff --git a/package/mac80211/patches/023-ath9k_disable_btcoex.patch b/package/mac80211/patches/023-ath9k_disable_btcoex.patch
index 9c2ba497c..c603e8759 100644
--- a/package/mac80211/patches/023-ath9k_disable_btcoex.patch
+++ b/package/mac80211/patches/023-ath9k_disable_btcoex.patch
@@ -1,11 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -268,7 +268,7 @@ CONFIG_ATH9K_COMMON=m
+@@ -263,7 +263,7 @@ export CONFIG_ATH9K_COMMON=m
  # for long range considerations.
- # CONFIG_ATH9K_RATE_CONTROL=y
+ # export CONFIG_COMPAT_ATH9K_RATE_CONTROL=y
  
--CONFIG_ATH9K_BTCOEX_SUPPORT=y
-+# CONFIG_ATH9K_BTCOEX_SUPPORT=y
+-export CONFIG_ATH9K_BTCOEX_SUPPORT=y
++# export CONFIG_ATH9K_BTCOEX_SUPPORT=y
  
  # PCI Drivers
  ifdef CONFIG_PCI
diff --git a/package/mac80211/patches/050-compat_firmware.patch b/package/mac80211/patches/050-compat_firmware.patch
index af7c4fec6..4fd501175 100644
--- a/package/mac80211/patches/050-compat_firmware.patch
+++ b/package/mac80211/patches/050-compat_firmware.patch
@@ -17,7 +17,7 @@
  compat-$(CONFIG_COMPAT_KERNEL_2_6_18) += compat-2.6.18.o
 --- a/compat/compat_firmware_class.c
 +++ b/compat/compat_firmware_class.c
-@@ -741,19 +741,16 @@ request_firmware_nowait(
+@@ -741,19 +741,16 @@ compat_request_firmware_nowait(
  	return 0;
  }
  
@@ -36,14 +36,14 @@
 -fs_initcall(firmware_class_init);
 -module_exit(firmware_class_exit);
 -
- EXPORT_SYMBOL(release_firmware);
- EXPORT_SYMBOL(request_firmware);
- EXPORT_SYMBOL(request_firmware_nowait);
+ EXPORT_SYMBOL_GPL(release_firmware);
+ EXPORT_SYMBOL_GPL(request_firmware);
+ EXPORT_SYMBOL_GPL(request_firmware_nowait);
 --- a/compat/main.c
 +++ b/compat/main.c
-@@ -32,6 +32,17 @@ module_param(compat_version, charp, 0400
- MODULE_PARM_DESC(compat_version,
- 		 "Version of the kernel compat backport work");
+@@ -37,6 +37,17 @@ void compat_dependency_symbol(void)
+ }
+ EXPORT_SYMBOL_GPL(compat_dependency_symbol);
  
 +#if defined(CONFIG_FW_LOADER) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
 +int __init firmware_class_init(void);
@@ -59,7 +59,7 @@
  static int __init compat_init(void)
  {
  	/* pm-qos for kernels <= 2.6.24, this is a no-op on newer kernels */
-@@ -46,7 +57,8 @@ static int __init compat_init(void)
+@@ -51,7 +62,8 @@ static int __init compat_init(void)
  	       COMPAT_BASE_TREE " " COMPAT_BASE_TREE_VERSION
  	       "\n");
  
@@ -69,7 +69,7 @@
  }
  module_init(compat_init);
  
-@@ -55,7 +67,8 @@ static void __exit compat_exit(void)
+@@ -60,7 +72,8 @@ static void __exit compat_exit(void)
  	compat_pm_qos_power_deinit();
  	compat_system_workqueue_destroy();
  
diff --git a/package/mac80211/patches/100-disable_pcmcia_compat.patch b/package/mac80211/patches/100-disable_pcmcia_compat.patch
index 39478ee8c..c038de959 100644
--- a/package/mac80211/patches/100-disable_pcmcia_compat.patch
+++ b/package/mac80211/patches/100-disable_pcmcia_compat.patch
@@ -21,7 +21,7 @@
  /**
   * pccard_loop_tuple() - loop over tuples in the CIS
 @@ -73,7 +73,7 @@ next_entry:
- EXPORT_SYMBOL(pccard_loop_tuple);
+ EXPORT_SYMBOL_GPL(pccard_loop_tuple);
  /* Source: drivers/pcmcia/cistpl.c */
  
 -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
@@ -31,7 +31,7 @@
  	struct pcmcia_device *p_dev;
 --- a/include/linux/compat-2.6.28.h
 +++ b/include/linux/compat-2.6.28.h
-@@ -44,7 +44,7 @@ typedef u32 phys_addr_t;
+@@ -48,7 +48,7 @@ typedef u32 phys_addr_t;
  })
  #endif /* From include/asm-generic/bug.h */
  
diff --git a/package/mac80211/patches/110-disable_usb_compat.patch b/package/mac80211/patches/110-disable_usb_compat.patch
index c60580148..04e9101b7 100644
--- a/package/mac80211/patches/110-disable_usb_compat.patch
+++ b/package/mac80211/patches/110-disable_usb_compat.patch
@@ -1,6 +1,6 @@
 --- a/compat/compat-2.6.28.c
 +++ b/compat/compat-2.6.28.c
-@@ -165,7 +165,7 @@ EXPORT_SYMBOL(pcmcia_loop_config);
+@@ -165,7 +165,7 @@ EXPORT_SYMBOL_GPL(pcmcia_loop_config);
  
  #endif /* CONFIG_PCMCIA */
  
@@ -12,7 +12,7 @@
 --- a/compat/compat-2.6.29.c
 +++ b/compat/compat-2.6.29.c
 @@ -49,7 +49,7 @@ void netdev_attach_ops(struct net_device
- EXPORT_SYMBOL(netdev_attach_ops);
+ EXPORT_SYMBOL_GPL(netdev_attach_ops);
  
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
 -#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
@@ -22,7 +22,7 @@
   * @anchor: anchor the requests are bound to
 --- a/include/linux/compat-2.6.28.h
 +++ b/include/linux/compat-2.6.28.h
-@@ -69,7 +69,7 @@ int pcmcia_loop_config(struct pcmcia_dev
+@@ -73,7 +73,7 @@ int pcmcia_loop_config(struct pcmcia_dev
  /* USB anchors were added as of 2.6.23 */
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
  
@@ -33,12 +33,12 @@
  #endif
 --- a/config.mk
 +++ b/config.mk
-@@ -503,7 +503,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
+@@ -498,7 +498,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
  # This activates a threading fix for usb urb.
  # this is mainline commit: b3e670443b7fb8a2d29831b62b44a039c283e351
  # This fix will be included in some stable releases.
--CONFIG_COMPAT_USB_URB_THREAD_FIX=y
-+# CONFIG_COMPAT_USB_URB_THREAD_FIX=y
+-export CONFIG_COMPAT_USB_URB_THREAD_FIX=y
++# export CONFIG_COMPAT_USB_URB_THREAD_FIX=y
  
- CONFIG_ATH9K_HTC=m
+ export CONFIG_ATH9K_HTC=m
  # CONFIG_ATH9K_HTC_DEBUGFS=y
diff --git a/package/mac80211/patches/120-pr_fmt_warnings.patch b/package/mac80211/patches/120-pr_fmt_warnings.patch
index c71777843..a8f7868b2 100644
--- a/package/mac80211/patches/120-pr_fmt_warnings.patch
+++ b/package/mac80211/patches/120-pr_fmt_warnings.patch
@@ -165,16 +165,6 @@
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
  #include <linux/etherdevice.h>
---- a/compat/crc8.c
-+++ b/compat/crc8.c
-@@ -14,6 +14,7 @@
-  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#undef pr_fmt
- #define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
- 
- #include <linux/module.h>
 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
 @@ -16,6 +16,7 @@
@@ -235,3 +225,270 @@
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
  #include <linux/pci_ids.h>
+--- a/drivers/net/wireless/ath/ath5k/ani.c
++++ b/drivers/net/wireless/ath/ath5k/ani.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "ath5k.h"
+--- a/drivers/net/wireless/ath/ath5k/attach.c
++++ b/drivers/net/wireless/ath/ath5k/attach.c
+@@ -20,6 +20,7 @@
+ * Attach/Detach Functions and helpers *
+ \*************************************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/pci.h>
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -40,6 +40,7 @@
+  *
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/module.h>
+--- a/drivers/net/wireless/ath/ath5k/debug.c
++++ b/drivers/net/wireless/ath/ath5k/debug.c
+@@ -58,6 +58,7 @@
+  * THE POSSIBILITY OF SUCH DAMAGES.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/export.h>
+--- a/drivers/net/wireless/ath/ath5k/desc.c
++++ b/drivers/net/wireless/ath/ath5k/desc.c
+@@ -21,6 +21,7 @@
+  Hardware Descriptor Functions
+ \******************************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "ath5k.h"
+--- a/drivers/net/wireless/ath/ath5k/dma.c
++++ b/drivers/net/wireless/ath/ath5k/dma.c
+@@ -29,6 +29,7 @@
+  * status registers (ISR).
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "ath5k.h"
+--- a/drivers/net/wireless/ath/ath5k/eeprom.c
++++ b/drivers/net/wireless/ath/ath5k/eeprom.c
+@@ -21,6 +21,7 @@
+ * EEPROM access functions and helpers *
+ \*************************************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/slab.h>
+--- a/drivers/net/wireless/ath/ath5k/initvals.c
++++ b/drivers/net/wireless/ath/ath5k/initvals.c
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "ath5k.h"
+--- a/drivers/net/wireless/ath/ath5k/led.c
++++ b/drivers/net/wireless/ath/ath5k/led.c
+@@ -39,6 +39,7 @@
+  *
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/pci.h>
+--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
++++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+@@ -41,6 +41,7 @@
+  *
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <net/mac80211.h>
+--- a/drivers/net/wireless/ath/ath5k/pci.c
++++ b/drivers/net/wireless/ath/ath5k/pci.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/nl80211.h>
+--- a/drivers/net/wireless/ath/ath5k/phy.c
++++ b/drivers/net/wireless/ath/ath5k/phy.c
+@@ -22,6 +22,7 @@
+ * PHY related functions *
+ \***********************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/delay.h>
+--- a/drivers/net/wireless/ath/ath5k/qcu.c
++++ b/drivers/net/wireless/ath/ath5k/qcu.c
+@@ -20,6 +20,7 @@
+ Queue Control Unit, DCF Control Unit Functions
+ \********************************************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "ath5k.h"
+--- a/drivers/net/wireless/ath/ath5k/reset.c
++++ b/drivers/net/wireless/ath/ath5k/reset.c
+@@ -23,6 +23,7 @@
+   Reset function and helpers
+ \****************************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <asm/unaligned.h>
+--- a/drivers/net/wireless/ath/ath5k/sysfs.c
++++ b/drivers/net/wireless/ath/ath5k/sysfs.c
+@@ -1,3 +1,4 @@
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/device.h>
+--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
++++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
+@@ -15,6 +15,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/moduleparam.h>
+--- a/drivers/net/wireless/ath/ath6kl/init.c
++++ b/drivers/net/wireless/ath/ath6kl/init.c
+@@ -16,6 +16,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/moduleparam.h>
+--- a/drivers/net/wireless/ath/ath6kl/main.c
++++ b/drivers/net/wireless/ath/ath6kl/main.c
+@@ -15,6 +15,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "core.h"
+--- a/drivers/net/wireless/ath/ath6kl/txrx.c
++++ b/drivers/net/wireless/ath/ath6kl/txrx.c
+@@ -15,6 +15,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "core.h"
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "htc.h"
+--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
++++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include "htc.h"
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/dma-mapping.h>
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/nl80211.h>
+--- a/drivers/net/wireless/ath/main.c
++++ b/drivers/net/wireless/ath/main.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/kernel.h>
+--- a/drivers/net/wireless/ath/regd.c
++++ b/drivers/net/wireless/ath/regd.c
+@@ -14,6 +14,7 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/kernel.h>
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
+@@ -27,6 +27,7 @@
+  *
+  *****************************************************************************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/kernel.h>
+--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
++++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
+@@ -61,6 +61,7 @@
+  *
+  *****************************************************************************/
+ 
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/module.h>
diff --git a/package/mac80211/patches/130-mesh_pathtbl_backport.patch b/package/mac80211/patches/130-mesh_pathtbl_backport.patch
index bc4b40a52..817060d42 100644
--- a/package/mac80211/patches/130-mesh_pathtbl_backport.patch
+++ b/package/mac80211/patches/130-mesh_pathtbl_backport.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/mesh_pathtbl.c
 +++ b/net/mac80211/mesh_pathtbl.c
-@@ -828,7 +828,6 @@ static void table_flush_by_iface(struct 
+@@ -826,7 +826,6 @@ static void table_flush_by_iface(struct 
  	struct hlist_node *p;
  	int i;
  
diff --git a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
index 20f232595..eb5547b2b 100644
--- a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
+++ b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/initvals.c
 +++ b/drivers/net/wireless/ath/ath5k/initvals.c
-@@ -60,8 +60,14 @@ static const struct ath5k_ini ar5210_ini
+@@ -63,8 +63,14 @@ static const struct ath5k_ini ar5210_ini
  	{ AR5K_IMR,		0 },
  	{ AR5K_IER,		AR5K_IER_DISABLE },
  	{ AR5K_BSR,		0, AR5K_INI_READ },
@@ -17,7 +17,7 @@
  	{ AR5K_RXNOFRM,		8 },
 --- a/drivers/net/wireless/ath/ath5k/dma.c
 +++ b/drivers/net/wireless/ath/ath5k/dma.c
-@@ -858,10 +858,18 @@ ath5k_hw_dma_init(struct ath5k_hw *ah)
+@@ -861,10 +861,18 @@ ath5k_hw_dma_init(struct ath5k_hw *ah)
  	 * guess we can tweak it and see how it goes ;-)
  	 */
  	if (ah->ah_version != AR5K_AR5210) {
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 64067f2d4..9afe20e8c 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1,239 +1,552 @@
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -326,7 +326,6 @@ static bool ar9003_hw_get_isr(struct ath
- static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
- 				 struct ath_tx_status *ts)
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1171,7 +1171,7 @@ ath5k_check_ibss_tsf(struct ath5k_hw *ah
+ 
+ 	if (ieee80211_is_beacon(mgmt->frame_control) &&
+ 	    le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS &&
+-	    memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) == 0) {
++	    compare_ether_addr(mgmt->bssid, common->curbssid) == 0) {
+ 		/*
+ 		 * Received an IBSS beacon with the same BSSID. Hardware *must*
+ 		 * have updated the local TSF. We have to work around various
+@@ -1235,7 +1235,7 @@ ath5k_update_beacon_rssi(struct ath5k_hw
+ 
+ 	/* only beacons from our BSSID */
+ 	if (!ieee80211_is_beacon(mgmt->frame_control) ||
+-	    memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) != 0)
++	    compare_ether_addr(mgmt->bssid, common->curbssid) != 0)
+ 		return;
+ 
+ 	ewma_add(&ah->ah_beacon_rssi_avg, rssi);
+@@ -2416,6 +2416,19 @@ ath5k_tx_complete_poll_work(struct work_
+ * Initialization routines *
+ \*************************/
+ 
++static const struct ieee80211_iface_limit if_limits[] = {
++	{ .max = 256,	.types = BIT(NL80211_IFTYPE_STATION) },
++	{ .max = 4,	.types = BIT(NL80211_IFTYPE_AP) |
++				 BIT(NL80211_IFTYPE_MESH_POINT) },
++};
++
++static const struct ieee80211_iface_combination if_comb = {
++	.limits = if_limits,
++	.n_limits = ARRAY_SIZE(if_limits),
++	.max_interfaces = 256,
++	.num_different_channels = 1,
++};
++
+ int __devinit
+ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
  {
--	struct ar9003_txc *txc = (struct ar9003_txc *) ds;
- 	struct ar9003_txs *ads;
- 	u32 status;
+@@ -2437,6 +2450,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const
+ 		BIT(NL80211_IFTYPE_ADHOC) |
+ 		BIT(NL80211_IFTYPE_MESH_POINT);
  
-@@ -336,11 +335,7 @@ static int ar9003_hw_proc_txdesc(struct 
- 	if ((status & AR_TxDone) == 0)
- 		return -EINPROGRESS;
++	hw->wiphy->iface_combinations = &if_comb;
++	hw->wiphy->n_iface_combinations = 1;
++
+ 	/* SW support for IBSS_RSN is provided by mac80211 */
+ 	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+ 
+--- a/drivers/net/wireless/ath/ath9k/ani.c
++++ b/drivers/net/wireless/ath/ath9k/ani.c
+@@ -274,7 +274,9 @@ static void ath9k_hw_set_ofdm_nil(struct
+ 		aniState->rssiThrLow, aniState->rssiThrHigh);
+ 
+ 	if (aniState->update_ani)
+-		aniState->ofdmNoiseImmunityLevel = immunityLevel;
++		aniState->ofdmNoiseImmunityLevel =
++			(immunityLevel > ATH9K_ANI_OFDM_DEF_LEVEL) ?
++			immunityLevel : ATH9K_ANI_OFDM_DEF_LEVEL;
+ 
+ 	entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+ 	entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+@@ -340,7 +342,9 @@ static void ath9k_hw_set_cck_nil(struct 
+ 		immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
+ 
+ 	if (aniState->update_ani)
+-		aniState->cckNoiseImmunityLevel = immunityLevel;
++		aniState->cckNoiseImmunityLevel =
++			(immunityLevel > ATH9K_ANI_CCK_DEF_LEVEL) ?
++			immunityLevel : ATH9K_ANI_CCK_DEF_LEVEL;
+ 
+ 	entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
+ 	entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
+--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+@@ -618,19 +618,10 @@ static void ar5008_hw_init_bb(struct ath
+ 	u32 synthDelay;
  
--	ts->qid = MS(ads->ds_info, AR_TxQcuNum);
--	if (!txc || (MS(txc->info, AR_TxQcuNum) == ts->qid))
--		ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size;
+ 	synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(chan))
+-		synthDelay = (4 * synthDelay) / 22;
 -	else
--		return -ENOENT;
-+	ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size;
- 
- 	if ((MS(ads->ds_info, AR_DescId) != ATHEROS_VENDOR_ID) ||
- 	    (MS(ads->ds_info, AR_TxRxDesc) != 1)) {
-@@ -354,6 +349,7 @@ static int ar9003_hw_proc_txdesc(struct 
- 	ts->ts_seqnum = MS(status, AR_SeqNum);
- 	ts->tid = MS(status, AR_TxTid);
- 
-+	ts->qid = MS(ads->ds_info, AR_TxQcuNum);
- 	ts->desc_id = MS(ads->status1, AR_TxDescId);
- 	ts->ts_tstamp = ads->status4;
- 	ts->ts_status = 0;
-@@ -440,20 +436,14 @@ int ath9k_hw_process_rxdesc_edma(struct 
- 	struct ar9003_rxs *rxsp = (struct ar9003_rxs *) buf_addr;
- 	unsigned int phyerr;
- 
--	/* TODO: byte swap on big endian for ar9300_10 */
+-		synthDelay /= 10;
 -
--	if (!rxs) {
--		if ((rxsp->status11 & AR_RxDone) == 0)
--			return -EINPROGRESS;
--
--		if (MS(rxsp->ds_info, AR_DescId) != 0x168c)
--			return -EINVAL;
-+	if ((rxsp->status11 & AR_RxDone) == 0)
-+		return -EINPROGRESS;
+-	if (IS_CHAN_HALF_RATE(chan))
+-		synthDelay *= 2;
+-	else if (IS_CHAN_QUARTER_RATE(chan))
+-		synthDelay *= 4;
  
--		if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0)
--			return -EINPROGRESS;
-+	if (MS(rxsp->ds_info, AR_DescId) != 0x168c)
-+		return -EINVAL;
+ 	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
  
--		return 0;
--	}
-+	if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0)
-+		return -EINPROGRESS;
- 
- 	rxs->rs_status = 0;
- 	rxs->rs_flags =  0;
-@@ -510,7 +500,11 @@ int ath9k_hw_process_rxdesc_edma(struct 
- 		 */
- 		if (rxsp->status11 & AR_CRCErr)
- 			rxs->rs_status |= ATH9K_RXERR_CRC;
--		else if (rxsp->status11 & AR_PHYErr) {
-+		else if (rxsp->status11 & AR_DecryptCRCErr)
-+			rxs->rs_status |= ATH9K_RXERR_DECRYPT;
-+		else if (rxsp->status11 & AR_MichaelErr)
-+			rxs->rs_status |= ATH9K_RXERR_MIC;
-+		if (rxsp->status11 & AR_PHYErr) {
- 			phyerr = MS(rxsp->status11, AR_PHYErrCode);
- 			/*
- 			 * If we reach a point here where AR_PostDelimCRCErr is
-@@ -532,11 +526,7 @@ int ath9k_hw_process_rxdesc_edma(struct 
- 				rxs->rs_status |= ATH9K_RXERR_PHY;
- 				rxs->rs_phyerr = phyerr;
- 			}
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, chan, synthDelay);
+ }
+ 
+ static void ar5008_hw_init_chain_masks(struct ath_hw *ah)
+@@ -868,7 +859,7 @@ static int ar5008_hw_process_ini(struct 
+ 	ar5008_hw_set_channel_regs(ah, chan);
+ 	ar5008_hw_init_chain_masks(ah);
+ 	ath9k_olc_init(ah);
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, false);
+ 
+ 	/* Write analog registers */
+ 	if (!ath9k_hw_set_rf_regs(ah, chan, freqIndex)) {
+@@ -948,12 +939,8 @@ static bool ar5008_hw_rfbus_req(struct a
+ static void ar5008_hw_rfbus_done(struct ath_hw *ah)
+ {
+ 	u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(ah->curchan))
+-		synthDelay = (4 * synthDelay) / 22;
+-	else
+-		synthDelay /= 10;
+ 
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
+ 
+ 	REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
+ }
+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+@@ -1000,10 +1000,12 @@ static bool ar9003_hw_init_cal(struct at
+ 	if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
+ 		ar9003_mci_init_cal_req(ah, &is_reusable);
+ 
+-	txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
+-	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
+-	udelay(5);
+-	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
++	if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
++		txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
++		REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
++		udelay(5);
++		REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
++	}
+ 
+ skip_tx_iqcal:
+ 	if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
+--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+@@ -54,7 +54,7 @@ void ar9003_paprd_enable(struct ath_hw *
+ 
+ 	if (val) {
+ 		ah->paprd_table_write_done = true;
+-		ath9k_hw_apply_txpower(ah, chan);
++		ath9k_hw_apply_txpower(ah, chan, false);
+ 	}
+ 
+ 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -524,22 +524,10 @@ static void ar9003_hw_init_bb(struct ath
+ 	 * Value is in 100ns increments.
+ 	 */
+ 	synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(chan))
+-		synthDelay = (4 * synthDelay) / 22;
+-	else
+-		synthDelay /= 10;
+ 
+ 	/* Activate the PHY (includes baseband activate + synthesizer on) */
+ 	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
 -
--		} else if (rxsp->status11 & AR_DecryptCRCErr)
--			rxs->rs_status |= ATH9K_RXERR_DECRYPT;
--		else if (rxsp->status11 & AR_MichaelErr)
--			rxs->rs_status |= ATH9K_RXERR_MIC;
-+		};
+-	/*
+-	 * There is an issue if the AP starts the calibration before
+-	 * the base band timeout completes.  This could result in the
+-	 * rx_clear false triggering.  As a workaround we add delay an
+-	 * extra BASE_ACTIVATE_DELAY usecs to ensure this condition
+-	 * does not happen.
+-	 */
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, chan, synthDelay);
+ }
+ 
+ static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
+@@ -690,7 +678,7 @@ static int ar9003_hw_process_ini(struct 
+ 	ar9003_hw_override_ini(ah);
+ 	ar9003_hw_set_channel_regs(ah, chan);
+ 	ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, false);
+ 
+ 	if (AR_SREV_9462(ah)) {
+ 		if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
+@@ -721,6 +709,14 @@ static void ar9003_hw_set_rfmode(struct 
+ 
+ 	if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ 		rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
++	if (IS_CHAN_QUARTER_RATE(chan))
++		rfMode |= AR_PHY_MODE_QUARTER;
++	if (IS_CHAN_HALF_RATE(chan))
++		rfMode |= AR_PHY_MODE_HALF;
++
++	if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
++		REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,
++			      AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW, 3);
+ 
+ 	REG_WRITE(ah, AR_PHY_MODE, rfMode);
+ }
+@@ -791,12 +787,8 @@ static bool ar9003_hw_rfbus_req(struct a
+ static void ar9003_hw_rfbus_done(struct ath_hw *ah)
+ {
+ 	u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY;
+-	if (IS_CHAN_B(ah->curchan))
+-		synthDelay = (4 * synthDelay) / 22;
+-	else
+-		synthDelay /= 10;
+ 
+-	udelay(synthDelay + BASE_ACTIVATE_DELAY);
++	ath9k_hw_synth_delay(ah, ah->curchan, synthDelay);
+ 
+ 	REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0);
+ }
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+@@ -468,6 +468,9 @@
+ #define AR_PHY_ADDAC_PARA_CTL    (AR_SM_BASE + 0x150)
+ #define AR_PHY_XPA_CFG           (AR_SM_BASE + 0x158)
+ 
++#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW  3
++#define AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW_S    0
++
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A           0x0001FC00
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A_S         10
+ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A                       0x3FF
+--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+@@ -1115,9 +1115,9 @@ static const u32 ar9462_2p0_mac_core[][2
+ 	{0x000081f8, 0x00000000},
+ 	{0x000081fc, 0x00000000},
+ 	{0x00008240, 0x00100000},
+-	{0x00008244, 0x0010f400},
++	{0x00008244, 0x0010f424},
+ 	{0x00008248, 0x00000800},
+-	{0x0000824c, 0x0001e800},
++	{0x0000824c, 0x0001e848},
+ 	{0x00008250, 0x00000000},
+ 	{0x00008254, 0x00000000},
+ 	{0x00008258, 0x00000000},
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -370,7 +370,7 @@ struct ath_vif {
+  * number of beacon intervals, the game's up.
+  */
+ #define BSTUCK_THRESH           	9
+-#define	ATH_BCBUF               	4
++#define	ATH_BCBUF               	8
+ #define ATH_DEFAULT_BINTVAL     	100 /* TU */
+ #define ATH_DEFAULT_BMISS_LIMIT 	10
+ #define IEEE80211_MS_TO_TU(x)           (((x) * 1000) / 1024)
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -91,7 +91,7 @@ static void ath_beacon_setup(struct ath_
+ 	info.txpower = MAX_RATE_POWER;
+ 	info.keyix = ATH9K_TXKEYIX_INVALID;
+ 	info.keytype = ATH9K_KEY_TYPE_CLEAR;
+-	info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_INTREQ;
++	info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_CLRDMASK;
+ 
+ 	info.buf_addr[0] = bf->bf_buf_addr;
+ 	info.buf_len[0] = roundup(skb->len, 4);
+@@ -359,6 +359,11 @@ void ath_beacon_tasklet(unsigned long da
+ 	int slot;
+ 	u32 bfaddr, bc = 0;
+ 
++	if (work_pending(&sc->hw_reset_work)) {
++		ath_dbg(common, RESET,
++			"reset work is pending, skip beaconing now\n");
++		return;
++	}
+ 	/*
+ 	 * Check if the previous beacon has gone out.  If
+ 	 * not don't try to post another, skip this period
+@@ -369,6 +374,9 @@ void ath_beacon_tasklet(unsigned long da
+ 	if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {
+ 		sc->beacon.bmisscnt++;
+ 
++		if (!ath9k_hw_check_alive(ah))
++			ieee80211_queue_work(sc->hw, &sc->hw_check_work);
++
+ 		if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {
+ 			ath_dbg(common, BSTUCK,
+ 				"missed %u consecutive beacons\n",
+@@ -378,6 +386,7 @@ void ath_beacon_tasklet(unsigned long da
+ 				ath9k_hw_bstuck_nfcal(ah);
+ 		} else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
+ 			ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
++			sc->beacon.bmisscnt = 0;
+ 			sc->sc_flags |= SC_OP_TSF_RESET;
+ 			ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+ 		}
+@@ -650,6 +659,8 @@ static void ath_beacon_config_adhoc(stru
+ 	u32 tsf, intval, nexttbtt;
+ 
+ 	ath9k_reset_beacon_status(sc);
++	if (!(sc->sc_flags & SC_OP_BEACONS))
++		ath9k_hw_settsf64(ah, sc->beacon.bc_tstamp);
+ 
+ 	intval = TU_TO_USEC(conf->beacon_interval);
+ 	tsf = roundup(ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE), intval);
+--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
++++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+@@ -824,6 +824,8 @@ static void ath9k_hw_ar9287_set_txpower(
+ 			regulatory->max_power_level = ratesArray[i];
  	}
  
- 	if (rxsp->status11 & AR_KeyMiss)
---- a/drivers/net/wireless/ath/carl9170/tx.c
-+++ b/drivers/net/wireless/ath/carl9170/tx.c
-@@ -1236,6 +1236,7 @@ static bool carl9170_tx_ps_drop(struct a
++	ath9k_hw_update_regulatory_maxpower(ah);
++
+ 	if (test)
+ 		return;
+ 
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -41,6 +41,9 @@ void ath_init_leds(struct ath_softc *sc)
  {
- 	struct ieee80211_sta *sta;
- 	struct carl9170_sta_info *sta_info;
-+	struct ieee80211_tx_info *tx_info;
- 
- 	rcu_read_lock();
- 	sta = __carl9170_get_tx_sta(ar, skb);
-@@ -1243,12 +1244,13 @@ static bool carl9170_tx_ps_drop(struct a
- 		goto out_rcu;
- 
- 	sta_info = (void *) sta->drv_priv;
--	if (unlikely(sta_info->sleeping)) {
--		struct ieee80211_tx_info *tx_info;
-+	tx_info = IEEE80211_SKB_CB(skb);
- 
-+	if (unlikely(sta_info->sleeping) &&
-+	    !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
-+				IEEE80211_TX_CTL_CLEAR_PS_FILT))) {
- 		rcu_read_unlock();
- 
--		tx_info = IEEE80211_SKB_CB(skb);
- 		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
- 			atomic_dec(&ar->tx_ampdu_upload);
- 
---- a/drivers/net/wireless/iwlegacy/4965-mac.c
-+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
-@@ -1694,7 +1694,7 @@ il4965_tx_skb(struct il_priv *il, struct
- 		sta_priv = (void *)sta->drv_priv;
- 
- 	if (sta_priv && sta_priv->asleep &&
--	    (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
-+	    (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
- 		/*
- 		 * This sends an asynchronous command to the device,
- 		 * but we can rely on it being processed before the
---- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
-@@ -322,7 +322,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
- 		sta_priv = (void *)info->control.sta->drv_priv;
- 
- 	if (sta_priv && sta_priv->asleep &&
--	    (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
-+	    (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
- 		/*
- 		 * This sends an asynchronous command to the device,
- 		 * but we can rely on it being processed before the
-@@ -331,6 +331,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
- 		 * counter.
- 		 * For now set the counter to just 1 since we do not
- 		 * support uAPSD yet.
-+		 *
-+		 * FIXME: If we get two non-bufferable frames one
-+		 * after the other, we might only send out one of
-+		 * them because this is racy.
- 		 */
- 		iwl_sta_modify_sleep_tx_count(priv, sta_id, 1);
+ 	int ret;
+ 
++	if (AR_SREV_9100(sc->sc_ah))
++		return;
++
+ 	if (sc->sc_ah->led_pin < 0) {
+ 		if (AR_SREV_9287(sc->sc_ah))
+ 			sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -142,6 +142,22 @@ bool ath9k_hw_wait(struct ath_hw *ah, u3
+ }
+ EXPORT_SYMBOL(ath9k_hw_wait);
+ 
++void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
++			  int hw_delay)
++{
++	if (IS_CHAN_B(chan))
++		hw_delay = (4 * hw_delay) / 22;
++	else
++		hw_delay /= 10;
++
++	if (IS_CHAN_HALF_RATE(chan))
++		hw_delay *= 2;
++	else if (IS_CHAN_QUARTER_RATE(chan))
++		hw_delay *= 4;
++
++	udelay(hw_delay + BASE_ACTIVATE_DELAY);
++}
++
+ void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+ 			  int column, unsigned int *writecnt)
+ {
+@@ -388,8 +404,8 @@ static void ath9k_hw_init_config(struct 
+ {
+ 	int i;
+ 
+-	ah->config.dma_beacon_response_time = 2;
+-	ah->config.sw_beacon_response_time = 10;
++	ah->config.dma_beacon_response_time = 1;
++	ah->config.sw_beacon_response_time = 6;
+ 	ah->config.additional_swba_backoff = 0;
+ 	ah->config.ack_6mb = 0x0;
+ 	ah->config.cwm_ignore_extcca = 0;
+@@ -971,7 +987,7 @@ void ath9k_hw_init_global_settings(struc
+ 	struct ath_common *common = ath9k_hw_common(ah);
+ 	struct ieee80211_conf *conf = &common->hw->conf;
+ 	const struct ath9k_channel *chan = ah->curchan;
+-	int acktimeout, ctstimeout;
++	int acktimeout, ctstimeout, ack_offset = 0;
+ 	int slottime;
+ 	int sifstime;
+ 	int rx_lat = 0, tx_lat = 0, eifs = 0;
+@@ -992,6 +1008,11 @@ void ath9k_hw_init_global_settings(struc
+ 		rx_lat = 37;
+ 	tx_lat = 54;
+ 
++	if (IS_CHAN_5GHZ(chan))
++		sifstime = 16;
++	else
++		sifstime = 10;
++
+ 	if (IS_CHAN_HALF_RATE(chan)) {
+ 		eifs = 175;
+ 		rx_lat *= 2;
+@@ -999,8 +1020,9 @@ void ath9k_hw_init_global_settings(struc
+ 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ 		    tx_lat += 11;
+ 
++		sifstime *= 2;
++		ack_offset = 16;
+ 		slottime = 13;
+-		sifstime = 32;
+ 	} else if (IS_CHAN_QUARTER_RATE(chan)) {
+ 		eifs = 340;
+ 		rx_lat = (rx_lat * 4) - 1;
+@@ -1008,8 +1030,9 @@ void ath9k_hw_init_global_settings(struc
+ 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
+ 		    tx_lat += 22;
+ 
++		sifstime *= 4;
++		ack_offset = 32;
+ 		slottime = 21;
+-		sifstime = 64;
+ 	} else {
+ 		if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) {
+ 			eifs = AR_D_GBL_IFS_EIFS_ASYNC_FIFO;
+@@ -1023,14 +1046,10 @@ void ath9k_hw_init_global_settings(struc
+ 		tx_lat = MS(reg, AR_USEC_TX_LAT);
+ 
+ 		slottime = ah->slottime;
+-		if (IS_CHAN_5GHZ(chan))
+-			sifstime = 16;
+-		else
+-			sifstime = 10;
  	}
---- a/drivers/net/wireless/p54/txrx.c
-+++ b/drivers/net/wireless/p54/txrx.c
-@@ -690,7 +690,7 @@ static void p54_tx_80211_header(struct p
- 	if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
- 		*flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
- 
--	if (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)
-+	if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
- 		*flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL;
- 
- 	if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -341,9 +341,9 @@ struct ieee80211_bss_conf {
-  *	used to indicate that a frame was already retried due to PS
-  * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
-  *	used to indicate frame should not be encrypted
-- * @IEEE80211_TX_CTL_POLL_RESPONSE: This frame is a response to a poll
-- *	frame (PS-Poll or uAPSD) and should be sent although the station
-- *	is in powersave mode.
-+ * @IEEE80211_TX_CTL_NO_PS_BUFFER: This frame is a response to a poll
-+ *	frame (PS-Poll or uAPSD) or a non-bufferable MMPDU and must
-+ *	be sent although the station is in powersave mode.
-  * @IEEE80211_TX_CTL_MORE_FRAMES: More frames will be passed to the
-  *	transmit function after the current frame, this can be used
-  *	by drivers to kick the DMA queue only if unset or when the
-@@ -399,7 +399,7 @@ enum mac80211_tx_control_flags {
- 	IEEE80211_TX_INTFL_NEED_TXPROCESSING	= BIT(14),
- 	IEEE80211_TX_INTFL_RETRIED		= BIT(15),
- 	IEEE80211_TX_INTFL_DONT_ENCRYPT		= BIT(16),
--	IEEE80211_TX_CTL_POLL_RESPONSE		= BIT(17),
-+	IEEE80211_TX_CTL_NO_PS_BUFFER		= BIT(17),
- 	IEEE80211_TX_CTL_MORE_FRAMES		= BIT(18),
- 	IEEE80211_TX_INTFL_RETRANSMISSION	= BIT(19),
- 	/* hole at 20, use later */
-@@ -425,7 +425,7 @@ enum mac80211_tx_control_flags {
- 	IEEE80211_TX_CTL_SEND_AFTER_DTIM | IEEE80211_TX_CTL_AMPDU |	      \
- 	IEEE80211_TX_STAT_TX_FILTERED |	IEEE80211_TX_STAT_ACK |		      \
- 	IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_STAT_AMPDU_NO_BACK |	      \
--	IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_POLL_RESPONSE |   \
-+	IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_NO_PS_BUFFER |    \
- 	IEEE80211_TX_CTL_MORE_FRAMES | IEEE80211_TX_CTL_LDPC |		      \
- 	IEEE80211_TX_CTL_STBC | IEEE80211_TX_STATUS_EOSP)
- 
-@@ -659,6 +659,8 @@ ieee80211_tx_info_clear_status(struct ie
-  * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
-  * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
-  * @RX_FLAG_SHORT_GI: Short guard interval was used
-+ * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present.
-+ *	Valid only for data frames (mainly A-MPDU)
-  */
- enum mac80211_rx_flags {
- 	RX_FLAG_MMIC_ERROR	= 1<<0,
-@@ -672,6 +674,7 @@ enum mac80211_rx_flags {
- 	RX_FLAG_HT		= 1<<9,
- 	RX_FLAG_40MHZ		= 1<<10,
- 	RX_FLAG_SHORT_GI	= 1<<11,
-+	RX_FLAG_NO_SIGNAL_VAL	= 1<<12,
- };
- 
- /**
-@@ -1634,7 +1637,7 @@ void ieee80211_free_txskb(struct ieee802
-  * the station sends a PS-Poll or a uAPSD trigger frame, mac80211
-  * will inform the driver of this with the @allow_buffered_frames
-  * callback; this callback is optional. mac80211 will then transmit
-- * the frames as usual and set the %IEEE80211_TX_CTL_POLL_RESPONSE
-+ * the frames as usual and set the %IEEE80211_TX_CTL_NO_PS_BUFFER
-  * on each frame. The last frame in the service period (or the only
-  * response to a PS-Poll) also has %IEEE80211_TX_STATUS_EOSP set to
-  * indicate that it ends the service period; as this frame must have
-@@ -1642,6 +1645,9 @@ void ieee80211_free_txskb(struct ieee802
-  * When TX status is reported for this frame, the service period is
-  * marked has having ended and a new one can be started by the peer.
-  *
-+ * Additionally, non-bufferable MMPDUs can also be transmitted by
-+ * mac80211 with the %IEEE80211_TX_CTL_NO_PS_BUFFER set in them.
-+ *
-  * Another race condition can happen on some devices like iwlwifi
-  * when there are frames queued for the station and it wakes up
-  * or polls; the frames that are already queued could end up being
-@@ -2140,7 +2146,7 @@ enum ieee80211_frame_release_type {
-  * @allow_buffered_frames: Prepare device to allow the given number of frames
-  *	to go out to the given station. The frames will be sent by mac80211
-  *	via the usual TX path after this call. The TX information for frames
-- *	released will also have the %IEEE80211_TX_CTL_POLL_RESPONSE flag set
-+ *	released will also have the %IEEE80211_TX_CTL_NO_PS_BUFFER flag set
-  *	and the last one will also have %IEEE80211_TX_STATUS_EOSP set. In case
-  *	frames from multiple TIDs are released and the driver might reorder
-  *	them between the TIDs, it must set the %IEEE80211_TX_STATUS_EOSP flag
+ 
+ 	/* As defined by IEEE 802.11-2007 17.3.8.6 */
+-	acktimeout = slottime + sifstime + 3 * ah->coverage_class;
++	acktimeout = slottime + sifstime + 3 * ah->coverage_class + ack_offset;
+ 	ctstimeout = acktimeout;
+ 
+ 	/*
+@@ -1040,7 +1059,8 @@ void ath9k_hw_init_global_settings(struc
+ 	 * BA frames in some implementations, but it has been found to fix ACK
+ 	 * timeout issues in other cases as well.
+ 	 */
+-	if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) {
++	if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ &&
++	    !IS_CHAN_HALF_RATE(chan) && !IS_CHAN_QUARTER_RATE(chan)) {
+ 		acktimeout += 64 - sifstime - ah->slottime;
+ 		ctstimeout += 48 - sifstime - ah->slottime;
+ 	}
+@@ -1420,6 +1440,10 @@ static bool ath9k_hw_channel_change(stru
+ 						    CHANNEL_5GHZ));
+ 	mode_diff = (chan->chanmode != ah->curchan->chanmode);
+ 
++	if ((ah->curchan->channelFlags | chan->channelFlags) &
++	    (CHANNEL_HALF | CHANNEL_QUARTER))
++		return false;
++
+ 	for (qnum = 0; qnum < AR_NUM_QCU; qnum++) {
+ 		if (ath9k_hw_numtxpending(ah, qnum)) {
+ 			ath_dbg(common, QUEUE,
+@@ -1453,7 +1477,7 @@ static bool ath9k_hw_channel_change(stru
+ 		return false;
+ 	}
+ 	ath9k_hw_set_clockrate(ah);
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, false);
+ 	ath9k_hw_rfbus_done(ah);
+ 
+ 	if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))
+@@ -2724,7 +2748,8 @@ static int get_antenna_gain(struct ath_h
+ 	return ah->eep_ops->get_eeprom(ah, gain_param);
+ }
+ 
+-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan)
++void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
++			    bool test)
+ {
+ 	struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
+ 	struct ieee80211_channel *channel;
+@@ -2745,7 +2770,7 @@ void ath9k_hw_apply_txpower(struct ath_h
+ 
+ 	ah->eep_ops->set_txpower(ah, chan,
+ 				 ath9k_regd_get_ctl(reg, chan),
+-				 ant_reduction, new_pwr, false);
++				 ant_reduction, new_pwr, test);
+ }
+ 
+ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
+@@ -2758,7 +2783,7 @@ void ath9k_hw_set_txpowerlimit(struct at
+ 	if (test)
+ 		channel->max_power = MAX_RATE_POWER / 2;
+ 
+-	ath9k_hw_apply_txpower(ah, chan);
++	ath9k_hw_apply_txpower(ah, chan, test);
+ 
+ 	if (test)
+ 		channel->max_power = DIV_ROUND_UP(reg->max_power_level, 2);
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -923,6 +923,8 @@ void ath9k_hw_set_gpio(struct ath_hw *ah
+ void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna);
+ 
+ /* General Operation */
++void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
++			  int hw_delay);
+ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout);
+ void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+ 			  int column, unsigned int *writecnt);
+@@ -976,7 +978,8 @@ void ath9k_hw_name(struct ath_hw *ah, ch
+ /* PHY */
+ void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
+ 				   u32 *coef_mantissa, u32 *coef_exponent);
+-void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan);
++void ath9k_hw_apply_txpower(struct ath_hw *ah, struct ath9k_channel *chan,
++			    bool test);
+ 
+ /*
+  * Code Specific to AR5008, AR9001 or AR9002,
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -133,8 +133,16 @@ EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel
+ 
+ void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
+ {
++	int maxdelay = 1000;
+ 	int i, q;
+ 
++	if (ah->curchan) {
++		if (IS_CHAN_HALF_RATE(ah->curchan))
++			maxdelay *= 2;
++		else if (IS_CHAN_QUARTER_RATE(ah->curchan))
++			maxdelay *= 4;
++	}
++
+ 	REG_WRITE(ah, AR_Q_TXD, AR_Q_TXD_M);
+ 
+ 	REG_SET_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF);
+@@ -142,7 +150,7 @@ void ath9k_hw_abort_tx_dma(struct ath_hw
+ 	REG_SET_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF);
+ 
+ 	for (q = 0; q < AR_NUM_QCU; q++) {
+-		for (i = 0; i < 1000; i++) {
++		for (i = 0; i < maxdelay; i++) {
+ 			if (i)
+ 				udelay(5);
+ 
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -692,17 +692,6 @@ void ath9k_tasklet(unsigned long data)
+ 		goto out;
+ 	}
+ 
+-	/*
+-	 * Only run the baseband hang check if beacons stop working in AP or
+-	 * IBSS mode, because it has a high false positive rate. For station
+-	 * mode it should not be necessary, since the upper layers will detect
+-	 * this through a beacon miss automatically and the following channel
+-	 * change will trigger a hardware reset anyway
+-	 */
+-	if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 &&
+-	    !ath9k_hw_check_alive(ah))
+-		ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+-
+ 	if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
+ 		/*
+ 		 * TSF sync does not look correct; remain awake to sync with
 --- a/net/mac80211/agg-rx.c
 +++ b/net/mac80211/agg-rx.c
-@@ -187,6 +187,8 @@ static void ieee80211_send_addba_resp(st
+@@ -200,6 +200,8 @@ static void ieee80211_send_addba_resp(st
  		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
  	else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
  		memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
@@ -254,7 +567,7 @@
  		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
  	else if (sdata->vif.type == NL80211_IFTYPE_STATION)
  		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
-@@ -471,6 +472,7 @@ int ieee80211_start_tx_ba_session(struct
+@@ -484,6 +485,7 @@ int ieee80211_start_tx_ba_session(struct
  	    sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
  	    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
  	    sdata->vif.type != NL80211_IFTYPE_AP &&
@@ -268,8 +581,8 @@
  	test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
  
  	int res = scnprintf(buf, sizeof(buf),
--			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-+			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+-			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
  			    TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
  			    TEST(PS_DRIVER), TEST(AUTHORIZED),
  			    TEST(SHORT_PREAMBLE),
@@ -280,7 +593,17 @@
  			    TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
+@@ -163,7 +163,8 @@ static int ieee80211_check_queues(struct
+ 			return -EINVAL;
+ 	}
+ 
+-	if (sdata->vif.type != NL80211_IFTYPE_AP) {
++	if ((sdata->vif.type != NL80211_IFTYPE_AP) ||
++	    !(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {
+ 		sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
+ 		return 0;
+ 	}
+@@ -281,7 +282,6 @@ static int ieee80211_do_open(struct net_
  {
  	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
  	struct ieee80211_local *local = sdata->local;
@@ -288,7 +611,7 @@
  	u32 changed = 0;
  	int res;
  	u32 hw_reconf_flags = 0;
-@@ -309,28 +308,6 @@ static int ieee80211_do_open(struct net_
+@@ -427,28 +427,6 @@ static int ieee80211_do_open(struct net_
  
  	set_bit(SDATA_STATE_RUNNING, &sdata->state);
  
@@ -317,17 +640,7 @@
  	/*
  	 * set_multicast_list will be invoked by the networking core
  	 * which will check whether any increments here were done in
-@@ -357,8 +334,7 @@ static int ieee80211_do_open(struct net_
- 	netif_tx_start_all_queues(dev);
- 
- 	return 0;
-- err_del_interface:
--	drv_remove_interface(local, sdata);
-+
-  err_stop:
- 	if (!local->open_count)
- 		drv_stop(local);
-@@ -722,6 +698,70 @@ static void ieee80211_if_setup(struct ne
+@@ -845,6 +823,70 @@ static void ieee80211_if_setup(struct ne
  	dev->destructor = free_netdev;
  }
  
@@ -360,7 +673,7 @@
 +	ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
 +			       skb->len - baselen, &elems);
 +
-+	rates = ieee80211_sta_get_rates(local, &elems, band);
++	rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
 +
 +	rcu_read_lock();
 +
@@ -398,7 +711,7 @@
  static void ieee80211_iface_work(struct work_struct *work)
  {
  	struct ieee80211_sub_if_data *sdata =
-@@ -826,6 +866,9 @@ static void ieee80211_iface_work(struct 
+@@ -949,6 +991,9 @@ static void ieee80211_iface_work(struct 
  				break;
  			ieee80211_mesh_rx_queued_mgmt(sdata, skb);
  			break;
@@ -410,45 +723,35 @@
  			break;
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -177,7 +177,8 @@ ieee80211_add_rx_radiotap_header(struct 
- 	pos += 2;
- 
- 	/* IEEE80211_RADIOTAP_DBM_ANTSIGNAL */
--	if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
-+	if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM &&
-+	    !(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
- 		*pos = status->signal;
- 		rthdr->it_present |=
- 			cpu_to_le32(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL);
-@@ -489,12 +490,12 @@ ieee80211_rx_mesh_check(struct ieee80211
- 			if (ieee80211_has_tods(hdr->frame_control) ||
- 				!ieee80211_has_fromds(hdr->frame_control))
- 				return RX_DROP_MONITOR;
--			if (memcmp(hdr->addr3, dev_addr, ETH_ALEN) == 0)
-+			if (compare_ether_addr(hdr->addr3, dev_addr) == 0)
- 				return RX_DROP_MONITOR;
- 		} else {
- 			if (!ieee80211_has_a4(hdr->frame_control))
- 				return RX_DROP_MONITOR;
--			if (memcmp(hdr->addr4, dev_addr, ETH_ALEN) == 0)
-+			if (compare_ether_addr(hdr->addr4, dev_addr) == 0)
- 				return RX_DROP_MONITOR;
- 		}
+@@ -103,7 +103,7 @@ static void
+ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
+ 				 struct sk_buff *skb,
+ 				 struct ieee80211_rate *rate,
+-				 int rtap_len)
++				 int rtap_len, bool has_fcs)
+ {
+ 	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
+ 	struct ieee80211_radiotap_header *rthdr;
+@@ -134,7 +134,7 @@ ieee80211_add_rx_radiotap_header(struct 
  	}
-@@ -1309,8 +1310,10 @@ ieee80211_rx_h_sta_process(struct ieee80
- 
- 	sta->rx_fragments++;
- 	sta->rx_bytes += rx->skb->len;
--	sta->last_signal = status->signal;
--	ewma_add(&sta->avg_signal, -status->signal);
-+	if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
-+		sta->last_signal = status->signal;
-+		ewma_add(&sta->avg_signal, -status->signal);
-+	}
  
- 	/*
- 	 * Change STA power saving mode only at the end of a frame
-@@ -2282,6 +2285,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+ 	/* IEEE80211_RADIOTAP_FLAGS */
+-	if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)
++	if (has_fcs && (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS))
+ 		*pos |= IEEE80211_RADIOTAP_F_FCS;
+ 	if (status->flag & (RX_FLAG_FAILED_FCS_CRC | RX_FLAG_FAILED_PLCP_CRC))
+ 		*pos |= IEEE80211_RADIOTAP_F_BADFCS;
+@@ -294,7 +294,8 @@ ieee80211_rx_monitor(struct ieee80211_lo
+ 	}
+ 
+ 	/* prepend radiotap information */
+-	ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom);
++	ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom,
++					 true);
+ 
+ 	skb_reset_mac_header(skb);
+ 	skb->ip_summed = CHECKSUM_UNNECESSARY;
+@@ -2282,6 +2283,7 @@ ieee80211_rx_h_action(struct ieee80211_r
  		    sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
  		    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
  		    sdata->vif.type != NL80211_IFTYPE_AP &&
@@ -456,16 +759,7 @@
  		    sdata->vif.type != NL80211_IFTYPE_ADHOC)
  			break;
  
-@@ -2336,7 +2340,7 @@ ieee80211_rx_h_action(struct ieee80211_r
- 			if (sdata->vif.type != NL80211_IFTYPE_STATION)
- 				break;
- 
--			if (memcmp(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN))
-+			if (compare_ether_addr(mgmt->bssid, sdata->u.mgd.bssid))
- 				break;
- 
- 			goto queue;
-@@ -2492,14 +2496,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2496,14 +2498,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
  
  	if (!ieee80211_vif_is_mesh(&sdata->vif) &&
  	    sdata->vif.type != NL80211_IFTYPE_ADHOC &&
@@ -483,7 +777,17 @@
  		break;
  	case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
  	case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-@@ -2853,10 +2858,16 @@ static int prepare_for_handlers(struct i
+@@ -2567,7 +2570,8 @@ static void ieee80211_rx_cooked_monitor(
+ 		goto out_free_skb;
+ 
+ 	/* prepend radiotap information */
+-	ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom);
++	ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom,
++					 false);
+ 
+ 	skb_set_mac_header(skb, 0);
+ 	skb->ip_summed = CHECKSUM_UNNECESSARY;
+@@ -2836,10 +2840,16 @@ static int prepare_for_handlers(struct i
  		}
  		break;
  	case NL80211_IFTYPE_WDS:
@@ -502,63 +806,9 @@
  		break;
  	default:
  		/* should never get here */
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -9,6 +9,7 @@
- 
- #include <linux/module.h>
- #include <linux/init.h>
-+#include <linux/etherdevice.h>
- #include <linux/netdevice.h>
- #include <linux/types.h>
- #include <linux/slab.h>
-@@ -101,7 +102,7 @@ struct sta_info *sta_info_get(struct iee
- 				    lockdep_is_held(&local->sta_mtx));
- 	while (sta) {
- 		if (sta->sdata == sdata &&
--		    memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
-+		    compare_ether_addr(sta->sta.addr, addr) == 0)
- 			break;
- 		sta = rcu_dereference_check(sta->hnext,
- 					    lockdep_is_held(&local->sta_mtx));
-@@ -124,7 +125,7 @@ struct sta_info *sta_info_get_bss(struct
- 	while (sta) {
- 		if ((sta->sdata == sdata ||
- 		     (sta->sdata->bss && sta->sdata->bss == sdata->bss)) &&
--		    memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
-+		    compare_ether_addr(sta->sta.addr, addr) == 0)
- 			break;
- 		sta = rcu_dereference_check(sta->hnext,
- 					    lockdep_is_held(&local->sta_mtx));
-@@ -1050,7 +1051,7 @@ static void ieee80211_send_null_response
- 	 * exchange. Also set EOSP to indicate this packet
- 	 * ends the poll/service period.
- 	 */
--	info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE |
-+	info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
- 		       IEEE80211_TX_STATUS_EOSP |
- 		       IEEE80211_TX_CTL_REQ_TX_STATUS;
- 
-@@ -1177,7 +1178,7 @@ ieee80211_sta_ps_deliver_response(struct
- 			 * STA may still remain is PS mode after this frame
- 			 * exchange.
- 			 */
--			info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE;
-+			info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
- 
- 			/*
- 			 * Use MoreData flag to indicate whether there are
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h
-@@ -14,6 +14,7 @@
- #include <linux/if_ether.h>
- #include <linux/workqueue.h>
- #include <linux/average.h>
-+#include <linux/etherdevice.h>
- #include "key.h"
- 
- /**
-@@ -31,7 +32,6 @@
+@@ -32,7 +32,6 @@
   * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
   *	frames.
   * @WLAN_STA_WME: Station is a QoS-STA.
@@ -566,7 +816,7 @@
   * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
   *	IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
   *	frame to this station is transmitted.
-@@ -62,7 +62,6 @@ enum ieee80211_sta_info_flags {
+@@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
  	WLAN_STA_AUTHORIZED,
  	WLAN_STA_SHORT_PREAMBLE,
  	WLAN_STA_WME,
@@ -574,1405 +824,50 @@
  	WLAN_STA_CLEAR_PS_FILT,
  	WLAN_STA_MFP,
  	WLAN_STA_BLOCK_BA,
-@@ -489,7 +488,7 @@ void for_each_sta_info_type_check(struct
- 		nxt = _sta ? rcu_dereference(_sta->hnext) : NULL	\
- 	     )								\
- 	/* compare address and run code only if it matches */		\
--	if (memcmp(_sta->sta.addr, (_addr), ETH_ALEN) == 0)
-+	if (compare_ether_addr(_sta->sta.addr, (_addr)) == 0)
- 
- /*
-  * Get STA info by index, BROKEN!
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -448,18 +448,23 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
- 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
- 	struct ieee80211_local *local = tx->local;
- 
--	if (unlikely(!sta ||
--		     ieee80211_is_probe_resp(hdr->frame_control) ||
--		     ieee80211_is_auth(hdr->frame_control) ||
--		     ieee80211_is_assoc_resp(hdr->frame_control) ||
--		     ieee80211_is_reassoc_resp(hdr->frame_control)))
-+	if (unlikely(!sta))
- 		return TX_CONTINUE;
- 
- 	if (unlikely((test_sta_flag(sta, WLAN_STA_PS_STA) ||
- 		      test_sta_flag(sta, WLAN_STA_PS_DRIVER)) &&
--		     !(info->flags & IEEE80211_TX_CTL_POLL_RESPONSE))) {
-+		     !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
- 		int ac = skb_get_queue_mapping(tx->skb);
- 
-+		/* only deauth, disassoc and action are bufferable MMPDUs */
-+		if (ieee80211_is_mgmt(hdr->frame_control) &&
-+		    !ieee80211_is_deauth(hdr->frame_control) &&
-+		    !ieee80211_is_disassoc(hdr->frame_control) &&
-+		    !ieee80211_is_action(hdr->frame_control)) {
-+			info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
-+			return TX_CONTINUE;
-+		}
-+
- #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
- 		printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n",
- 		       sta->sta.addr, sta->sta.aid, ac);
-@@ -1060,6 +1065,7 @@ static bool ieee80211_tx_prep_agg(struct
- {
- 	bool queued = false;
- 	bool reset_agg_timer = false;
-+	struct sk_buff *purge_skb = NULL;
- 
- 	if (test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
- 		info->flags |= IEEE80211_TX_CTL_AMPDU;
-@@ -1101,8 +1107,13 @@ static bool ieee80211_tx_prep_agg(struct
- 			info->control.vif = &tx->sdata->vif;
- 			info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
- 			__skb_queue_tail(&tid_tx->pending, skb);
-+			if (skb_queue_len(&tid_tx->pending) > STA_MAX_TX_BUFFER)
-+				purge_skb = __skb_dequeue(&tid_tx->pending);
- 		}
- 		spin_unlock(&tx->sta->lock);
-+
-+		if (purge_skb)
-+			dev_kfree_skb(purge_skb);
- 	}
- 
- 	/* reset session timer */
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -480,7 +480,7 @@ struct ieee80211_if_ibss {
- 
- 	bool control_port;
- 
--	u8 bssid[ETH_ALEN];
-+	u8 bssid[ETH_ALEN] __aligned(2);
- 	u8 ssid[IEEE80211_MAX_SSID_LEN];
- 	u8 ssid_len, ie_len;
- 	u8 *ie;
---- a/net/mac80211/ibss.c
-+++ b/net/mac80211/ibss.c
-@@ -66,7 +66,7 @@ static void __ieee80211_sta_join_ibss(st
- 	skb_reset_tail_pointer(skb);
- 	skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
- 
--	if (memcmp(ifibss->bssid, bssid, ETH_ALEN))
-+	if (compare_ether_addr(ifibss->bssid, bssid))
- 		sta_info_flush(sdata->local, sdata);
- 
- 	/* if merging, indicate to driver that we leave the old IBSS */
-@@ -403,7 +403,7 @@ static void ieee80211_rx_bss_info(struct
- 		return;
- 
- 	if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
--	    memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) {
-+	    compare_ether_addr(mgmt->bssid, sdata->u.ibss.bssid) == 0) {
- 
- 		rcu_read_lock();
- 		sta = sta_info_get(sdata, mgmt->sa);
-@@ -508,7 +508,7 @@ static void ieee80211_rx_bss_info(struct
- 		goto put_bss;
- 
- 	/* same BSSID */
--	if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
-+	if (compare_ether_addr(cbss->bssid, sdata->u.ibss.bssid) == 0)
- 		goto put_bss;
- 
- 	if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
-@@ -831,8 +831,8 @@ static void ieee80211_rx_mgmt_probe_req(
- 	if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
- 		return;
- 
--	if (memcmp(mgmt->bssid, ifibss->bssid, ETH_ALEN) != 0 &&
--	    memcmp(mgmt->bssid, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) != 0)
-+	if (compare_ether_addr(mgmt->bssid, ifibss->bssid) != 0 &&
-+	    !is_broadcast_ether_addr(mgmt->bssid))
- 		return;
- 
- 	end = ((u8 *) mgmt) + len;
---- a/net/mac80211/mesh.c
-+++ b/net/mac80211/mesh.c
-@@ -204,7 +204,7 @@ int mesh_rmc_check(u8 *sa, struct ieee80
- 			kmem_cache_free(rm_cache, p);
- 			--entries;
- 		} else if ((seqnum == p->seqnum) &&
--			   (memcmp(sa, p->sa, ETH_ALEN) == 0))
-+			   (compare_ether_addr(sa, p->sa) == 0))
- 			return -1;
- 	}
- 
---- a/net/mac80211/mesh_hwmp.c
-+++ b/net/mac80211/mesh_hwmp.c
-@@ -8,6 +8,7 @@
-  */
- 
- #include <linux/slab.h>
-+#include <linux/etherdevice.h>
- #include <asm/unaligned.h>
- #include "wme.h"
- #include "mesh.h"
-@@ -419,7 +420,7 @@ static u32 hwmp_route_info_get(struct ie
- 		new_metric = MAX_METRIC;
- 	exp_time = TU_TO_EXP_TIME(orig_lifetime);
- 
--	if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0) {
-+	if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0) {
- 		/* This MP is the originator, we are not interested in this
- 		 * frame, except for updating transmitter's path info.
- 		 */
-@@ -469,7 +470,7 @@ static u32 hwmp_route_info_get(struct ie
- 
- 	/* Update and check transmitter routing info */
- 	ta = mgmt->sa;
--	if (memcmp(orig_addr, ta, ETH_ALEN) == 0)
-+	if (compare_ether_addr(orig_addr, ta) == 0)
- 		fresh_info = false;
- 	else {
- 		fresh_info = true;
-@@ -529,7 +530,7 @@ static void hwmp_preq_frame_process(stru
- 
- 	mhwmp_dbg("received PREQ from %pM", orig_addr);
- 
--	if (memcmp(target_addr, sdata->vif.addr, ETH_ALEN) == 0) {
-+	if (compare_ether_addr(target_addr, sdata->vif.addr) == 0) {
- 		mhwmp_dbg("PREQ is for us");
- 		forward = false;
- 		reply = true;
-@@ -624,7 +625,7 @@ static void hwmp_prep_frame_process(stru
- 	mhwmp_dbg("received PREP from %pM", PREP_IE_ORIG_ADDR(prep_elem));
- 
- 	orig_addr = PREP_IE_ORIG_ADDR(prep_elem);
--	if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
-+	if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
- 		/* destination, no forwarding required */
- 		return;
- 
-@@ -694,10 +695,12 @@ static void hwmp_perr_frame_process(stru
- 	rcu_read_lock();
- 	mpath = mesh_path_lookup(target_addr, sdata);
- 	if (mpath) {
-+		struct sta_info *sta;
-+
- 		spin_lock_bh(&mpath->state_lock);
-+		sta = next_hop_deref_protected(mpath);
- 		if (mpath->flags & MESH_PATH_ACTIVE &&
--		    memcmp(ta, next_hop_deref_protected(mpath)->sta.addr,
--							ETH_ALEN) == 0 &&
-+		    compare_ether_addr(ta, sta->sta.addr) == 0 &&
- 		    (!(mpath->flags & MESH_PATH_SN_VALID) ||
- 		    SN_GT(target_sn, mpath->sn))) {
- 			mpath->flags &= ~MESH_PATH_ACTIVE;
-@@ -739,7 +742,7 @@ static void hwmp_rann_frame_process(stru
- 	metric = rann->rann_metric;
- 
- 	/*  Ignore our own RANNs */
--	if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
-+	if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
- 		return;
- 
- 	mhwmp_dbg("received RANN from %pM (is_gate=%d)", orig_addr,
-@@ -1064,7 +1067,7 @@ int mesh_nexthop_lookup(struct sk_buff *
- 	if (time_after(jiffies,
- 		       mpath->exp_time -
- 		       msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
--	    !memcmp(sdata->vif.addr, hdr->addr4, ETH_ALEN) &&
-+	    !compare_ether_addr(sdata->vif.addr, hdr->addr4) &&
- 	    !(mpath->flags & MESH_PATH_RESOLVING) &&
- 	    !(mpath->flags & MESH_PATH_FIXED))
- 		mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH);
---- a/net/mac80211/mesh_pathtbl.c
-+++ b/net/mac80211/mesh_pathtbl.c
-@@ -350,7 +350,7 @@ static struct mesh_path *mpath_lookup(st
- 	hlist_for_each_entry_rcu(node, n, bucket, list) {
- 		mpath = node->mpath;
- 		if (mpath->sdata == sdata &&
--				memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
-+				compare_ether_addr(dst, mpath->dst) == 0) {
- 			if (MPATH_EXPIRED(mpath)) {
- 				spin_lock_bh(&mpath->state_lock);
- 				mpath->flags &= ~MESH_PATH_ACTIVE;
-@@ -525,7 +525,7 @@ int mesh_path_add(u8 *dst, struct ieee80
- 	int err = 0;
- 	u32 hash_idx;
- 
--	if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
-+	if (compare_ether_addr(dst, sdata->vif.addr) == 0)
- 		/* never add ourselves as neighbours */
- 		return -ENOTSUPP;
- 
-@@ -566,7 +566,8 @@ int mesh_path_add(u8 *dst, struct ieee80
- 	err = -EEXIST;
- 	hlist_for_each_entry(node, n, bucket, list) {
- 		mpath = node->mpath;
--		if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
-+		if (mpath->sdata == sdata &&
-+		    compare_ether_addr(dst, mpath->dst) == 0)
- 			goto err_exists;
- 	}
- 
-@@ -657,7 +658,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struc
- 	int err = 0;
- 	u32 hash_idx;
- 
--	if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
-+	if (compare_ether_addr(dst, sdata->vif.addr) == 0)
- 		/* never add ourselves as neighbours */
- 		return -ENOTSUPP;
- 
-@@ -694,7 +695,8 @@ int mpp_path_add(u8 *dst, u8 *mpp, struc
- 	err = -EEXIST;
- 	hlist_for_each_entry(node, n, bucket, list) {
- 		mpath = node->mpath;
--		if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
-+		if (mpath->sdata == sdata &&
-+		    compare_ether_addr(dst, mpath->dst) == 0)
- 			goto err_exists;
- 	}
- 
-@@ -887,7 +889,7 @@ int mesh_path_del(u8 *addr, struct ieee8
- 	hlist_for_each_entry(node, n, bucket, list) {
- 		mpath = node->mpath;
- 		if (mpath->sdata == sdata &&
--		    memcmp(addr, mpath->dst, ETH_ALEN) == 0) {
-+		    compare_ether_addr(addr, mpath->dst) == 0) {
- 			__mesh_path_del(tbl, node);
- 			goto enddel;
- 		}
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -1812,7 +1812,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_
- 
- 	memcpy(bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN);
- 
--	if (memcmp(bssid, mgmt->bssid, ETH_ALEN))
-+	if (compare_ether_addr(bssid, mgmt->bssid))
- 		return RX_MGMT_NONE;
- 
- 	auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
-@@ -1893,7 +1893,7 @@ ieee80211_rx_mgmt_deauth(struct ieee8021
- 		return RX_MGMT_NONE;
- 
- 	if (!ifmgd->associated ||
--	    memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
-+	    compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
- 		return RX_MGMT_NONE;
- 
- 	bssid = ifmgd->associated->bssid;
-@@ -1925,7 +1925,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80
- 		return RX_MGMT_NONE;
- 
- 	if (!ifmgd->associated ||
--	    memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
-+	    compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
- 		return RX_MGMT_NONE;
- 
- 	reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
-@@ -2190,7 +2190,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
- 
- 	if (!assoc_data)
- 		return RX_MGMT_NONE;
--	if (memcmp(assoc_data->bss->bssid, mgmt->bssid, ETH_ALEN))
-+	if (compare_ether_addr(assoc_data->bss->bssid, mgmt->bssid))
- 		return RX_MGMT_NONE;
- 
- 	/*
-@@ -2278,8 +2278,8 @@ static void ieee80211_rx_bss_info(struct
- 	bool need_ps = false;
- 
- 	if (sdata->u.mgd.associated &&
--	    memcmp(mgmt->bssid, sdata->u.mgd.associated->bssid,
--		   ETH_ALEN) == 0) {
-+	    compare_ether_addr(mgmt->bssid, sdata->u.mgd.associated->bssid)
-+	    == 0) {
- 		bss = (void *)sdata->u.mgd.associated->priv;
- 		/* not previously set so we may need to recalc */
- 		need_ps = !bss->dtim_period;
-@@ -2334,7 +2334,7 @@ static void ieee80211_rx_mgmt_probe_resp
- 
- 	ASSERT_MGD_MTX(ifmgd);
- 
--	if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
-+	if (compare_ether_addr(mgmt->da, sdata->vif.addr))
- 		return; /* ignore ProbeResp to foreign address */
- 
- 	baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
-@@ -2347,11 +2347,12 @@ static void ieee80211_rx_mgmt_probe_resp
- 	ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
- 
- 	if (ifmgd->associated &&
--	    memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN) == 0)
-+	    compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid) == 0)
- 		ieee80211_reset_ap_probe(sdata);
- 
- 	if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies &&
--	    memcmp(mgmt->bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN) == 0) {
-+	    compare_ether_addr(mgmt->bssid, ifmgd->auth_data->bss->bssid)
-+	    == 0) {
- 		/* got probe response, continue with auth */
- 		printk(KERN_DEBUG "%s: direct probe responded\n", sdata->name);
- 		ifmgd->auth_data->tries = 0;
-@@ -2408,7 +2409,8 @@ static void ieee80211_rx_mgmt_beacon(str
- 		return;
- 
- 	if (ifmgd->assoc_data && !ifmgd->assoc_data->have_beacon &&
--	    memcmp(mgmt->bssid, ifmgd->assoc_data->bss->bssid, ETH_ALEN) == 0) {
-+	    compare_ether_addr(mgmt->bssid, ifmgd->assoc_data->bss->bssid)
-+	    == 0) {
- 		ieee802_11_parse_elems(mgmt->u.beacon.variable,
- 				       len - baselen, &elems);
- 
-@@ -2423,7 +2425,7 @@ static void ieee80211_rx_mgmt_beacon(str
- 	}
- 
- 	if (!ifmgd->associated ||
--	    memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
-+	    compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
- 		return;
- 	bssid = ifmgd->associated->bssid;
- 
-@@ -3285,7 +3287,7 @@ int ieee80211_mgd_assoc(struct ieee80211
- 		bool match;
- 
- 		/* keep sta info, bssid if matching */
--		match = memcmp(ifmgd->bssid, req->bss->bssid, ETH_ALEN) == 0;
-+		match = compare_ether_addr(ifmgd->bssid, req->bss->bssid) == 0;
- 		ieee80211_destroy_auth_data(sdata, match);
- 	}
- 
-@@ -3407,7 +3409,7 @@ int ieee80211_mgd_assoc(struct ieee80211
- 			goto err_clear;
- 		}
- 	} else
--		WARN_ON_ONCE(memcmp(ifmgd->bssid, req->bss->bssid, ETH_ALEN));
-+		WARN_ON_ONCE(compare_ether_addr(ifmgd->bssid, req->bss->bssid));
- 
- 	if (!bss->dtim_period &&
- 	    sdata->local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD) {
-@@ -3448,7 +3450,7 @@ int ieee80211_mgd_deauth(struct ieee8021
- 	mutex_lock(&ifmgd->mtx);
- 
- 	if (ifmgd->associated &&
--	    memcmp(ifmgd->associated->bssid, req->bssid, ETH_ALEN) == 0) {
-+	    compare_ether_addr(ifmgd->associated->bssid, req->bssid) == 0) {
- 		ieee80211_set_disassoc(sdata, false, true);
- 		assoc_bss = true;
- 	} else if (ifmgd->auth_data) {
---- a/net/mac80211/status.c
-+++ b/net/mac80211/status.c
-@@ -10,6 +10,7 @@
-  */
- 
- #include <linux/export.h>
-+#include <linux/etherdevice.h>
- #include <net/mac80211.h>
- #include <asm/unaligned.h>
- #include "ieee80211_i.h"
-@@ -377,7 +378,7 @@ void ieee80211_tx_status(struct ieee8021
- 
- 	for_each_sta_info(local, hdr->addr1, sta, tmp) {
- 		/* skip wrong virtual interface */
--		if (memcmp(hdr->addr2, sta->sdata->vif.addr, ETH_ALEN))
-+		if (compare_ether_addr(hdr->addr2, sta->sdata->vif.addr))
- 			continue;
- 
- 		if (info->flags & IEEE80211_TX_STATUS_EOSP)
---- a/net/wireless/mlme.c
-+++ b/net/wireless/mlme.c
-@@ -6,6 +6,7 @@
- 
- #include <linux/kernel.h>
- #include <linux/module.h>
-+#include <linux/etherdevice.h>
- #include <linux/netdevice.h>
- #include <linux/nl80211.h>
- #include <linux/slab.h>
-@@ -100,7 +101,7 @@ void __cfg80211_send_deauth(struct net_d
- 	ASSERT_WDEV_LOCK(wdev);
- 
- 	if (wdev->current_bss &&
--	    memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
-+	    compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0) {
- 		cfg80211_unhold_bss(wdev->current_bss);
- 		cfg80211_put_bss(&wdev->current_bss->pub);
- 		wdev->current_bss = NULL;
-@@ -115,7 +116,7 @@ void __cfg80211_send_deauth(struct net_d
- 
- 		reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
- 
--		from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
-+		from_ap = compare_ether_addr(mgmt->sa, dev->dev_addr) != 0;
- 		__cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
- 	} else if (wdev->sme_state == CFG80211_SME_CONNECTING) {
- 		__cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
-@@ -154,7 +155,7 @@ void __cfg80211_send_disassoc(struct net
- 		return;
- 
- 	if (wdev->current_bss &&
--	    memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
-+	    compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0) {
- 		cfg80211_sme_disassoc(dev, wdev->current_bss);
- 		cfg80211_unhold_bss(wdev->current_bss);
- 		cfg80211_put_bss(&wdev->current_bss->pub);
-@@ -165,7 +166,7 @@ void __cfg80211_send_disassoc(struct net
- 
- 	reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
- 
--	from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
-+	from_ap = compare_ether_addr(mgmt->sa, dev->dev_addr) != 0;
- 	__cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
- }
- EXPORT_SYMBOL(__cfg80211_send_disassoc);
-@@ -285,7 +286,7 @@ int __cfg80211_mlme_auth(struct cfg80211
- 			return -EINVAL;
- 
- 	if (wdev->current_bss &&
--	    memcmp(bssid, wdev->current_bss->pub.bssid, ETH_ALEN) == 0)
-+	    compare_ether_addr(bssid, wdev->current_bss->pub.bssid) == 0)
- 		return -EALREADY;
- 
- 	memset(&req, 0, sizeof(req));
-@@ -362,7 +363,7 @@ int __cfg80211_mlme_assoc(struct cfg8021
- 	memset(&req, 0, sizeof(req));
- 
- 	if (wdev->current_bss && prev_bssid &&
--	    memcmp(wdev->current_bss->pub.bssid, prev_bssid, ETH_ALEN) == 0) {
-+	    compare_ether_addr(wdev->current_bss->pub.bssid, prev_bssid) == 0) {
- 		/*
- 		 * Trying to reassociate: Allow this to proceed and let the old
- 		 * association to be dropped when the new one is completed.
-@@ -446,7 +447,8 @@ int __cfg80211_mlme_deauth(struct cfg802
- 
- 	if (local_state_change) {
- 		if (wdev->current_bss &&
--		    memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
-+		    compare_ether_addr(wdev->current_bss->pub.bssid, bssid)
-+		    == 0) {
- 			cfg80211_unhold_bss(wdev->current_bss);
- 			cfg80211_put_bss(&wdev->current_bss->pub);
- 			wdev->current_bss = NULL;
-@@ -495,7 +497,7 @@ static int __cfg80211_mlme_disassoc(stru
- 	req.local_state_change = local_state_change;
- 	req.ie = ie;
- 	req.ie_len = ie_len;
--	if (memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0)
-+	if (compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0)
- 		req.bss = &wdev->current_bss->pub;
- 	else
- 		return -ENOTCONN;
-@@ -758,8 +760,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
- 				break;
- 			}
- 
--			if (memcmp(wdev->current_bss->pub.bssid,
--				   mgmt->bssid, ETH_ALEN)) {
-+			if (compare_ether_addr(wdev->current_bss->pub.bssid,
-+					       mgmt->bssid)) {
- 				err = -ENOTCONN;
- 				break;
- 			}
-@@ -772,8 +774,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
- 				break;
- 
- 			/* for station, check that DA is the AP */
--			if (memcmp(wdev->current_bss->pub.bssid,
--				   mgmt->da, ETH_ALEN)) {
-+			if (compare_ether_addr(wdev->current_bss->pub.bssid,
-+					       mgmt->da)) {
- 				err = -ENOTCONN;
- 				break;
- 			}
-@@ -781,11 +783,11 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
- 		case NL80211_IFTYPE_AP:
- 		case NL80211_IFTYPE_P2P_GO:
- 		case NL80211_IFTYPE_AP_VLAN:
--			if (memcmp(mgmt->bssid, dev->dev_addr, ETH_ALEN))
-+			if (compare_ether_addr(mgmt->bssid, dev->dev_addr))
- 				err = -EINVAL;
- 			break;
- 		case NL80211_IFTYPE_MESH_POINT:
--			if (memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN)) {
-+			if (compare_ether_addr(mgmt->sa, mgmt->bssid)) {
- 				err = -EINVAL;
- 				break;
- 			}
-@@ -804,7 +806,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
- 			return err;
- 	}
- 
--	if (memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0)
-+	if (compare_ether_addr(mgmt->sa, dev->dev_addr) != 0)
- 		return -EINVAL;
- 
- 	/* Transmit the Action frame as requested by user space */
---- a/net/wireless/scan.c
-+++ b/net/wireless/scan.c
-@@ -378,7 +378,7 @@ static int cmp_bss_core(struct cfg80211_
- 			       b->len_information_elements);
- 	}
- 
--	return memcmp(a->bssid, b->bssid, ETH_ALEN);
-+	return compare_ether_addr(a->bssid, b->bssid);
- }
- 
- static int cmp_bss(struct cfg80211_bss *a,
---- a/drivers/net/wireless/ath/ath9k/Kconfig
-+++ b/drivers/net/wireless/ath/ath9k/Kconfig
-@@ -81,6 +81,14 @@ config ATH9K_DFS_CERTIFIED
- 	  developed. At this point enabling this option won't do anything
- 	  except increase code size.
- 
-+config ATH9K_MAC_DEBUG
-+	bool "Atheros MAC statistics"
-+	depends on ATH9K_DEBUGFS
-+	default y
-+	---help---
-+	  This option enables collection of statistics for Rx/Tx status
-+	  data and some other MAC related statistics
-+
- config ATH9K_RATE_CONTROL
- 	bool "Atheros ath9k rate control"
- 	depends on ATH9K
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -818,6 +818,7 @@ void ath_debug_stat_tx(struct ath_softc 
- 	if (ts->ts_flags & ATH9K_TX_DELIM_UNDERRUN)
- 		TX_STAT_INC(qnum, delim_underrun);
- 
-+#ifdef CONFIG_ATH9K_MAC_DEBUG
- 	spin_lock(&sc->debug.samp_lock);
- 	TX_SAMP_DBG(jiffies) = jiffies;
- 	TX_SAMP_DBG(rssi_ctl0) = ts->ts_rssi_ctl0;
-@@ -844,6 +845,7 @@ void ath_debug_stat_tx(struct ath_softc 
- 
- 	sc->debug.tsidx = (sc->debug.tsidx + 1) % ATH_DBG_MAX_SAMPLES;
- 	spin_unlock(&sc->debug.samp_lock);
-+#endif
- 
- #undef TX_SAMP_DBG
- }
-@@ -942,27 +944,6 @@ static ssize_t read_file_recv(struct fil
- 	PHY_ERR("HT-RATE ERR", ATH9K_PHYERR_HT_RATE_ILLEGAL);
- 
- 	len += snprintf(buf + len, size - len,
--			"%22s : %10d\n", "RSSI-CTL0",
--			sc->debug.stats.rxstats.rs_rssi_ctl0);
--	len += snprintf(buf + len, size - len,
--			"%22s : %10d\n", "RSSI-CTL1",
--			sc->debug.stats.rxstats.rs_rssi_ctl1);
--	len += snprintf(buf + len, size - len,
--			"%22s : %10d\n", "RSSI-CTL2",
--			sc->debug.stats.rxstats.rs_rssi_ctl2);
--	len += snprintf(buf + len, size - len,
--			"%22s : %10d\n", "RSSI-EXT0",
--			sc->debug.stats.rxstats.rs_rssi_ext0);
--	len += snprintf(buf + len, size - len,
--			"%22s : %10d\n", "RSSI-EXT1",
--			sc->debug.stats.rxstats.rs_rssi_ext1);
--	len += snprintf(buf + len, size - len,
--			"%22s : %10d\n", "RSSI-EXT2",
--			sc->debug.stats.rxstats.rs_rssi_ext2);
--	len += snprintf(buf + len, size - len,
--			"%22s : %10d\n", "Rx Antenna",
--			sc->debug.stats.rxstats.rs_antenna);
--	len += snprintf(buf + len, size - len,
- 			"%22s : %10u\n", "RX-Pkts-All",
- 			sc->debug.stats.rxstats.rx_pkts_all);
- 	len += snprintf(buf + len, size - len,
-@@ -1009,16 +990,7 @@ void ath_debug_stat_rx(struct ath_softc 
- 			RX_PHY_ERR_INC(rs->rs_phyerr);
- 	}
- 
--	sc->debug.stats.rxstats.rs_rssi_ctl0 = rs->rs_rssi_ctl0;
--	sc->debug.stats.rxstats.rs_rssi_ctl1 = rs->rs_rssi_ctl1;
--	sc->debug.stats.rxstats.rs_rssi_ctl2 = rs->rs_rssi_ctl2;
--
--	sc->debug.stats.rxstats.rs_rssi_ext0 = rs->rs_rssi_ext0;
--	sc->debug.stats.rxstats.rs_rssi_ext1 = rs->rs_rssi_ext1;
--	sc->debug.stats.rxstats.rs_rssi_ext2 = rs->rs_rssi_ext2;
--
--	sc->debug.stats.rxstats.rs_antenna = rs->rs_antenna;
--
-+#ifdef CONFIG_ATH9K_MAC_DEBUG
- 	spin_lock(&sc->debug.samp_lock);
- 	RX_SAMP_DBG(jiffies) = jiffies;
- 	RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl0;
-@@ -1035,6 +1007,8 @@ void ath_debug_stat_rx(struct ath_softc 
- 	sc->debug.rsidx = (sc->debug.rsidx + 1) % ATH_DBG_MAX_SAMPLES;
- 	spin_unlock(&sc->debug.samp_lock);
- 
-+#endif
-+
- #undef RX_STAT_INC
- #undef RX_PHY_ERR_INC
- #undef RX_SAMP_DBG
-@@ -1278,6 +1252,8 @@ static const struct file_operations fops
- 	.llseek = default_llseek,
- };
- 
-+#ifdef CONFIG_ATH9K_MAC_DEBUG
-+
- void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
- {
- #define ATH_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].c)
-@@ -1551,6 +1527,7 @@ static const struct file_operations fops
- 	.llseek = default_llseek,
- };
- 
-+#endif
- 
- int ath9k_init_debug(struct ath_hw *ah)
- {
-@@ -1604,8 +1581,10 @@ int ath9k_init_debug(struct ath_hw *ah)
- 			    &fops_base_eeprom);
- 	debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
- 			    &fops_modal_eeprom);
-+#ifdef CONFIG_ATH9K_MAC_DEBUG
- 	debugfs_create_file("samples", S_IRUSR, sc->debug.debugfs_phy, sc,
- 			    &fops_samps);
-+#endif
- 
- 	debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,
- 			   sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
---- a/drivers/net/wireless/ath/ath9k/debug.h
-+++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -165,13 +165,6 @@ struct ath_rx_stats {
- 	u32 post_delim_crc_err;
- 	u32 decrypt_busy_err;
- 	u32 phy_err_stats[ATH9K_PHYERR_MAX];
--	int8_t rs_rssi_ctl0;
--	int8_t rs_rssi_ctl1;
--	int8_t rs_rssi_ctl2;
--	int8_t rs_rssi_ext0;
--	int8_t rs_rssi_ext1;
--	int8_t rs_rssi_ext2;
--	u8 rs_antenna;
- };
- 
- enum ath_reset_type {
-@@ -235,16 +228,17 @@ struct ath9k_debug {
- 	struct dentry *debugfs_phy;
- 	u32 regidx;
- 	struct ath_stats stats;
-+#ifdef CONFIG_ATH9K_MAC_DEBUG
- 	spinlock_t samp_lock;
- 	struct ath_dbg_bb_mac_samp bb_mac_samp[ATH_DBG_MAX_SAMPLES];
- 	u8 sampidx;
- 	u8 tsidx;
- 	u8 rsidx;
-+#endif
- };
- 
- int ath9k_init_debug(struct ath_hw *ah);
- 
--void ath9k_debug_samp_bb_mac(struct ath_softc *sc);
- void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status);
- void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
- 		       struct ath_tx_status *ts, struct ath_txq *txq,
-@@ -258,10 +252,6 @@ static inline int ath9k_init_debug(struc
- 	return 0;
- }
- 
--static inline void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
--{
--}
--
- static inline void ath_debug_stat_interrupt(struct ath_softc *sc,
- 					    enum ath9k_int status)
- {
-@@ -282,4 +272,17 @@ static inline void ath_debug_stat_rx(str
- 
- #endif /* CONFIG_ATH9K_DEBUGFS */
- 
-+#ifdef CONFIG_ATH9K_MAC_DEBUG
-+
-+void ath9k_debug_samp_bb_mac(struct ath_softc *sc);
-+
-+#else
-+
-+static inline void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
-+{
-+}
-+
-+#endif
-+
-+
- #endif /* DEBUG_H */
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -555,9 +555,11 @@ static int ath9k_init_softc(u16 devid, s
- 	mutex_init(&sc->mutex);
- #ifdef CONFIG_ATH9K_DEBUGFS
- 	spin_lock_init(&sc->nodes_lock);
--	spin_lock_init(&sc->debug.samp_lock);
- 	INIT_LIST_HEAD(&sc->nodes);
- #endif
-+#ifdef CONFIG_ATH9K_MAC_DEBUG
-+	spin_lock_init(&sc->debug.samp_lock);
-+#endif
- 	tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);
- 	tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,
- 		     (unsigned long)sc);
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1386,10 +1386,16 @@ static bool ath9k_hw_set_reset_reg(struc
- static bool ath9k_hw_chip_reset(struct ath_hw *ah,
- 				struct ath9k_channel *chan)
- {
--	if (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)) {
--		if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON))
--			return false;
--	} else if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM))
-+	int reset_type = ATH9K_RESET_WARM;
-+
-+	if (AR_SREV_9280(ah)) {
-+		if (ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
-+			reset_type = ATH9K_RESET_POWER_ON;
-+		else
-+			reset_type = ATH9K_RESET_COLD;
-+	}
-+
-+	if (!ath9k_hw_set_reset_reg(ah, reset_type))
- 		return false;
- 
- 	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
---- a/drivers/net/wireless/ath/ath5k/base.c
-+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -2330,15 +2330,6 @@ ath5k_calibrate_work(struct work_struct 
- 					"got new rfgain, resetting\n");
- 			ieee80211_queue_work(ah->hw, &ah->reset_work);
- 		}
--
--		/* TODO: On full calibration we should stop TX here,
--		 * so that it doesn't interfere (mostly due to gain_f
--		 * calibration that messes with tx packets -see phy.c).
--		 *
--		 * NOTE: Stopping the queues from above is not enough
--		 * to stop TX but saves us from disconecting (at least
--		 * we don't lose packets). */
--		ieee80211_stop_queues(ah->hw);
- 	} else
- 		ah->ah_cal_mask |= AR5K_CALIBRATION_SHORT;
- 
-@@ -2353,10 +2344,9 @@ ath5k_calibrate_work(struct work_struct 
- 				ah->curchan->center_freq));
- 
- 	/* Clear calibration flags */
--	if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) {
--		ieee80211_wake_queues(ah->hw);
-+	if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL)
- 		ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL;
--	} else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT)
-+	else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT)
- 		ah->ah_cal_mask &= ~AR5K_CALIBRATION_SHORT;
- }
- 
---- a/drivers/net/wireless/ath/ath5k/phy.c
-+++ b/drivers/net/wireless/ath/ath5k/phy.c
-@@ -1871,31 +1871,15 @@ ath5k_hw_phy_calibrate(struct ath5k_hw *
- 		ret = 0;
- 	}
- 
--	/* On full calibration do an AGC calibration and
--	 * request a PAPD probe for gainf calibration if
--	 * needed */
--	if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) {
-+	/* On full calibration request a PAPD probe for
-+	 * gainf calibration if needed */
-+	if ((ah->ah_cal_mask & AR5K_CALIBRATION_FULL) &&
-+	    (ah->ah_radio == AR5K_RF5111 ||
-+	     ah->ah_radio == AR5K_RF5112) &&
-+	    channel->hw_value != AR5K_MODE_11B)
-+		ath5k_hw_request_rfgain_probe(ah);
- 
--		AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,
--					AR5K_PHY_AGCCTL_CAL);
--
--		ret = ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,
--			AR5K_PHY_AGCCTL_CAL | AR5K_PHY_AGCCTL_NF,
--			0, false);
--		if (ret) {
--			ATH5K_ERR(ah,
--				"gain calibration timeout (%uMHz)\n",
--				channel->center_freq);
--		}
--
--		if ((ah->ah_radio == AR5K_RF5111 ||
--			ah->ah_radio == AR5K_RF5112)
--			&& (channel->hw_value != AR5K_MODE_11B))
--			ath5k_hw_request_rfgain_probe(ah);
--	}
--
--	/* Update noise floor
--	 * XXX: Only do this after AGC calibration */
-+	/* Update noise floor */
- 	if (!(ah->ah_cal_mask & AR5K_CALIBRATION_NF))
- 		ath5k_hw_update_noise_floor(ah);
- 
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -232,7 +232,6 @@ static void ath_rx_edma_cleanup(struct a
- static void ath_rx_edma_init_queue(struct ath_rx_edma *rx_edma, int size)
- {
- 	skb_queue_head_init(&rx_edma->rx_fifo);
--	skb_queue_head_init(&rx_edma->rx_buffers);
- 	rx_edma->rx_fifo_hwsize = size;
+@@ -647,6 +647,21 @@ void ath9k_reload_chainmask_settings(str
+ 		setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
  }
  
-@@ -658,7 +657,9 @@ static void ath_rx_ps(struct ath_softc *
- }
- 
- static bool ath_edma_get_buffers(struct ath_softc *sc,
--				 enum ath9k_rx_qtype qtype)
-+				 enum ath9k_rx_qtype qtype,
-+				 struct ath_rx_status *rs,
-+				 struct ath_buf **dest)
- {
- 	struct ath_rx_edma *rx_edma = &sc->rx.rx_edma[qtype];
- 	struct ath_hw *ah = sc->sc_ah;
-@@ -677,7 +678,7 @@ static bool ath_edma_get_buffers(struct 
- 	dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
- 				common->rx_bufsize, DMA_FROM_DEVICE);
- 
--	ret = ath9k_hw_process_rxdesc_edma(ah, NULL, skb->data);
-+	ret = ath9k_hw_process_rxdesc_edma(ah, rs, skb->data);
- 	if (ret == -EINPROGRESS) {
- 		/*let device gain the buffer again*/
- 		dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
-@@ -690,20 +691,21 @@ static bool ath_edma_get_buffers(struct 
- 		/* corrupt descriptor, skip this one and the following one */
- 		list_add_tail(&bf->list, &sc->rx.rxbuf);
- 		ath_rx_edma_buf_link(sc, qtype);
--		skb = skb_peek(&rx_edma->rx_fifo);
--		if (!skb)
--			return true;
- 
--		bf = SKB_CB_ATHBUF(skb);
--		BUG_ON(!bf);
-+		skb = skb_peek(&rx_edma->rx_fifo);
-+		if (skb) {
-+			bf = SKB_CB_ATHBUF(skb);
-+			BUG_ON(!bf);
- 
--		__skb_unlink(skb, &rx_edma->rx_fifo);
--		list_add_tail(&bf->list, &sc->rx.rxbuf);
--		ath_rx_edma_buf_link(sc, qtype);
--		return true;
-+			__skb_unlink(skb, &rx_edma->rx_fifo);
-+			list_add_tail(&bf->list, &sc->rx.rxbuf);
-+			ath_rx_edma_buf_link(sc, qtype);
-+		} else {
-+			bf = NULL;
-+		}
- 	}
--	skb_queue_tail(&rx_edma->rx_buffers, skb);
- 
-+	*dest = bf;
- 	return true;
- }
- 
-@@ -711,18 +713,15 @@ static struct ath_buf *ath_edma_get_next
- 						struct ath_rx_status *rs,
- 						enum ath9k_rx_qtype qtype)
++static const struct ieee80211_iface_limit if_limits[] = {
++	{ .max = 256,	.types = BIT(NL80211_IFTYPE_STATION) |
++				 BIT(NL80211_IFTYPE_P2P_CLIENT) |
++				 BIT(NL80211_IFTYPE_WDS) },
++	{ .max = 8,	.types = BIT(NL80211_IFTYPE_AP) |
++				 BIT(NL80211_IFTYPE_P2P_GO) |
++				 BIT(NL80211_IFTYPE_MESH_POINT) },
++};
++
++static const struct ieee80211_iface_combination if_comb = {
++	.limits = if_limits,
++	.n_limits = ARRAY_SIZE(if_limits),
++	.max_interfaces = 256,
++	.num_different_channels = 1,
++};
+ 
+ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
  {
--	struct ath_rx_edma *rx_edma = &sc->rx.rx_edma[qtype];
--	struct sk_buff *skb;
--	struct ath_buf *bf;
-+	struct ath_buf *bf = NULL;
- 
--	while (ath_edma_get_buffers(sc, qtype));
--	skb = __skb_dequeue(&rx_edma->rx_buffers);
--	if (!skb)
--		return NULL;
-+	while (ath_edma_get_buffers(sc, qtype, rs, &bf)) {
-+		if (!bf)
-+			continue;
- 
--	bf = SKB_CB_ATHBUF(skb);
--	ath9k_hw_process_rxdesc_edma(sc->sc_ah, rs, skb->data);
--	return bf;
-+		return bf;
-+	}
-+	return NULL;
- }
+@@ -676,6 +691,9 @@ void ath9k_set_hw_capab(struct ath_softc
+ 		BIT(NL80211_IFTYPE_ADHOC) |
+ 		BIT(NL80211_IFTYPE_MESH_POINT);
  
- static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
-@@ -954,6 +953,7 @@ static void ath9k_process_rssi(struct at
- 	struct ath_softc *sc = hw->priv;
- 	struct ath_hw *ah = common->ah;
- 	int last_rssi;
-+	int rssi = rx_stats->rs_rssi;
- 
- 	if (!rx_stats->is_mybeacon ||
- 	    ((ah->opmode != NL80211_IFTYPE_STATION) &&
-@@ -965,13 +965,12 @@ static void ath9k_process_rssi(struct at
- 
- 	last_rssi = sc->last_rssi;
- 	if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
--		rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
--					      ATH_RSSI_EP_MULTIPLIER);
--	if (rx_stats->rs_rssi < 0)
--		rx_stats->rs_rssi = 0;
-+		rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
-+	if (rssi < 0)
-+		rssi = 0;
- 
- 	/* Update Beacon RSSI, this is used by ANI. */
--	ah->stats.avgbrssi = rx_stats->rs_rssi;
-+	ah->stats.avgbrssi = rssi;
- }
- 
- /*
-@@ -988,8 +987,6 @@ static int ath9k_rx_skb_preprocess(struc
- {
- 	struct ath_hw *ah = common->ah;
- 
--	memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
--
- 	/*
- 	 * everything but the rate is checked here, the rate check is done
- 	 * separately to avoid doing two lookups for a rate for each frame.
-@@ -1011,6 +1008,8 @@ static int ath9k_rx_skb_preprocess(struc
- 	rx_status->signal = ah->noise + rx_stats->rs_rssi;
- 	rx_status->antenna = rx_stats->rs_antenna;
- 	rx_status->flag |= RX_FLAG_MACTIME_MPDU;
-+	if (rx_stats->rs_moreaggr)
-+		rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
- 
- 	return 0;
- }
-@@ -1845,6 +1844,8 @@ int ath_rx_tasklet(struct ath_softc *sc,
- 		if (sc->sc_flags & SC_OP_RXFLUSH)
- 			goto requeue_drop_frag;
- 
-+		memset(rxs, 0, sizeof(struct ieee80211_rx_status));
++	hw->wiphy->iface_combinations = &if_comb;
++	hw->wiphy->n_iface_combinations = 1;
 +
- 		rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
- 		if (rs.rs_tstamp > tsf_lower &&
- 		    unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -91,7 +91,7 @@ static void ath_beacon_setup(struct ath_
- 	info.txpower = MAX_RATE_POWER;
- 	info.keyix = ATH9K_TXKEYIX_INVALID;
- 	info.keytype = ATH9K_KEY_TYPE_CLEAR;
--	info.flags = ATH9K_TXDESC_NOACK;
-+	info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_INTREQ;
- 
- 	info.buf_addr[0] = bf->bf_buf_addr;
- 	info.buf_len[0] = roundup(skb->len, 4);
-@@ -355,7 +355,6 @@ void ath_beacon_tasklet(unsigned long da
- 	struct ath_common *common = ath9k_hw_common(ah);
- 	struct ath_buf *bf = NULL;
- 	struct ieee80211_vif *vif;
--	struct ath_tx_status ts;
- 	bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
- 	int slot;
- 	u32 bfaddr, bc = 0;
-@@ -462,11 +461,6 @@ void ath_beacon_tasklet(unsigned long da
- 			ath9k_hw_txstart(ah, sc->beacon.beaconq);
- 
- 		sc->beacon.ast_be_xmit += bc;     /* XXX per-vif? */
--		if (edma) {
--			spin_lock_bh(&sc->sc_pcu_lock);
--			ath9k_hw_txprocdesc(ah, bf->bf_desc, (void *)&ts);
--			spin_unlock_bh(&sc->sc_pcu_lock);
--		}
- 	}
- }
- 
---- a/drivers/net/wireless/ath/ath9k/mac.c
-+++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -745,7 +745,11 @@ int ath9k_hw_beaconq_setup(struct ath_hw
- 	qi.tqi_aifs = 1;
- 	qi.tqi_cwmin = 0;
- 	qi.tqi_cwmax = 0;
--	/* NB: don't enable any interrupts */
-+
-+	if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-+		qi.tqi_qflags = TXQ_FLAG_TXOKINT_ENABLE |
-+				TXQ_FLAG_TXERRINT_ENABLE;
-+
- 	return ath9k_hw_setuptxqueue(ah, ATH9K_TX_QUEUE_BEACON, &qi);
- }
- EXPORT_SYMBOL(ath9k_hw_beaconq_setup);
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -118,13 +118,15 @@ void ath9k_ps_restore(struct ath_softc *
- 	if (--sc->ps_usecount != 0)
- 		goto unlock;
- 
--	if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))
-+	if (sc->ps_flags & PS_WAIT_FOR_TX_ACK)
-+		goto unlock;
-+
-+	if (sc->ps_idle)
- 		mode = ATH9K_PM_FULL_SLEEP;
- 	else if (sc->ps_enabled &&
- 		 !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
- 			      PS_WAIT_FOR_CAB |
--			      PS_WAIT_FOR_PSPOLL_DATA |
--			      PS_WAIT_FOR_TX_ACK)))
-+			      PS_WAIT_FOR_PSPOLL_DATA)))
- 		mode = ATH9K_PM_NETWORK_SLEEP;
- 	else
- 		goto unlock;
-@@ -1559,6 +1561,7 @@ static int ath9k_config(struct ieee80211
- 	struct ath_hw *ah = sc->sc_ah;
- 	struct ath_common *common = ath9k_hw_common(ah);
- 	struct ieee80211_conf *conf = &hw->conf;
-+	bool reset_channel = false;
- 
- 	ath9k_ps_wakeup(sc);
- 	mutex_lock(&sc->mutex);
-@@ -1567,6 +1570,12 @@ static int ath9k_config(struct ieee80211
- 		sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
- 		if (sc->ps_idle)
- 			ath_cancel_work(sc);
-+		else
-+			/*
-+			 * The chip needs a reset to properly wake up from
-+			 * full sleep
-+			 */
-+			reset_channel = ah->chip_fullsleep;
- 	}
+ 	if (AR_SREV_5416(sc->sc_ah))
+ 		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
  
- 	/*
-@@ -1595,7 +1604,7 @@ static int ath9k_config(struct ieee80211
- 		}
- 	}
- 
--	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-+	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
- 		struct ieee80211_channel *curchan = hw->conf.channel;
- 		int pos = curchan->hw_value;
- 		int old_pos = -1;
-@@ -1955,6 +1964,7 @@ static void ath9k_config_bss(struct ath_
- 		sc->sc_flags &= ~SC_OP_ANI_RUN;
- 		del_timer_sync(&common->ani.timer);
- 		memset(&sc->caldata, 0, sizeof(sc->caldata));
-+		ath9k_hw_ani_init(sc->sc_ah);
- 	}
- }
- 
-@@ -2300,6 +2310,7 @@ static int ath9k_tx_last_beacon(struct i
- 	struct ath_vif *avp;
- 	struct ath_buf *bf;
- 	struct ath_tx_status ts;
-+	bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
- 	int status;
- 
- 	vif = sc->beacon.bslot[0];
-@@ -2310,7 +2321,7 @@ static int ath9k_tx_last_beacon(struct i
- 	if (!avp->is_bslot_active)
- 		return 0;
- 
--	if (!sc->beacon.tx_processed) {
-+	if (!sc->beacon.tx_processed && !edma) {
- 		tasklet_disable(&sc->bcon_tasklet);
- 
- 		bf = avp->av_bcbuf;
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -2296,9 +2296,12 @@ void ath_tx_edma_tasklet(struct ath_soft
- 			break;
- 		}
- 
--		/* Skip beacon completions */
--		if (ts.qid == sc->beacon.beaconq)
-+		/* Process beacon completions separately */
-+		if (ts.qid == sc->beacon.beaconq) {
-+			sc->beacon.tx_processed = true;
-+			sc->beacon.tx_last = !(ts.ts_status & ATH9K_TXERR_MASK);
- 			continue;
-+		}
- 
- 		txq = &sc->tx.txq[ts.qid];
- 
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -299,7 +299,6 @@ struct ath_tx {
- 
- struct ath_rx_edma {
- 	struct sk_buff_head rx_fifo;
--	struct sk_buff_head rx_buffers;
- 	u32 rx_fifo_hwsize;
- };
- 
---- a/drivers/net/wireless/ath/ath9k/ani.c
-+++ b/drivers/net/wireless/ath/ath9k/ani.c
-@@ -46,8 +46,8 @@ static const struct ani_ofdm_level_entry
- 	{  5,  4,  1  }, /* lvl 5 */
- 	{  6,  5,  1  }, /* lvl 6 */
- 	{  7,  6,  1  }, /* lvl 7 */
--	{  7,  7,  1  }, /* lvl 8 */
--	{  7,  8,  0  }  /* lvl 9 */
-+	{  7,  6,  0  }, /* lvl 8 */
-+	{  7,  7,  0  }  /* lvl 9 */
- };
- #define ATH9K_ANI_OFDM_NUM_LEVEL \
- 	ARRAY_SIZE(ofdm_level_table)
-@@ -91,8 +91,8 @@ static const struct ani_cck_level_entry 
- 	{  4,  0  }, /* lvl 4 */
- 	{  5,  0  }, /* lvl 5 */
- 	{  6,  0  }, /* lvl 6 */
--	{  7,  0  }, /* lvl 7 (only for high rssi) */
--	{  8,  0  }  /* lvl 8 (only for high rssi) */
-+	{  6,  0  }, /* lvl 7 (only for high rssi) */
-+	{  7,  0  }  /* lvl 8 (only for high rssi) */
- };
- 
- #define ATH9K_ANI_CCK_NUM_LEVEL \
-@@ -290,16 +290,9 @@ static void ath9k_hw_set_ofdm_nil(struct
- 				     ATH9K_ANI_FIRSTEP_LEVEL,
- 				     entry_ofdm->fir_step_level);
- 
--	if ((ah->opmode != NL80211_IFTYPE_STATION &&
--	     ah->opmode != NL80211_IFTYPE_ADHOC) ||
--	    aniState->noiseFloor <= aniState->rssiThrHigh) {
--		if (aniState->ofdmWeakSigDetectOff)
--			/* force on ofdm weak sig detect */
--			ath9k_hw_ani_control(ah,
--				ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
--					     true);
--		else if (aniState->ofdmWeakSigDetectOff ==
--			 entry_ofdm->ofdm_weak_signal_on)
-+	if ((aniState->noiseFloor >= aniState->rssiThrHigh) &&
-+	    (aniState->ofdmWeakSigDetectOff !=
-+	     entry_ofdm->ofdm_weak_signal_on)) {
- 			ath9k_hw_ani_control(ah,
- 				ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
- 				entry_ofdm->ofdm_weak_signal_on);
-@@ -717,26 +710,30 @@ void ath9k_hw_ani_monitor(struct ath_hw 
- 		ofdmPhyErrRate, aniState->cckNoiseImmunityLevel,
- 		cckPhyErrRate, aniState->ofdmsTurn);
- 
--	if (aniState->listenTime > 5 * ah->aniperiod) {
--		if (ofdmPhyErrRate <= ah->config.ofdm_trig_low &&
--		    cckPhyErrRate <= ah->config.cck_trig_low) {
-+	if (aniState->listenTime > ah->aniperiod) {
-+		if (cckPhyErrRate < ah->config.cck_trig_low &&
-+		    ((ofdmPhyErrRate < ah->config.ofdm_trig_low &&
-+		      aniState->ofdmNoiseImmunityLevel <
-+		      ATH9K_ANI_OFDM_DEF_LEVEL) ||
-+		     (ofdmPhyErrRate < ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI &&
-+		      aniState->ofdmNoiseImmunityLevel >=
-+		      ATH9K_ANI_OFDM_DEF_LEVEL))) {
- 			ath9k_hw_ani_lower_immunity(ah);
- 			aniState->ofdmsTurn = !aniState->ofdmsTurn;
--		}
--		ath9k_ani_restart(ah);
--	} else if (aniState->listenTime > ah->aniperiod) {
--		/* check to see if need to raise immunity */
--		if (ofdmPhyErrRate > ah->config.ofdm_trig_high &&
--		    (cckPhyErrRate <= ah->config.cck_trig_high ||
--		     aniState->ofdmsTurn)) {
-+		} else if ((ofdmPhyErrRate > ah->config.ofdm_trig_high &&
-+			    aniState->ofdmNoiseImmunityLevel >=
-+			    ATH9K_ANI_OFDM_DEF_LEVEL) ||
-+			   (ofdmPhyErrRate >
-+			    ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI &&
-+			    aniState->ofdmNoiseImmunityLevel <
-+			    ATH9K_ANI_OFDM_DEF_LEVEL)) {
- 			ath9k_hw_ani_ofdm_err_trigger(ah);
--			ath9k_ani_restart(ah);
- 			aniState->ofdmsTurn = false;
- 		} else if (cckPhyErrRate > ah->config.cck_trig_high) {
- 			ath9k_hw_ani_cck_err_trigger(ah);
--			ath9k_ani_restart(ah);
- 			aniState->ofdmsTurn = true;
- 		}
-+		ath9k_ani_restart(ah);
- 	}
- }
- EXPORT_SYMBOL(ath9k_hw_ani_monitor);
-@@ -911,3 +908,4 @@ void ath9k_hw_ani_init(struct ath_hw *ah
- 	ath9k_ani_restart(ah);
- 	ath9k_enable_mib_counters(ah);
- }
-+EXPORT_SYMBOL(ath9k_hw_ani_init);
---- a/drivers/net/wireless/ath/ath9k/ani.h
-+++ b/drivers/net/wireless/ath/ath9k/ani.h
-@@ -25,11 +25,13 @@
- 
- /* units are errors per second */
- #define ATH9K_ANI_OFDM_TRIG_HIGH_OLD      500
--#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      1000
-+#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      3500
-+#define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000
- 
- /* units are errors per second */
- #define ATH9K_ANI_OFDM_TRIG_LOW_OLD       200
- #define ATH9K_ANI_OFDM_TRIG_LOW_NEW       400
-+#define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900
- 
- /* units are errors per second */
- #define ATH9K_ANI_CCK_TRIG_HIGH_OLD       200
-@@ -53,7 +55,7 @@
- #define ATH9K_ANI_RSSI_THR_LOW            7
- 
- #define ATH9K_ANI_PERIOD_OLD              100
--#define ATH9K_ANI_PERIOD_NEW              1000
-+#define ATH9K_ANI_PERIOD_NEW              300
- 
- /* in ms */
- #define ATH9K_ANI_POLLINTERVAL_OLD        100
---- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-@@ -1056,46 +1056,8 @@ static bool ar5008_hw_ani_control_old(st
- 		break;
- 	}
- 	case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
--		static const int m1ThreshLow[] = { 127, 50 };
--		static const int m2ThreshLow[] = { 127, 40 };
--		static const int m1Thresh[] = { 127, 0x4d };
--		static const int m2Thresh[] = { 127, 0x40 };
--		static const int m2CountThr[] = { 31, 16 };
--		static const int m2CountThrLow[] = { 63, 48 };
- 		u32 on = param ? 1 : 0;
- 
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
--			      AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
--			      m1ThreshLow[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
--			      AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
--			      m2ThreshLow[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
--			      AR_PHY_SFCORR_M1_THRESH,
--			      m1Thresh[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
--			      AR_PHY_SFCORR_M2_THRESH,
--			      m2Thresh[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
--			      AR_PHY_SFCORR_M2COUNT_THR,
--			      m2CountThr[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
--			      AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
--			      m2CountThrLow[on]);
--
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M1_THRESH_LOW,
--			      m1ThreshLow[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M2_THRESH_LOW,
--			      m2ThreshLow[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M1_THRESH,
--			      m1Thresh[on]);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M2_THRESH,
--			      m2Thresh[on]);
--
- 		if (on)
- 			REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
- 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -824,55 +824,6 @@ static bool ar9003_hw_ani_control(struct
- 		 * on == 0 means more noise imm
- 		 */
- 		u32 on = param ? 1 : 0;
--		/*
--		 * make register setting for default
--		 * (weak sig detect ON) come from INI file
--		 */
--		int m1ThreshLow = on ?
--			aniState->iniDef.m1ThreshLow : m1ThreshLow_off;
--		int m2ThreshLow = on ?
--			aniState->iniDef.m2ThreshLow : m2ThreshLow_off;
--		int m1Thresh = on ?
--			aniState->iniDef.m1Thresh : m1Thresh_off;
--		int m2Thresh = on ?
--			aniState->iniDef.m2Thresh : m2Thresh_off;
--		int m2CountThr = on ?
--			aniState->iniDef.m2CountThr : m2CountThr_off;
--		int m2CountThrLow = on ?
--			aniState->iniDef.m2CountThrLow : m2CountThrLow_off;
--		int m1ThreshLowExt = on ?
--			aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off;
--		int m2ThreshLowExt = on ?
--			aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off;
--		int m1ThreshExt = on ?
--			aniState->iniDef.m1ThreshExt : m1ThreshExt_off;
--		int m2ThreshExt = on ?
--			aniState->iniDef.m2ThreshExt : m2ThreshExt_off;
--
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
--			      AR_PHY_SFCORR_LOW_M1_THRESH_LOW,
--			      m1ThreshLow);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
--			      AR_PHY_SFCORR_LOW_M2_THRESH_LOW,
--			      m2ThreshLow);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
--			      AR_PHY_SFCORR_M1_THRESH, m1Thresh);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
--			      AR_PHY_SFCORR_M2_THRESH, m2Thresh);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR,
--			      AR_PHY_SFCORR_M2COUNT_THR, m2CountThr);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
--			      AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW,
--			      m2CountThrLow);
--
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt);
--		REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT,
--			      AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt);
- 
- 		if (on)
- 			REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -430,10 +430,14 @@ void rt2x00lib_txdone(struct queue_entry
- 	/*
- 	 * If the data queue was below the threshold before the txdone
- 	 * handler we must make sure the packet queue in the mac80211 stack
--	 * is reenabled when the txdone handler has finished.
-+	 * is reenabled when the txdone handler has finished. This has to be
-+	 * serialized with rt2x00mac_tx(), otherwise we can wake up queue
-+	 * before it was stopped.
- 	 */
-+	spin_lock_bh(&entry->queue->tx_lock);
- 	if (!rt2x00queue_threshold(entry->queue))
- 		rt2x00queue_unpause_queue(entry->queue);
-+	spin_unlock_bh(&entry->queue->tx_lock);
- }
- EXPORT_SYMBOL_GPL(rt2x00lib_txdone);
- 
---- a/drivers/net/wireless/rt2x00/rt2x00mac.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
-@@ -152,13 +152,22 @@ void rt2x00mac_tx(struct ieee80211_hw *h
- 	if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
- 		goto exit_fail;
- 
-+	/*
-+	 * Pausing queue has to be serialized with rt2x00lib_txdone(). Note
-+	 * we should not use spin_lock_bh variant as bottom halve was already
-+	 * disabled before ieee80211_xmit() call.
-+	 */
-+	spin_lock(&queue->tx_lock);
- 	if (rt2x00queue_threshold(queue))
- 		rt2x00queue_pause_queue(queue);
-+	spin_unlock(&queue->tx_lock);
- 
- 	return;
- 
-  exit_fail:
-+	spin_lock(&queue->tx_lock);
- 	rt2x00queue_pause_queue(queue);
-+	spin_unlock(&queue->tx_lock);
-  exit_free_skb:
- 	ieee80211_free_txskb(hw, skb);
- }
---- a/drivers/net/wireless/rt2x00/rt2x00queue.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
-@@ -619,6 +619,9 @@ int rt2x00queue_write_tx_frame(struct da
- 	else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags))
- 		rt2x00queue_align_frame(skb);
- 
-+	/*
-+	 * That function must be called with bh disabled.
-+	 */
- 	spin_lock(&queue->tx_lock);
- 
- 	if (unlikely(rt2x00queue_full(queue))) {
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -455,8 +455,8 @@ static void ieee80211_rx_bss_info(struct
+ 			 * fall back to HT20 if we don't use or use
+ 			 * the other extension channel
+ 			 */
+-			if ((channel_type == NL80211_CHAN_HT40MINUS ||
+-			     channel_type == NL80211_CHAN_HT40PLUS) &&
++			if (!(channel_type == NL80211_CHAN_HT40MINUS ||
++			      channel_type == NL80211_CHAN_HT40PLUS) ||
+ 			    channel_type != sdata->u.ibss.channel_type)
+ 				sta_ht_cap_new.cap &=
+ 					~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
diff --git a/package/mac80211/patches/400-ath_move_debug_code.patch b/package/mac80211/patches/400-ath_move_debug_code.patch
index 69bb0f680..1714e9aaf 100644
--- a/package/mac80211/patches/400-ath_move_debug_code.patch
+++ b/package/mac80211/patches/400-ath_move_debug_code.patch
@@ -12,7 +12,7 @@
  ccflags-y += -D__CHECK_ENDIAN__
 --- a/drivers/net/wireless/ath/ath.h
 +++ b/drivers/net/wireless/ath/ath.h
-@@ -281,13 +281,6 @@ void _ath_dbg(struct ath_common *common,
+@@ -277,13 +277,6 @@ void _ath_dbg(struct ath_common *common,
  #endif /* CONFIG_ATH_DEBUG */
  
  /** Returns string describing opmode, or NULL if unknown mode. */
diff --git a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
deleted file mode 100644
index d60be760d..000000000
--- a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/gpio.c
-+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -41,6 +41,9 @@ void ath_init_leds(struct ath_softc *sc)
- {
- 	int ret;
- 
-+	if (AR_SREV_9100(sc->sc_ah))
-+		return;
-+
- 	if (sc->sc_ah->led_pin < 0) {
- 		if (AR_SREV_9287(sc->sc_ah))
- 			sc->sc_ah->led_pin = ATH_LED_PIN_9287;
diff --git a/package/mac80211/patches/402-ath9k_blink_default.patch b/package/mac80211/patches/401-ath9k_blink_default.patch
index 6fa7f734c..270f66955 100644
--- a/package/mac80211/patches/402-ath9k_blink_default.patch
+++ b/package/mac80211/patches/401-ath9k_blink_default.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -36,7 +36,7 @@ int ath9k_modparam_nohwcrypt;
+@@ -39,7 +39,7 @@ int ath9k_modparam_nohwcrypt;
  module_param_named(nohwcrypt, ath9k_modparam_nohwcrypt, int, 0444);
  MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
  
diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
index a9232f214..7018bf387 100644
--- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,7 +8,7 @@
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -466,8 +467,16 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -482,8 +483,16 @@ static int ath9k_hw_init_macaddr(struct 
  		common->macaddr[2 * i] = eeval >> 8;
  		common->macaddr[2 * i + 1] = eeval & 0xff;
  	}
diff --git a/package/mac80211/patches/404-ath_regd_optional.patch b/package/mac80211/patches/403-ath_regd_optional.patch
index bb97647a5..21cb519f1 100644
--- a/package/mac80211/patches/404-ath_regd_optional.patch
+++ b/package/mac80211/patches/403-ath_regd_optional.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/regd.c
 +++ b/drivers/net/wireless/ath/regd.c
-@@ -196,6 +196,10 @@ ath_reg_apply_beaconing_flags(struct wip
+@@ -199,6 +199,10 @@ ath_reg_apply_beaconing_flags(struct wip
  	u32 bandwidth = 0;
  	int r;
  
@@ -11,7 +11,7 @@
  	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
  
  		if (!wiphy->bands[band])
-@@ -255,6 +259,10 @@ ath_reg_apply_active_scan_flags(struct w
+@@ -258,6 +262,10 @@ ath_reg_apply_active_scan_flags(struct w
  	u32 bandwidth = 0;
  	int r;
  
@@ -22,7 +22,7 @@
  	sband = wiphy->bands[IEEE80211_BAND_2GHZ];
  	if (!sband)
  		return;
-@@ -304,6 +312,10 @@ static void ath_reg_apply_radar_flags(st
+@@ -307,6 +315,10 @@ static void ath_reg_apply_radar_flags(st
  	struct ieee80211_channel *ch;
  	unsigned int i;
  
@@ -33,7 +33,7 @@
  	if (!wiphy->bands[IEEE80211_BAND_5GHZ])
  		return;
  
-@@ -510,6 +522,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -513,6 +525,10 @@ ath_regd_init_wiphy(struct ath_regulator
  {
  	const struct ieee80211_regdomain *regd;
  
diff --git a/package/mac80211/patches/405-world_regd_fixup.patch b/package/mac80211/patches/404-world_regd_fixup.patch
index 027b55c66..6a8d1f401 100644
--- a/package/mac80211/patches/405-world_regd_fixup.patch
+++ b/package/mac80211/patches/404-world_regd_fixup.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/regd.c
 +++ b/drivers/net/wireless/ath/regd.c
-@@ -40,7 +40,8 @@ static int __ath_regd_init(struct ath_re
+@@ -43,7 +43,8 @@ static int __ath_regd_init(struct ath_re
  				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)
  
  /* We allow IBSS on these on a case by case basis by regulatory domain */
@@ -10,7 +10,7 @@
  				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
  #define ATH9K_5GHZ_5470_5850	REG_RULE(5470-10, 5850+10, 40, 0, 30,\
  				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
-@@ -58,57 +59,56 @@ static int __ath_regd_init(struct ath_re
+@@ -61,57 +62,56 @@ static int __ath_regd_init(struct ath_re
  #define ATH9K_5GHZ_NO_MIDBAND	ATH9K_5GHZ_5150_5350, \
  				ATH9K_5GHZ_5725_5850
  
diff --git a/package/mac80211/patches/406-regd_no_assoc_hints.patch b/package/mac80211/patches/405-regd_no_assoc_hints.patch
index 29da3b2b5..fc7ccc6b2 100644
--- a/package/mac80211/patches/406-regd_no_assoc_hints.patch
+++ b/package/mac80211/patches/405-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c
-@@ -1690,6 +1690,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1698,6 +1698,8 @@ void regulatory_hint_11d(struct wiphy *w
  	enum environment_cap env = ENVIRON_ANY;
  	struct regulatory_request *request;
  
@@ -9,7 +9,7 @@
  	mutex_lock(&reg_mutex);
  
  	if (unlikely(!last_request))
-@@ -1925,6 +1927,8 @@ static void restore_regulatory_settings(
+@@ -1933,6 +1935,8 @@ static void restore_regulatory_settings(
  
  void regulatory_hint_disconnect(void)
  {
diff --git a/package/mac80211/patches/407-ath_regd_us.patch b/package/mac80211/patches/406-ath_regd_us.patch
index cc5587780..cc5587780 100644
--- a/package/mac80211/patches/407-ath_regd_us.patch
+++ b/package/mac80211/patches/406-ath_regd_us.patch
diff --git a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
index 0962406bc..6e9e5ef87 100644
--- a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
+++ b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1432,15 +1432,6 @@ static int ath9k_add_interface(struct ie
+@@ -1445,15 +1445,6 @@ static int ath9k_add_interface(struct ie
  		}
  	}
  
@@ -16,7 +16,7 @@
  	ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);
  
  	sc->nvifs++;
-@@ -1465,15 +1456,6 @@ static int ath9k_change_interface(struct
+@@ -1478,15 +1469,6 @@ static int ath9k_change_interface(struct
  	mutex_lock(&sc->mutex);
  	ath9k_ps_wakeup(sc);
  
@@ -32,3 +32,13 @@
  	if (ath9k_uses_beacons(new_type) &&
  	    !ath9k_uses_beacons(vif->type)) {
  		if (sc->nbcnvifs >= ATH_BCBUF) {
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -653,6 +653,7 @@ static const struct ieee80211_iface_limi
+ 				 BIT(NL80211_IFTYPE_WDS) },
+ 	{ .max = 8,	.types = BIT(NL80211_IFTYPE_AP) |
+ 				 BIT(NL80211_IFTYPE_P2P_GO) |
++				 BIT(NL80211_IFTYPE_ADHOC) |
+ 				 BIT(NL80211_IFTYPE_MESH_POINT) },
+ };
+ 
diff --git a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
index 29a79569c..410e6bca1 100644
--- a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
+++ b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -83,13 +83,8 @@ ath5k_add_interface(struct ieee80211_hw 
+@@ -86,13 +86,8 @@ ath5k_add_interface(struct ieee80211_hw 
  		goto end;
  	}
  
@@ -18,21 +18,29 @@
  		goto end;
 --- a/drivers/net/wireless/ath/ath5k/base.c
 +++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -1867,7 +1867,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
- 		ah->bmisscount = 0;
+@@ -1871,7 +1871,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
  	}
  
--	if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs > 1) ||
-+	if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs + ah->num_adhoc_vifs > 1) ||
+ 	if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs +
+-			ah->num_mesh_vifs > 1) ||
++			ah->num_adhoc_vifs + ah->num_mesh_vifs > 1) ||
  			ah->opmode == NL80211_IFTYPE_MESH_POINT) {
  		u64 tsf = ath5k_hw_get_tsf64(ah);
  		u32 tsftu = TSF_TO_TU(tsf);
-@@ -1952,7 +1952,7 @@ ath5k_beacon_update_timers(struct ath5k_
- 	u64 hw_tsf;
+@@ -1957,7 +1957,7 @@ ath5k_beacon_update_timers(struct ath5k_
  
  	intval = ah->bintval & AR5K_BEACON_PERIOD;
--	if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs > 1) {
-+	if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs + ah->num_adhoc_vifs > 1) {
+ 	if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs
+-		+ ah->num_mesh_vifs > 1) {
++		+ ah->num_adhoc_vifs + ah->num_mesh_vifs > 1) {
  		intval /= ATH_BCBUF;	/* staggered multi-bss beacons */
  		if (intval < 15)
  			ATH5K_WARN(ah, "intval %u is too low, min 15\n",
+@@ -2419,6 +2419,7 @@ ath5k_tx_complete_poll_work(struct work_
+ static const struct ieee80211_iface_limit if_limits[] = {
+ 	{ .max = 256,	.types = BIT(NL80211_IFTYPE_STATION) },
+ 	{ .max = 4,	.types = BIT(NL80211_IFTYPE_AP) |
++				 BIT(NL80211_IFTYPE_ADHOC) |
+ 				 BIT(NL80211_IFTYPE_MESH_POINT) },
+ };
+ 
diff --git a/package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch b/package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch
new file mode 100644
index 000000000..905596483
--- /dev/null
+++ b/package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch
@@ -0,0 +1,20 @@
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -766,17 +766,11 @@ int ieee80211_register_hw(struct ieee802
+ 	 */
+ 	for (i = 0; i < hw->wiphy->n_iface_combinations; i++) {
+ 		const struct ieee80211_iface_combination *c;
+-		int j;
+ 
+ 		c = &hw->wiphy->iface_combinations[i];
+ 
+ 		if (c->num_different_channels > 1)
+ 			return -EINVAL;
+-
+-		for (j = 0; j < c->n_limits; j++)
+-			if ((c->limits[j].types & BIT(NL80211_IFTYPE_ADHOC)) &&
+-			    c->limits[j].max > 1)
+-				return -EINVAL;
+ 	}
+ 
+ #ifndef CONFIG_MAC80211_MESH
diff --git a/package/mac80211/patches/430-ath5k_disable_fast_cc.patch b/package/mac80211/patches/420-ath5k_disable_fast_cc.patch
index 68d5db020..b63382e4b 100644
--- a/package/mac80211/patches/430-ath5k_disable_fast_cc.patch
+++ b/package/mac80211/patches/420-ath5k_disable_fast_cc.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/reset.c
 +++ b/drivers/net/wireless/ath/ath5k/reset.c
-@@ -1152,6 +1152,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum
+@@ -1155,6 +1155,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum
  	tsf_lo = 0;
  	mode = 0;
  
@@ -8,7 +8,7 @@
  	/*
  	 * Sanity check for fast flag
  	 * Fast channel change only available
-@@ -1159,6 +1160,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum
+@@ -1162,6 +1163,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum
  	 */
  	if (fast && (ah->ah_radio != AR5K_RF2413) &&
  	(ah->ah_radio != AR5K_RF5413))
diff --git a/package/mac80211/patches/450-add-ath5k-platform.patch b/package/mac80211/patches/430-add_ath5k_platform.patch
index b213e2a81..b213e2a81 100644
--- a/package/mac80211/patches/450-add-ath5k-platform.patch
+++ b/package/mac80211/patches/430-add_ath5k_platform.patch
diff --git a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch b/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
index 6e03d70a7..36b2c1c9f 100644
--- a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch
+++ b/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/pci.c
 +++ b/drivers/net/wireless/ath/ath5k/pci.c
-@@ -19,6 +19,7 @@
+@@ -22,6 +22,7 @@
  #include <linux/pci-aspm.h>
  #include <linux/etherdevice.h>
  #include <linux/module.h>
@@ -8,7 +8,7 @@
  #include "../ath.h"
  #include "ath5k.h"
  #include "debug.h"
-@@ -69,7 +70,7 @@ static void ath5k_pci_read_cachesize(str
+@@ -72,7 +73,7 @@ static void ath5k_pci_read_cachesize(str
  }
  
  /*
@@ -17,7 +17,7 @@
   */
  static bool
  ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)
-@@ -77,6 +78,19 @@ ath5k_pci_eeprom_read(struct ath_common
+@@ -80,6 +81,19 @@ ath5k_pci_eeprom_read(struct ath_common 
  	struct ath5k_hw *ah = (struct ath5k_hw *) common->ah;
  	u32 status, timeout;
  
@@ -37,7 +37,7 @@
  	/*
  	 * Initialize EEPROM access
  	 */
-@@ -120,6 +134,16 @@ static int ath5k_pci_eeprom_read_mac(str
+@@ -123,6 +137,16 @@ static int ath5k_pci_eeprom_read_mac(str
  	u16 data;
  	int octet;
  
diff --git a/package/mac80211/patches/460-ath5k-add-pciids.patch b/package/mac80211/patches/432-ath5k_add_pciids.patch
index 9d3f11deb..07530876d 100644
--- a/package/mac80211/patches/460-ath5k-add-pciids.patch
+++ b/package/mac80211/patches/432-ath5k_add_pciids.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/pci.c
 +++ b/drivers/net/wireless/ath/ath5k/pci.c
-@@ -46,6 +46,8 @@ static DEFINE_PCI_DEVICE_TABLE(ath5k_pci
+@@ -49,6 +49,8 @@ static DEFINE_PCI_DEVICE_TABLE(ath5k_pci
  	{ PCI_VDEVICE(ATHEROS, 0x001b) }, /* 5413 Eagle */
  	{ PCI_VDEVICE(ATHEROS, 0x001c) }, /* PCI-E cards */
  	{ PCI_VDEVICE(ATHEROS, 0x001d) }, /* 2417 Nala */
diff --git a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
index 83b3695f3..05481093e 100644
--- a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/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
-@@ -1529,6 +1529,53 @@ static const struct file_operations fops
+@@ -1544,6 +1544,53 @@ static const struct file_operations fops
  
  #endif
  
@@ -47,14 +47,14 @@
 +
 +static const struct file_operations fops_eeprom = {
 +	.read = read_file_eeprom,
-+	.open = ath9k_debugfs_open,
++	.open = simple_open,
 +	.owner = THIS_MODULE
 +};
 +
  int ath9k_init_debug(struct ath_hw *ah)
  {
  	struct ath_common *common = ath9k_hw_common(ah);
-@@ -1592,5 +1639,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1607,5 +1654,8 @@ int ath9k_init_debug(struct ath_hw *ah)
  	debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
  			   sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
  
diff --git a/package/mac80211/patches/501-ath9k-eeprom_endianess.patch b/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
index 3d74cac02..452e10aae 100644
--- a/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
+++ b/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
@@ -81,7 +81,7 @@
  	struct ath_ops reg_ops;
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -537,6 +537,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -534,6 +534,8 @@ static int ath9k_init_softc(u16 devid, s
  		ah->is_clk_25mhz = pdata->is_clk_25mhz;
  		ah->get_mac_revision = pdata->get_mac_revision;
  		ah->external_reset = pdata->external_reset;
diff --git a/package/mac80211/patches/502-ath9k_ahb_init.patch b/package/mac80211/patches/502-ath9k_ahb_init.patch
new file mode 100644
index 000000000..4681b2936
--- /dev/null
+++ b/package/mac80211/patches/502-ath9k_ahb_init.patch
@@ -0,0 +1,32 @@
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -901,23 +901,23 @@ static int __init ath9k_init(void)
+ 		goto err_out;
+ 	}
+ 
+-	error = ath_pci_init();
++	error = ath_ahb_init();
+ 	if (error < 0) {
+-		pr_err("No PCI devices found, driver not installed\n");
+ 		error = -ENODEV;
+ 		goto err_rate_unregister;
+ 	}
+ 
+-	error = ath_ahb_init();
++	error = ath_pci_init();
+ 	if (error < 0) {
++		pr_err("No PCI devices found, driver not installed\n");
+ 		error = -ENODEV;
+-		goto err_pci_exit;
++		goto err_ahb_exit;
+ 	}
+ 
+ 	return 0;
+ 
+- err_pci_exit:
+-	ath_pci_exit();
++ err_ahb_exit:
++	ath_ahb_exit();
+ 
+  err_rate_unregister:
+ 	ath_rate_control_unregister();
diff --git a/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch b/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
index aee38d167..27c99c960 100644
--- a/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
+++ b/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1751,8 +1751,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1887,8 +1887,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  	REG_WRITE(ah, AR_OBS, 8);
  
  	if (ah->config.rx_intr_mitigation) {
diff --git a/package/mac80211/patches/511-ath9k_increase_bcbuf.patch b/package/mac80211/patches/511-ath9k_increase_bcbuf.patch
deleted file mode 100644
index 2523506cb..000000000
--- a/package/mac80211/patches/511-ath9k_increase_bcbuf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -369,7 +369,7 @@ struct ath_vif {
-  * number of beacon intervals, the game's up.
-  */
- #define BSTUCK_THRESH           	9
--#define	ATH_BCBUF               	4
-+#define	ATH_BCBUF               	8
- #define ATH_DEFAULT_BINTVAL     	100 /* TU */
- #define ATH_DEFAULT_BMISS_LIMIT 	10
- #define IEEE80211_MS_TO_TU(x)           (((x) * 1000) / 1024)
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -389,8 +389,8 @@ static void ath9k_hw_init_config(struct 
- {
- 	int i;
- 
--	ah->config.dma_beacon_response_time = 2;
--	ah->config.sw_beacon_response_time = 10;
-+	ah->config.dma_beacon_response_time = 1;
-+	ah->config.sw_beacon_response_time = 6;
- 	ah->config.additional_swba_backoff = 0;
- 	ah->config.ack_6mb = 0x0;
- 	ah->config.cwm_ignore_extcca = 0;
diff --git a/package/mac80211/patches/512-ath9k_reduce_rxbuf.patch b/package/mac80211/patches/511-ath9k_reduce_rxbuf.patch
index d4661de32..db13fea1b 100644
--- a/package/mac80211/patches/512-ath9k_reduce_rxbuf.patch
+++ b/package/mac80211/patches/511-ath9k_reduce_rxbuf.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -121,7 +121,7 @@ void ath_descdma_cleanup(struct ath_soft
+@@ -122,7 +122,7 @@ void ath_descdma_cleanup(struct ath_soft
  /* RX / TX */
  /***********/
  
diff --git a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index 70919f09f..7ab862507 100644
--- a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
+++ b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@ -1,15 +1,15 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -624,6 +624,7 @@ struct ath_softc {
+@@ -620,6 +620,7 @@ struct ath_softc {
  	struct ieee80211_hw *hw;
  	struct device *dev;
  
 +	u32 chan_bw;
- 	int chan_idx;
- 	int chan_is_ht;
  	struct survey_info *cur_survey;
-@@ -691,6 +692,7 @@ struct ath_softc {
- 	u8 ant_tx, ant_rx;
+ 	struct survey_info survey[ATH9K_NUM_CHANNELS];
+ 
+@@ -687,6 +688,7 @@ struct ath_softc {
+ 	struct dfs_pattern_detector *dfs_detector;
  };
  
 +int ath9k_config(struct ieee80211_hw *hw, u32 changed);
@@ -18,7 +18,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1576,6 +1576,50 @@ static const struct file_operations fops
+@@ -1591,6 +1591,50 @@ static const struct file_operations fops
  	.owner = THIS_MODULE
  };
  
@@ -60,7 +60,7 @@
 +static const struct file_operations fops_chanbw = {
 +	.read = read_file_chan_bw,
 +	.write = write_file_chan_bw,
-+	.open = ath9k_debugfs_open,
++	.open = simple_open,
 +	.owner = THIS_MODULE,
 +	.llseek = default_llseek,
 +};
@@ -69,7 +69,7 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
  	struct ath_common *common = ath9k_hw_common(ah);
-@@ -1642,5 +1686,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1657,5 +1701,8 @@ int ath9k_init_debug(struct ath_hw *ah)
  	debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
  			    &fops_eeprom);
  
@@ -80,7 +80,7 @@
  }
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1537,7 +1537,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1550,7 +1550,7 @@ static void ath9k_disable_ps(struct ath_
  
  }
  
@@ -89,7 +89,7 @@
  {
  	struct ath_softc *sc = hw->priv;
  	struct ath_hw *ah = sc->sc_ah;
-@@ -1588,9 +1588,11 @@ static int ath9k_config(struct ieee80211
+@@ -1601,9 +1601,11 @@ static int ath9k_config(struct ieee80211
  
  	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
  		struct ieee80211_channel *curchan = hw->conf.channel;
@@ -101,7 +101,7 @@
  
  		if (ah->curchan)
  			old_pos = ah->curchan - &ah->channels[0];
-@@ -1638,7 +1640,23 @@ static int ath9k_config(struct ieee80211
+@@ -1651,7 +1653,23 @@ static int ath9k_config(struct ieee80211
  			memset(&sc->survey[pos], 0, sizeof(struct survey_info));
  		}
  
@@ -126,16 +126,3 @@
  			ath_err(common, "Unable to set channel\n");
  			mutex_unlock(&sc->mutex);
  			return -EINVAL;
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1576,6 +1576,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- 	    caldata->rtt_hist.num_readings)
- 		allow_fbs = true;
- 
-+	if (!ah->curchan || ((ah->curchan->channelFlags ^ chan->channelFlags) &
-+	    (CHANNEL_HALF | CHANNEL_QUARTER)))
-+		bChannelChange = false;
-+
- 	if (bChannelChange &&
- 	    (ah->chip_fullsleep != true) &&
- 	    (ah->curchan != NULL) &&
diff --git a/package/mac80211/patches/521-mac80211_reduce_txqueuelen.patch b/package/mac80211/patches/513-mac80211_reduce_txqueuelen.patch
index bf3f89b5a..a1405a8aa 100644
--- a/package/mac80211/patches/521-mac80211_reduce_txqueuelen.patch
+++ b/package/mac80211/patches/513-mac80211_reduce_txqueuelen.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -688,6 +688,7 @@ static const struct net_device_ops ieee8
+@@ -813,6 +813,7 @@ static const struct net_device_ops ieee8
  static void ieee80211_if_setup(struct net_device *dev)
  {
  	ether_setup(dev);
diff --git a/package/mac80211/patches/530-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch
index 3363fe27e..f6dbbef74 100644
--- a/package/mac80211/patches/530-mac80211_cur_txpower.patch
+++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -1,6 +1,6 @@
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -819,7 +819,7 @@ enum ieee80211_smps_mode {
+@@ -825,7 +825,7 @@ enum ieee80211_smps_mode {
   */
  struct ieee80211_conf {
  	u32 flags;
@@ -11,7 +11,7 @@
  	u16 listen_interval;
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -1711,7 +1711,7 @@ static int ieee80211_get_tx_power(struct
+@@ -1738,7 +1738,7 @@ static int ieee80211_get_tx_power(struct
  {
  	struct ieee80211_local *local = wiphy_priv(wiphy);
  
@@ -22,7 +22,7 @@
  }
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -168,6 +168,7 @@ int ieee80211_hw_config(struct ieee80211
+@@ -165,6 +165,7 @@ int ieee80211_hw_config(struct ieee80211
  
  	if (local->hw.conf.power_level != power) {
  		changed |= IEEE80211_CONF_CHANGE_POWER;
diff --git a/package/mac80211/patches/520-mac80211_ht_change_rate_update.patch b/package/mac80211/patches/520-mac80211_ht_change_rate_update.patch
deleted file mode 100644
index 341e487d0..000000000
--- a/package/mac80211/patches/520-mac80211_ht_change_rate_update.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/net/mac80211/main.c
-+++ b/net/mac80211/main.c
-@@ -197,7 +197,9 @@ void ieee80211_bss_info_change_notify(st
- 				      u32 changed)
- {
- 	struct ieee80211_local *local = sdata->local;
-+	struct ieee80211_supported_band *sband;
- 	static const u8 zero[ETH_ALEN] = { 0 };
-+	struct sta_info *sta;
- 
- 	if (!changed)
- 		return;
-@@ -219,6 +221,22 @@ void ieee80211_bss_info_change_notify(st
- 
- 	switch (sdata->vif.type) {
- 	case NL80211_IFTYPE_AP:
-+		if (!(changed & BSS_CHANGED_HT))
-+			break;
-+
-+		sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
-+		rcu_read_lock();
-+		list_for_each_entry(sta, &local->sta_list, list) {
-+			if (sta->sdata != sdata &&
-+			    (!sdata->bss || sta->sdata->bss != sdata->bss))
-+				continue;
-+
-+			rate_control_rate_update(local, sband, sta,
-+				IEEE80211_RC_HT_CHANGED,
-+				local->_oper_channel_type);
-+		}
-+		rcu_read_unlock();
-+		break;
- 	case NL80211_IFTYPE_ADHOC:
- 	case NL80211_IFTYPE_WDS:
- 	case NL80211_IFTYPE_MESH_POINT:
diff --git a/package/mac80211/patches/531-ath9k_cur_txpower.patch b/package/mac80211/patches/521-ath9k_cur_txpower.patch
index 809a83308..5a59bbfdc 100644
--- a/package/mac80211/patches/531-ath9k_cur_txpower.patch
+++ b/package/mac80211/patches/521-ath9k_cur_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1662,6 +1662,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1675,6 +1675,8 @@ int ath9k_config(struct ieee80211_hw *hw
  			return -EINVAL;
  		}
  
@@ -9,7 +9,7 @@
  		/*
  		 * The most recent snapshot of channel->noisefloor for the old
  		 * channel is only available after the hardware reset. Copy it to
-@@ -1676,6 +1678,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1689,6 +1691,7 @@ int ath9k_config(struct ieee80211_hw *hw
  		sc->config.txpowlimit = 2 * conf->power_level;
  		ath9k_cmn_update_txpow(ah, sc->curtxpow,
  				       sc->config.txpowlimit, &sc->curtxpow);
diff --git a/package/mac80211/patches/550-ath9k_per_chain_signal_strength.patch b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
index 47cc252e8..acaea62f0 100644
--- a/package/mac80211/patches/550-ath9k_per_chain_signal_strength.patch
+++ b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
@@ -1,6 +1,6 @@
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -687,6 +687,9 @@ enum mac80211_rx_flags {
+@@ -693,6 +693,9 @@ enum mac80211_rx_flags {
   * @mactime: value in microseconds of the 64-bit Time Synchronization Function
   * 	(TSF) timer when the first data symbol (MPDU) arrived at the hardware.
   * @band: the active band when this frame was received
@@ -10,7 +10,7 @@
   * @freq: frequency the radio was tuned to when receiving this frame, in MHz
   * @signal: signal strength when receiving this frame, either in dBm, in dB or
   *	unspecified depending on the hardware capabilities flags
-@@ -700,6 +703,10 @@ enum mac80211_rx_flags {
+@@ -706,6 +709,10 @@ enum mac80211_rx_flags {
  struct ieee80211_rx_status {
  	u64 mactime;
  	enum ieee80211_band band;
@@ -23,7 +23,7 @@
  	int antenna;
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h
-@@ -313,6 +313,11 @@ struct sta_info {
+@@ -320,6 +320,11 @@ struct sta_info {
  	unsigned long rx_dropped;
  	int last_signal;
  	struct ewma avg_signal;
@@ -37,7 +37,7 @@
  
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -1271,6 +1271,7 @@ ieee80211_rx_h_sta_process(struct ieee80
+@@ -1262,6 +1262,7 @@ ieee80211_rx_h_sta_process(struct ieee80
  	struct sk_buff *skb = rx->skb;
  	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
  	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
@@ -45,7 +45,7 @@
  
  	if (!sta)
  		return RX_CONTINUE;
-@@ -1315,6 +1316,19 @@ ieee80211_rx_h_sta_process(struct ieee80
+@@ -1306,6 +1307,19 @@ ieee80211_rx_h_sta_process(struct ieee80
  		ewma_add(&sta->avg_signal, -status->signal);
  	}
  
@@ -78,37 +78,35 @@
  		kfree(sta);
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -518,6 +518,8 @@ struct station_parameters {
-  * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled
+@@ -522,6 +522,8 @@ struct station_parameters {
   * @STATION_INFO_STA_FLAGS: @sta_flags filled
   * @STATION_INFO_BEACON_LOSS_COUNT: @beacon_loss_count filled
+  * @STATION_INFO_T_OFFSET: @t_offset filled
 + * @STATION_INFO_CHAIN_SIGNAL: @chain_signal filled
 + * @STATION_INFO_CHAIN_SIGNAL_AVG: @chain_signal_avg filled
   */
  enum station_info_flags {
  	STATION_INFO_INACTIVE_TIME	= 1<<0,
-@@ -539,7 +541,9 @@ enum station_info_flags {
- 	STATION_INFO_CONNECTED_TIME	= 1<<16,
- 	STATION_INFO_ASSOC_REQ_IES	= 1<<17,
+@@ -545,6 +547,8 @@ enum station_info_flags {
  	STATION_INFO_STA_FLAGS		= 1<<18,
--	STATION_INFO_BEACON_LOSS_COUNT	= 1<<19
-+	STATION_INFO_BEACON_LOSS_COUNT	= 1<<19,
-+	STATION_INFO_CHAIN_SIGNAL	= 1<<20,
-+	STATION_INFO_CHAIN_SIGNAL_AVG	= 1<<21,
+ 	STATION_INFO_BEACON_LOSS_COUNT	= 1<<19,
+ 	STATION_INFO_T_OFFSET		= 1<<20,
++	STATION_INFO_CHAIN_SIGNAL	= 1<<21,
++	STATION_INFO_CHAIN_SIGNAL_AVG	= 1<<22,
  };
  
  /**
-@@ -619,6 +623,9 @@ struct sta_bss_parameters {
-  * @plink_state: mesh peer link state
-  * @signal: signal strength of last received packet in dBm
-  * @signal_avg: signal strength average in dBm
+@@ -626,6 +630,9 @@ struct sta_bss_parameters {
+ 	NOTE: For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+  * @signal_avg: avg signal strength, type depends on the wiphy's signal_type
+ 	NOTE: For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
 + * @chains: bitmask for filled values in @chain_signal, @chain_signal_avg
 + * @chain_signal: per-chain signal strength of last received packet in dBm
 + * @chain_signal_avg: per-chain signal strength average in dBm
   * @txrate: current unicast bitrate from this station
   * @rxrate: current unicast bitrate to this station
   * @rx_packets: packets received from this station
-@@ -650,6 +657,11 @@ struct station_info {
+@@ -658,6 +665,11 @@ struct station_info {
  	u8 plink_state;
  	s8 signal;
  	s8 signal_avg;
@@ -139,7 +137,7 @@
  	u8 rs_num_delims;
 --- a/drivers/net/wireless/ath/ath9k/recv.c
 +++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -986,6 +986,7 @@ static int ath9k_rx_skb_preprocess(struc
+@@ -987,6 +987,7 @@ static int ath9k_rx_skb_preprocess(struc
  				   bool *decrypt_error)
  {
  	struct ath_hw *ah = common->ah;
@@ -147,7 +145,7 @@
  
  	/*
  	 * everything but the rate is checked here, the rate check is done
-@@ -1011,6 +1012,20 @@ static int ath9k_rx_skb_preprocess(struc
+@@ -1012,6 +1013,20 @@ static int ath9k_rx_skb_preprocess(struc
  	if (rx_stats->rs_moreaggr)
  		rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
  
@@ -168,7 +166,7 @@
  	return 0;
  }
  
-@@ -1541,14 +1556,14 @@ static void ath_ant_comb_scan(struct ath
+@@ -1542,14 +1557,14 @@ static void ath_ant_comb_scan(struct ath
  	struct ath_ant_comb *antcomb = &sc->ant_comb;
  	int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
  	int curr_main_set;
@@ -210,7 +208,7 @@
  		rxs->rs_keyix = MS(rxsp->status11, AR_KeyIdx);
 --- a/drivers/net/wireless/ath/ath9k/mac.c
 +++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -556,25 +556,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
+@@ -553,25 +553,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
  
  	if (ads.ds_rxstatus8 & AR_PostDelimCRCErr) {
  		rs->rs_rssi = ATH9K_RSSI_BAD;
@@ -250,7 +248,7 @@
  	if (ads.ds_rxstatus8 & AR_RxKeyIdxValid)
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -993,12 +993,12 @@ void ath_debug_stat_rx(struct ath_softc 
+@@ -1009,12 +1009,12 @@ void ath_debug_stat_rx(struct ath_softc 
  #ifdef CONFIG_ATH9K_MAC_DEBUG
  	spin_lock(&sc->debug.samp_lock);
  	RX_SAMP_DBG(jiffies) = jiffies;
@@ -271,19 +269,19 @@
  	RX_SAMP_DBG(rate) = rs->rs_rate;
 --- a/include/linux/nl80211.h
 +++ b/include/linux/nl80211.h
-@@ -1661,6 +1661,8 @@ enum nl80211_sta_bss_param {
-  * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected
+@@ -1693,6 +1693,8 @@ enum nl80211_sta_bss_param {
   * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
   * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
+  * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
 + * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
 + * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
   * @__NL80211_STA_INFO_AFTER_LAST: internal
   * @NL80211_STA_INFO_MAX: highest possible station info attribute
   */
-@@ -1684,6 +1686,8 @@ enum nl80211_sta_info {
- 	NL80211_STA_INFO_CONNECTED_TIME,
+@@ -1717,6 +1719,8 @@ enum nl80211_sta_info {
  	NL80211_STA_INFO_STA_FLAGS,
  	NL80211_STA_INFO_BEACON_LOSS,
+ 	NL80211_STA_INFO_T_OFFSET,
 +	NL80211_STA_INFO_CHAIN_SIGNAL,
 +	NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
  
@@ -291,7 +289,7 @@
  	__NL80211_STA_INFO_AFTER_LAST,
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -2376,6 +2376,33 @@ nla_put_failure:
+@@ -2406,6 +2406,33 @@ nla_put_failure:
  	return false;
  }
  
@@ -323,12 +321,12 @@
 +}
 +
  static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
- 				int flags, struct net_device *dev,
- 				const u8 *mac_addr, struct station_info *sinfo)
-@@ -2422,6 +2449,18 @@ static int nl80211_send_station(struct s
- 	if (sinfo->filled & STATION_INFO_SIGNAL_AVG)
- 		NLA_PUT_U8(msg, NL80211_STA_INFO_SIGNAL_AVG,
- 			   sinfo->signal_avg);
+ 				int flags,
+ 				struct cfg80211_registered_device *rdev,
+@@ -2460,6 +2487,18 @@ static int nl80211_send_station(struct s
+ 	default:
+ 		break;
+ 	}
 +	if (sinfo->filled & STATION_INFO_CHAIN_SIGNAL) {
 +		if (!nl80211_put_signal(msg, sinfo->chains,
 +					sinfo->chain_signal,
@@ -346,7 +344,7 @@
  					  NL80211_STA_INFO_TX_BITRATE))
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -340,6 +340,7 @@ static void sta_set_sinfo(struct sta_inf
+@@ -354,6 +354,7 @@ static void sta_set_sinfo(struct sta_inf
  {
  	struct ieee80211_sub_if_data *sdata = sta->sdata;
  	struct timespec uptime;
@@ -354,7 +352,7 @@
  
  	sinfo->generation = sdata->local->sta_generation;
  
-@@ -377,6 +378,17 @@ static void sta_set_sinfo(struct sta_inf
+@@ -391,6 +392,17 @@ static void sta_set_sinfo(struct sta_inf
  		sinfo->signal = (s8)sta->last_signal;
  		sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
  	}
@@ -370,5 +368,5 @@
 +		}
 +	}
  
- 	sinfo->txrate.flags = 0;
- 	if (sta->last_tx_rate.flags & IEEE80211_TX_RC_MCS)
+ 	sta_set_rate_info_tx(sta, &sta->last_tx_rate, &sinfo->txrate);
+ 
diff --git a/package/mac80211/patches/540-ath9k_limit_qlen.patch b/package/mac80211/patches/530-ath9k_limit_qlen.patch
index 1847373e8..5c649ce0e 100644
--- a/package/mac80211/patches/540-ath9k_limit_qlen.patch
+++ b/package/mac80211/patches/530-ath9k_limit_qlen.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -242,6 +242,7 @@ struct ath_atx_tid {
+@@ -243,6 +243,7 @@ struct ath_atx_tid {
  	struct ath_node *an;
  	struct ath_atx_ac *ac;
  	unsigned long tx_buf[BITS_TO_LONGS(ATH_TID_MAX_BUFS)];
@@ -8,7 +8,7 @@
  	int bar_index;
  	u16 seq_start;
  	u16 seq_next;
-@@ -288,6 +289,9 @@ struct ath_tx_control {
+@@ -289,6 +290,9 @@ struct ath_tx_control {
   *  (axq_qnum).
   */
  struct ath_tx {
@@ -20,7 +20,7 @@
  	spinlock_t txbuflock;
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1643,6 +1643,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1658,6 +1658,10 @@ int ath9k_init_debug(struct ath_hw *ah)
  			    &fops_interrupt);
  	debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,
  			    &fops_xmit);
@@ -65,7 +65,7 @@
  		__skb_unlink(skb, &tid->buf_q);
  		list_add_tail(&bf->list, bf_q);
  		if (bf_prev)
-@@ -1739,6 +1750,8 @@ static void ath_tx_send_ampdu(struct ath
+@@ -1737,6 +1748,8 @@ static void ath_tx_send_ampdu(struct ath
  	/* Add sub-frame to BAW */
  	ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
  
@@ -74,7 +74,7 @@
  	/* Queue to h/w without aggregation */
  	TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw);
  	bf->bf_lastbf = bf;
-@@ -1863,22 +1876,11 @@ error:
+@@ -1861,22 +1874,11 @@ error:
  
  /* FIXME: tx power */
  static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
@@ -88,7 +88,7 @@
  	struct ath_buf *bf;
 -	u8 tidno;
 -
--	if ((sc->sc_flags & SC_OP_TXAGGR) && txctl->an &&
+-	if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && txctl->an &&
 -		ieee80211_is_data_qos(hdr->frame_control)) {
 -		tidno = ieee80211_get_qos_ctl(hdr)[0] &
 -			IEEE80211_QOS_CTL_TID_MASK;
@@ -99,7 +99,7 @@
  
  	if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
  		/*
-@@ -1910,6 +1912,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1908,6 +1910,7 @@ int ath_tx_start(struct ieee80211_hw *hw
  	struct ieee80211_vif *vif = info->control.vif;
  	struct ath_softc *sc = hw->priv;
  	struct ath_txq *txq = txctl->txq;
@@ -107,11 +107,11 @@
  	int padpos, padsize;
  	int frmlen = skb->len + FCS_LEN;
  	int q;
-@@ -1952,6 +1955,24 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1950,6 +1953,24 @@ int ath_tx_start(struct ieee80211_hw *hw
  
  	setup_frame_info(hw, skb, frmlen);
  
-+	if ((sc->sc_flags & SC_OP_TXAGGR) && txctl->an &&
++	if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && txctl->an &&
 +	    ieee80211_is_data_qos(hdr->frame_control)) {
 +		tid = ath_get_tid(txctl->an, skb);
 +
@@ -132,7 +132,7 @@
  	/*
  	 * At this point, the vif, hw_key and sta pointers in the tx control
  	 * info are no longer valid (overwritten by the ath_frame_info data.
-@@ -1966,7 +1987,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+@@ -1964,7 +1985,7 @@ int ath_tx_start(struct ieee80211_hw *hw
  		txq->stopped = true;
  	}
  
diff --git a/package/mac80211/patches/543-ath9k_fix_initvals.patch b/package/mac80211/patches/531-ath9k_fix_initvals.patch
index 664fa1e89..99121f7ab 100644
--- a/package/mac80211/patches/543-ath9k_fix_initvals.patch
+++ b/package/mac80211/patches/531-ath9k_fix_initvals.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-@@ -835,108 +835,108 @@ static const u32 ar9300_2p2_baseband_cor
+@@ -533,108 +533,108 @@ static const u32 ar9300_2p2_baseband_cor
  
  static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
  	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
diff --git a/package/mac80211/patches/551-ath9k_extra_leds.patch b/package/mac80211/patches/540-ath9k_extra_leds.patch
index e15de8ed6..13b9d1884 100644
--- a/package/mac80211/patches/551-ath9k_extra_leds.patch
+++ b/package/mac80211/patches/540-ath9k_extra_leds.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -504,6 +504,9 @@ static inline u16 ath9k_btcoex_aggr_limi
+@@ -507,6 +507,9 @@ static inline u16 ath9k_btcoex_aggr_limi
  #ifdef CONFIG_MAC80211_LEDS
  void ath_init_leds(struct ath_softc *sc);
  void ath_deinit_leds(struct ath_softc *sc);
@@ -10,8 +10,8 @@
  #else
  static inline void ath_init_leds(struct ath_softc *sc)
  {
-@@ -624,6 +627,13 @@ struct ath9k_vif_iter_data {
- 	int nothers;   /* number of vifs not specified above. */
+@@ -620,6 +623,13 @@ struct ath9k_vif_iter_data {
+ 	int nadhocs;   /* number of adhoc vifs */
  };
  
 +struct ath_led {
@@ -24,7 +24,7 @@
  struct ath_softc {
  	struct ieee80211_hw *hw;
  	struct device *dev;
-@@ -667,9 +677,8 @@ struct ath_softc {
+@@ -661,9 +671,8 @@ struct ath_softc {
  	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  
  #ifdef CONFIG_MAC80211_LEDS
@@ -171,7 +171,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -761,7 +761,7 @@ int ath9k_init_device(u16 devid, struct 
+@@ -778,7 +778,7 @@ int ath9k_init_device(u16 devid, struct 
  
  #ifdef CONFIG_MAC80211_LEDS
  	/* must be initialized before ieee80211_register_hw */
@@ -182,7 +182,7 @@
  #endif
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1252,6 +1252,61 @@ static const struct file_operations fops
+@@ -1267,6 +1267,61 @@ static const struct file_operations fops
  	.llseek = default_llseek,
  };
  
@@ -234,7 +234,7 @@
 +
 +static const struct file_operations fops_gpio_led = {
 +	.write = write_file_gpio_led,
-+	.open = ath9k_debugfs_open,
++	.open = simple_open,
 +	.owner = THIS_MODULE,
 +	.llseek = default_llseek,
 +};
@@ -244,7 +244,7 @@
  #ifdef CONFIG_ATH9K_MAC_DEBUG
  
  void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
-@@ -1681,6 +1736,11 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1696,6 +1751,11 @@ int ath9k_init_debug(struct ath_hw *ah)
  			    &fops_samps);
  #endif
  
diff --git a/package/mac80211/patches/552-ath9k_extra_platform_leds.patch b/package/mac80211/patches/541-ath9k_extra_platform_leds.patch
index ac8ee533d..ac8ee533d 100644
--- a/package/mac80211/patches/552-ath9k_extra_platform_leds.patch
+++ b/package/mac80211/patches/541-ath9k_extra_platform_leds.patch
diff --git a/package/mac80211/patches/541-ath9k_fix_half_quarter_rx_latency.patch b/package/mac80211/patches/541-ath9k_fix_half_quarter_rx_latency.patch
deleted file mode 100644
index 45246ea46..000000000
--- a/package/mac80211/patches/541-ath9k_fix_half_quarter_rx_latency.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1006,16 +1006,26 @@ void ath9k_hw_init_global_settings(struc
- 
- 	if (IS_CHAN_HALF_RATE(chan)) {
- 		eifs = 175;
--		rx_lat *= 2;
-+
-+		if (!AR_SREV_9300_20_OR_LATER(ah))
-+			rx_lat = 10;
-+		else
-+			rx_lat *= 2;
-+
- 		tx_lat *= 2;
- 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
--		    tx_lat += 11;
-+			tx_lat += 11;
- 
- 		slottime = 13;
- 		sifstime = 32;
- 	} else if (IS_CHAN_QUARTER_RATE(chan)) {
- 		eifs = 340;
--		rx_lat = (rx_lat * 4) - 1;
-+
-+		if (!AR_SREV_9300_20_OR_LATER(ah))
-+			rx_lat = 20;
-+		else
-+			rx_lat = (rx_lat * 4) - 1;
-+
- 		tx_lat *= 4;
- 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
- 		    tx_lat += 22;
diff --git a/package/mac80211/patches/542-ath9k_fix_half_quarter_sifs.patch b/package/mac80211/patches/542-ath9k_fix_half_quarter_sifs.patch
deleted file mode 100644
index 6bde7659f..000000000
--- a/package/mac80211/patches/542-ath9k_fix_half_quarter_sifs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1007,31 +1007,35 @@ void ath9k_hw_init_global_settings(struc
- 	if (IS_CHAN_HALF_RATE(chan)) {
- 		eifs = 175;
- 
--		if (!AR_SREV_9300_20_OR_LATER(ah))
-+		if (!AR_SREV_9300_20_OR_LATER(ah)) {
- 			rx_lat = 10;
--		else
-+			sifstime = 8;
-+		} else {
- 			rx_lat *= 2;
-+			sifstime = 32;
-+		}
- 
- 		tx_lat *= 2;
- 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
- 			tx_lat += 11;
- 
- 		slottime = 13;
--		sifstime = 32;
- 	} else if (IS_CHAN_QUARTER_RATE(chan)) {
- 		eifs = 340;
- 
--		if (!AR_SREV_9300_20_OR_LATER(ah))
-+		if (!AR_SREV_9300_20_OR_LATER(ah)) {
- 			rx_lat = 20;
--		else
-+			sifstime = 8;
-+		} else {
- 			rx_lat = (rx_lat * 4) - 1;
-+			sifstime = 64;
-+		}
- 
- 		tx_lat *= 4;
- 		if (IS_CHAN_A_FAST_CLOCK(ah, chan))
- 		    tx_lat += 22;
- 
- 		slottime = 21;
--		sifstime = 64;
- 	} else {
- 		if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) {
- 			eifs = AR_D_GBL_IFS_EIFS_ASYNC_FIFO;
diff --git a/package/mac80211/patches/563-mac80211_optimize_mcs_rate_mask.patch b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
index 534824f09..2129d382b 100644
--- a/package/mac80211/patches/563-mac80211_optimize_mcs_rate_mask.patch
+++ b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -656,6 +656,8 @@ struct ieee80211_sub_if_data {
+@@ -726,6 +726,8 @@ struct ieee80211_sub_if_data {
  
  	/* bitmap of allowed (non-MCS) rate indexes for rate control */
  	u32 rc_rateidx_mask[IEEE80211_NUM_BANDS];
@@ -11,7 +11,7 @@
  	union {
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -1887,9 +1887,20 @@ static int ieee80211_set_bitrate_mask(st
+@@ -1914,9 +1914,20 @@ static int ieee80211_set_bitrate_mask(st
  	}
  
  	for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
@@ -34,15 +34,16 @@
  	return 0;
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -3590,6 +3590,7 @@ enum rate_control_changed {
+@@ -3645,7 +3645,7 @@ void ieee80211_send_bar(struct ieee80211
   *	(deprecated; this will be removed once drivers get updated to use
   *	rate_idx_mask)
-  * @rate_idx_mask: user-requested rate mask (not MCS for now)
+  * @rate_idx_mask: user-requested (legacy) rate mask
+- * @rate_idx_mcs_mask: user-requested MCS rate mask
 + * @rate_idx_mcs_mask: user-requested MCS rate mask (NULL if not in use)
-  * @skb: the skb that will be transmitted, the control information in it needs
-  *	to be filled in
   * @bss: whether this frame is sent out in AP or IBSS mode
-@@ -3603,7 +3604,7 @@ struct ieee80211_tx_rate_control {
+  */
+ struct ieee80211_tx_rate_control {
+@@ -3657,7 +3657,7 @@ struct ieee80211_tx_rate_control {
  	bool rts, short_preamble;
  	u8 max_rate_idx;
  	u32 rate_idx_mask;
@@ -53,7 +54,7 @@
  
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -640,9 +640,11 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+@@ -642,9 +642,11 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
  		txrc.max_rate_idx = -1;
  	else
  		txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
@@ -68,7 +69,7 @@
  	txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP ||
  		    tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
  		    tx->sdata->vif.type == NL80211_IFTYPE_ADHOC);
-@@ -2461,8 +2463,6 @@ struct sk_buff *ieee80211_beacon_get_tim
+@@ -2479,8 +2481,6 @@ struct sk_buff *ieee80211_beacon_get_tim
  		txrc.max_rate_idx = -1;
  	else
  		txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
diff --git a/package/mac80211/patches/564-ath9k_optimize_interrupt_mitigation.patch b/package/mac80211/patches/551-ath9k_optimize_interrupt_mitigation.patch
index 5674fbb9d..5674fbb9d 100644
--- a/package/mac80211/patches/564-ath9k_optimize_interrupt_mitigation.patch
+++ b/package/mac80211/patches/551-ath9k_optimize_interrupt_mitigation.patch
diff --git a/package/mac80211/patches/560-ath9k_optimize_hw_check.patch b/package/mac80211/patches/560-ath9k_optimize_hw_check.patch
deleted file mode 100644
index 61430305b..000000000
--- a/package/mac80211/patches/560-ath9k_optimize_hw_check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -369,6 +369,9 @@ void ath_beacon_tasklet(unsigned long da
- 	if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {
- 		sc->beacon.bmisscnt++;
- 
-+		if (!ath9k_hw_check_alive(ah))
-+			ieee80211_queue_work(sc->hw, &sc->hw_check_work);
-+
- 		if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {
- 			ath_dbg(common, BSTUCK,
- 				"missed %u consecutive beacons\n",
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -695,17 +695,6 @@ void ath9k_tasklet(unsigned long data)
- 		goto out;
- 	}
- 
--	/*
--	 * Only run the baseband hang check if beacons stop working in AP or
--	 * IBSS mode, because it has a high false positive rate. For station
--	 * mode it should not be necessary, since the upper layers will detect
--	 * this through a beacon miss automatically and the following channel
--	 * change will trigger a hardware reset anyway
--	 */
--	if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 &&
--	    !ath9k_hw_check_alive(ah))
--		ieee80211_queue_work(sc->hw, &sc->hw_check_work);
--
- 	if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
- 		/*
- 		 * TSF sync does not look correct; remain awake to sync with
diff --git a/package/mac80211/patches/562-mac80211_remove_code_duplication.patch b/package/mac80211/patches/562-mac80211_remove_code_duplication.patch
deleted file mode 100644
index e411d766c..000000000
--- a/package/mac80211/patches/562-mac80211_remove_code_duplication.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- a/net/mac80211/debugfs_netdev.c
-+++ b/net/mac80211/debugfs_netdev.c
-@@ -445,26 +445,23 @@ IEEE80211_IF_FILE(dot11MeshHWMPRannInter
- IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC);
- #endif
- 
--
--#define DEBUGFS_ADD(name) \
--	debugfs_create_file(#name, 0400, sdata->debugfs.dir, \
--			    sdata, &name##_ops);
--
- #define DEBUGFS_ADD_MODE(name, mode) \
- 	debugfs_create_file(#name, mode, sdata->debugfs.dir, \
- 			    sdata, &name##_ops);
- 
--static void add_sta_files(struct ieee80211_sub_if_data *sdata)
-+#define DEBUGFS_ADD(name) DEBUGFS_ADD_MODE(name, 0400)
-+
-+static void add_common_files(struct ieee80211_sub_if_data *sdata)
- {
- 	DEBUGFS_ADD(drop_unencrypted);
--	DEBUGFS_ADD(flags);
--	DEBUGFS_ADD(state);
--	DEBUGFS_ADD(channel_type);
- 	DEBUGFS_ADD(rc_rateidx_mask_2ghz);
- 	DEBUGFS_ADD(rc_rateidx_mask_5ghz);
- 	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
- 	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
-+}
- 
-+static void add_sta_files(struct ieee80211_sub_if_data *sdata)
-+{
- 	DEBUGFS_ADD(bssid);
- 	DEBUGFS_ADD(aid);
- 	DEBUGFS_ADD(last_beacon);
-@@ -475,15 +472,6 @@ static void add_sta_files(struct ieee802
- 
- static void add_ap_files(struct ieee80211_sub_if_data *sdata)
- {
--	DEBUGFS_ADD(drop_unencrypted);
--	DEBUGFS_ADD(flags);
--	DEBUGFS_ADD(state);
--	DEBUGFS_ADD(channel_type);
--	DEBUGFS_ADD(rc_rateidx_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mask_5ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
--
- 	DEBUGFS_ADD(num_sta_authorized);
- 	DEBUGFS_ADD(num_sta_ps);
- 	DEBUGFS_ADD(dtim_count);
-@@ -493,48 +481,14 @@ static void add_ap_files(struct ieee8021
- 
- static void add_ibss_files(struct ieee80211_sub_if_data *sdata)
- {
--	DEBUGFS_ADD(channel_type);
--	DEBUGFS_ADD(rc_rateidx_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mask_5ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
--
- 	DEBUGFS_ADD_MODE(tsf, 0600);
- }
- 
- static void add_wds_files(struct ieee80211_sub_if_data *sdata)
- {
--	DEBUGFS_ADD(drop_unencrypted);
--	DEBUGFS_ADD(flags);
--	DEBUGFS_ADD(state);
--	DEBUGFS_ADD(channel_type);
--	DEBUGFS_ADD(rc_rateidx_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mask_5ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
--
- 	DEBUGFS_ADD(peer);
- }
- 
--static void add_vlan_files(struct ieee80211_sub_if_data *sdata)
--{
--	DEBUGFS_ADD(drop_unencrypted);
--	DEBUGFS_ADD(flags);
--	DEBUGFS_ADD(state);
--	DEBUGFS_ADD(channel_type);
--	DEBUGFS_ADD(rc_rateidx_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mask_5ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
--	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);
--}
--
--static void add_monitor_files(struct ieee80211_sub_if_data *sdata)
--{
--	DEBUGFS_ADD(flags);
--	DEBUGFS_ADD(state);
--	DEBUGFS_ADD(channel_type);
--}
--
- #ifdef CONFIG_MAC80211_MESH
- 
- static void add_mesh_stats(struct ieee80211_sub_if_data *sdata)
-@@ -590,6 +544,13 @@ static void add_files(struct ieee80211_s
- 	if (!sdata->debugfs.dir)
- 		return;
- 
-+	DEBUGFS_ADD(flags);
-+	DEBUGFS_ADD(state);
-+	DEBUGFS_ADD(channel_type);
-+
-+	if (sdata->vif.type != NL80211_IFTYPE_MONITOR)
-+		add_common_files(sdata);
-+
- 	switch (sdata->vif.type) {
- 	case NL80211_IFTYPE_MESH_POINT:
- #ifdef CONFIG_MAC80211_MESH
-@@ -609,12 +570,6 @@ static void add_files(struct ieee80211_s
- 	case NL80211_IFTYPE_WDS:
- 		add_wds_files(sdata);
- 		break;
--	case NL80211_IFTYPE_MONITOR:
--		add_monitor_files(sdata);
--		break;
--	case NL80211_IFTYPE_AP_VLAN:
--		add_vlan_files(sdata);
--		break;
- 	default:
- 		break;
- 	}
diff --git a/package/mac80211/patches/565-mac80211_optimize_aggregation_timeout.patch b/package/mac80211/patches/565-mac80211_optimize_aggregation_timeout.patch
deleted file mode 100644
index 81ae82c2e..000000000
--- a/package/mac80211/patches/565-mac80211_optimize_aggregation_timeout.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- a/net/mac80211/sta_info.h
-+++ b/net/mac80211/sta_info.h
-@@ -99,6 +99,7 @@ enum ieee80211_sta_info_flags {
-  * @dialog_token: dialog token for aggregation session
-  * @timeout: session timeout value to be filled in ADDBA requests
-  * @state: session state (see above)
-+ * @last_tx: jiffies of last tx activity
-  * @stop_initiator: initiator of a session stop
-  * @tx_stop: TX DelBA frame when stopping
-  * @buf_size: reorder buffer size at receiver
-@@ -120,6 +121,7 @@ struct tid_ampdu_tx {
- 	struct timer_list addba_resp_timer;
- 	struct sk_buff_head pending;
- 	unsigned long state;
-+	unsigned long last_tx;
- 	u16 timeout;
- 	u8 dialog_token;
- 	u8 stop_initiator;
-@@ -137,6 +139,7 @@ struct tid_ampdu_tx {
-  * @reorder_time: jiffies when skb was added
-  * @session_timer: check if peer keeps Tx-ing on the TID (by timeout value)
-  * @reorder_timer: releases expired frames from the reorder buffer.
-+ * @last_rx: jiffies of last rx activity
-  * @head_seq_num: head sequence number in reordering buffer.
-  * @stored_mpdu_num: number of MPDUs in reordering buffer
-  * @ssn: Starting Sequence Number expected to be aggregated.
-@@ -161,6 +164,7 @@ struct tid_ampdu_rx {
- 	unsigned long *reorder_time;
- 	struct timer_list session_timer;
- 	struct timer_list reorder_timer;
-+	unsigned long last_rx;
- 	u16 head_seq_num;
- 	u16 stored_mpdu_num;
- 	u16 ssn;
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -1120,8 +1120,7 @@ static bool ieee80211_tx_prep_agg(struct
- 
- 	/* reset session timer */
- 	if (reset_agg_timer && tid_tx->timeout)
--		mod_timer(&tid_tx->session_timer,
--			  TU_TO_EXP_TIME(tid_tx->timeout));
-+		tid_tx->last_tx = jiffies;
- 
- 	return queued;
- }
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -52,7 +52,8 @@ struct ieee80211_local;
-  * increased memory use (about 2 kB of RAM per entry). */
- #define IEEE80211_FRAGMENT_MAX 4
- 
--#define TU_TO_EXP_TIME(x)	(jiffies + usecs_to_jiffies((x) * 1024))
-+#define TU_TO_JIFFIES(x)	(usecs_to_jiffies((x) * 1024))
-+#define TU_TO_EXP_TIME(x)	(jiffies + TU_TO_JIFFIES(x))
- 
- #define IEEE80211_DEFAULT_UAPSD_QUEUES \
- 	(IEEE80211_WMM_IE_STA_QOSINFO_AC_BK |	\
---- a/net/mac80211/agg-tx.c
-+++ b/net/mac80211/agg-tx.c
-@@ -436,6 +436,18 @@ static void sta_tx_agg_session_timer_exp
- 	u8 *timer_to_id = ptid - *ptid;
- 	struct sta_info *sta = container_of(timer_to_id, struct sta_info,
- 					 timer_to_tid[0]);
-+	struct tid_ampdu_tx *tid_tx;
-+	unsigned long timeout;
-+
-+	tid_tx = rcu_dereference_protected_tid_tx(sta, *ptid);
-+	if (!tid_tx)
-+		return;
-+
-+	timeout = tid_tx->last_tx + TU_TO_JIFFIES(tid_tx->timeout);
-+	if (time_is_after_jiffies(timeout)) {
-+		mod_timer(&tid_tx->session_timer, timeout);
-+		return;
-+	}
- 
- #ifdef CONFIG_MAC80211_HT_DEBUG
- 	printk(KERN_DEBUG "tx session timer expired on tid %d\n", (u16)*ptid);
-@@ -908,9 +920,11 @@ void ieee80211_process_addba_resp(struct
- 
- 		sta->ampdu_mlme.addba_req_num[tid] = 0;
- 
--		if (tid_tx->timeout)
-+		if (tid_tx->timeout) {
- 			mod_timer(&tid_tx->session_timer,
- 				  TU_TO_EXP_TIME(tid_tx->timeout));
-+			tid_tx->last_tx = jiffies;
-+		}
- 
- 	} else {
- 		___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR,
---- a/net/mac80211/agg-rx.c
-+++ b/net/mac80211/agg-rx.c
-@@ -141,6 +141,18 @@ static void sta_rx_agg_session_timer_exp
- 	u8 *timer_to_id = ptid - *ptid;
- 	struct sta_info *sta = container_of(timer_to_id, struct sta_info,
- 					 timer_to_tid[0]);
-+	struct tid_ampdu_rx *tid_rx;
-+	unsigned long timeout;
-+
-+	tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[*ptid]);
-+	if (!tid_rx)
-+		return;
-+
-+	timeout = tid_rx->last_rx + TU_TO_JIFFIES(tid_rx->timeout);
-+	if (time_is_after_jiffies(timeout)) {
-+		mod_timer(&tid_rx->session_timer, timeout);
-+		return;
-+	}
- 
- #ifdef CONFIG_MAC80211_HT_DEBUG
- 	printk(KERN_DEBUG "rx session timer expired on tid %d\n", (u16)*ptid);
-@@ -336,8 +348,10 @@ void ieee80211_process_addba_request(str
- 	/* activate it for RX */
- 	rcu_assign_pointer(sta->ampdu_mlme.tid_rx[tid], tid_agg_rx);
- 
--	if (timeout)
-+	if (timeout) {
- 		mod_timer(&tid_agg_rx->session_timer, TU_TO_EXP_TIME(timeout));
-+		tid_agg_rx->last_rx = jiffies;
-+	}
- 
- end:
- 	mutex_unlock(&sta->ampdu_mlme.mtx);
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -793,8 +793,7 @@ static void ieee80211_rx_reorder_ampdu(s
- 
- 	/* reset session timer */
- 	if (tid_agg_rx->timeout)
--		mod_timer(&tid_agg_rx->session_timer,
--			  TU_TO_EXP_TIME(tid_agg_rx->timeout));
-+		tid_agg_rx->last_rx = jiffies;
- 
- 	/* if this mpdu is fragmented - terminate rx aggregation session */
- 	sc = le16_to_cpu(hdr->seq_ctrl);
diff --git a/package/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch b/package/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
index 7f8c9a59b..6c80c3dfa 100644
--- a/package/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
+++ b/package/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
@@ -25,7 +25,7 @@
 @@ -39,6 +39,7 @@
  #include <linux/input-polldev.h>
  #include <linux/kfifo.h>
- #include <linux/timer.h>
+ #include <linux/hrtimer.h>
 +#include <linux/rt2x00_platform.h>
  
  #include <net/mac80211.h>
diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
index e40d3a934..a7a0b6f5b 100644
--- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
+++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
@@ -109,7 +109,7 @@
  
  	/*
  	 * Device initialization/deinitialization handlers.
-@@ -713,6 +714,7 @@ enum rt2x00_capability_flags {
+@@ -721,6 +722,7 @@ enum rt2x00_capability_flags {
  	REQUIRE_SW_SEQNO,
  	REQUIRE_HT_TX_DESC,
  	REQUIRE_PS_AUTOWAKE,
@@ -117,7 +117,7 @@
  
  	/*
  	 * Capabilities
-@@ -968,6 +970,11 @@ struct rt2x00_dev {
+@@ -976,6 +978,11 @@ struct rt2x00_dev {
  	const struct firmware *fw;
  
  	/*
@@ -229,7 +229,7 @@
   * Initialization functions.
   */
  static bool rt2800pci_get_entry_state(struct queue_entry *entry)
-@@ -1052,6 +1056,7 @@ static const struct rt2x00lib_ops rt2800
+@@ -1082,6 +1086,7 @@ static const struct rt2x00lib_ops rt2800
  	.get_firmware_name	= rt2800pci_get_firmware_name,
  	.check_firmware		= rt2800_check_firmware,
  	.load_firmware		= rt2800_load_firmware,
@@ -239,7 +239,7 @@
  	.get_entry_state	= rt2800pci_get_entry_state,
 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -1165,6 +1165,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+@@ -1160,6 +1160,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
  		    BIT(NL80211_IFTYPE_MESH_POINT) |
  		    BIT(NL80211_IFTYPE_WDS);
  
@@ -250,7 +250,7 @@
  	/*
  	 * Initialize work.
  	 */
-@@ -1288,6 +1292,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+@@ -1284,6 +1288,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
  	 */
  	if (rt2x00dev->drv_data)
  		kfree(rt2x00dev->drv_data);
diff --git a/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch b/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch
index 5a373a7a7..aaf0a5ab3 100644
--- a/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch
+++ b/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch
@@ -1,10 +1,10 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -618,6 +618,7 @@ CONFIG_RT2X00=y
- CONFIG_RT2X00_LIB=m
- CONFIG_RT2800_LIB=m
- CONFIG_RT2X00_LIB_FIRMWARE=y
-+CONFIG_RT2X00_LIB_EEPROM=y
- CONFIG_RT2X00_LIB_CRYPTO=y
+@@ -614,6 +614,7 @@ export CONFIG_RT2X00=y
+ export CONFIG_RT2X00_LIB=m
+ export CONFIG_RT2800_LIB=m
+ export CONFIG_RT2X00_LIB_FIRMWARE=y
++export CONFIG_RT2X00_LIB_EEPROM=y
+ export CONFIG_RT2X00_LIB_CRYPTO=y
  # CONFIG_RT2X00_LIB_SOC=y
  ifdef CONFIG_COMPAT_KERNEL_2_6_25
diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
index 088d47409..4630ae57b 100644
--- a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@ -9,7 +9,7 @@
  {
  	memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
  }
-@@ -938,8 +938,9 @@ static int rt2800pci_validate_eeprom(str
+@@ -968,8 +968,9 @@ static int rt2800pci_validate_eeprom(str
  	/*
  	 * Read EEPROM into buffer
  	 */
diff --git a/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch b/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch
index 776d44e79..6fe763647 100644
--- a/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch
+++ b/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwl8k.c
 +++ b/drivers/net/wireless/mwl8k.c
-@@ -5297,6 +5297,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw")
+@@ -5296,6 +5296,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw")
  MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API));
  
  static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
diff --git a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
index f3c278ee2..f746cc9e1 100644
--- a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
+++ b/package/mac80211/patches/800-b43-gpio-mask-module-option.patch
@@ -22,7 +22,7 @@
  static int modparam_bad_frames_preempt;
  module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
  MODULE_PARM_DESC(bad_frames_preempt,
-@@ -2674,10 +2679,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2689,10 +2694,10 @@ static int b43_gpio_init(struct b43_wlde
  	u32 mask, set;
  
  	b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
diff --git a/package/mac80211/patches/805-fix_gpio_bcm5354.patch b/package/mac80211/patches/805-fix_gpio_bcm5354.patch
deleted file mode 100644
index a3cf0d098..000000000
--- a/package/mac80211/patches/805-fix_gpio_bcm5354.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -2687,6 +2687,8 @@ static int b43_gpio_init(struct b43_wlde
- 		mask |= 0x0060;
- 		set |= 0x0060;
- 	}
-+	if (dev->dev->chip_id == 0x5354)
-+		set &= 0xff02;
- 	if (0 /* FIXME: conditional unknown */ ) {
- 		b43_write16(dev, B43_MMIO_GPIO_MASK,
- 			    b43_read16(dev, B43_MMIO_GPIO_MASK)
diff --git a/package/mac80211/patches/820-b43-add-antenna-control.patch b/package/mac80211/patches/820-b43-add-antenna-control.patch
index 7b08ded56..82908ab0c 100644
--- a/package/mac80211/patches/820-b43-add-antenna-control.patch
+++ b/package/mac80211/patches/820-b43-add-antenna-control.patch
@@ -9,7 +9,7 @@
  	antenna = b43_antenna_to_phyctl(antenna);
  	ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
  	/* We can't send beacons with short preamble. Would get PHY errors. */
-@@ -3033,8 +3033,8 @@ static int b43_chip_init(struct b43_wlde
+@@ -3045,8 +3045,8 @@ static int b43_chip_init(struct b43_wlde
  
  	/* Select the antennae */
  	if (phy->ops->set_rx_antenna)
@@ -20,7 +20,7 @@
  
  	if (phy->type == B43_PHYTYPE_B) {
  		value16 = b43_read16(dev, 0x005E);
-@@ -3777,7 +3777,6 @@ static int b43_op_config(struct ieee8021
+@@ -3789,7 +3789,6 @@ static int b43_op_config(struct ieee8021
  	struct b43_wldev *dev;
  	struct b43_phy *phy;
  	struct ieee80211_conf *conf = &hw->conf;
@@ -28,7 +28,7 @@
  	int err = 0;
  	bool reload_bss = false;
  
-@@ -3831,11 +3830,9 @@ static int b43_op_config(struct ieee8021
+@@ -3843,11 +3842,9 @@ static int b43_op_config(struct ieee8021
  	}
  
  	/* Antennas for RX and management frame TX. */
@@ -42,7 +42,7 @@
  
  	if (wl->radio_enabled != phy->radio_on) {
  		if (wl->radio_enabled) {
-@@ -4907,6 +4904,47 @@ static int b43_op_get_survey(struct ieee
+@@ -4934,6 +4931,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,
-@@ -4928,6 +4966,8 @@ static const struct ieee80211_ops b43_hw
+@@ -4955,6 +4993,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.
-@@ -5174,6 +5214,8 @@ static int b43_one_core_attach(struct b4
+@@ -5201,6 +5241,8 @@ static int b43_one_core_attach(struct b4
  	if (!wldev)
  		goto out;
  
@@ -108,9 +108,9 @@
  	wldev->use_pio = b43_modparam_pio;
  	wldev->dev = dev;
  	wldev->wl = wl;
-@@ -5262,6 +5304,9 @@ static struct b43_wl *b43_wireless_init(
- 		BIT(NL80211_IFTYPE_WDS) |
- 		BIT(NL80211_IFTYPE_ADHOC);
+@@ -5291,6 +5333,9 @@ static struct b43_wl *b43_wireless_init(
+ 
+ 	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
  
 +	hw->wiphy->available_antennas_rx = 0x3;
 +	hw->wiphy->available_antennas_tx = 0x3;
diff --git a/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
index 657329b35..287be2542 100644
--- a/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
+++ b/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
@@ -19,7 +19,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -1044,6 +1044,32 @@ static inline bool b43_using_pio_transfe
+@@ -1047,6 +1047,32 @@ static inline bool b43_using_pio_transfe
  	return dev->__using_pio_transfers;
  }
  
diff --git a/package/mac80211/patches/890-b43legay-antenna-gain.patch b/package/mac80211/patches/890-b43legay-antenna-gain.patch
deleted file mode 100644
index 9c1510a0c..000000000
--- a/package/mac80211/patches/890-b43legay-antenna-gain.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/b43legacy/phy.c
-+++ b/drivers/net/wireless/b43legacy/phy.c
-@@ -1860,7 +1860,7 @@ void b43legacy_phy_xmitpower(struct b43l
- 	 * which accounts for the factor of 4 */
- #define REG_MAX_PWR 20
- 	max_pwr = min(REG_MAX_PWR * 4
--		      - dev->dev->bus->sprom.antenna_gain.ghz24.a0
-+		      - dev->dev->bus->sprom.antenna_gain.a0
- 		      - 0x6, max_pwr);
- 
- 	/* find the desired power in Q5.2 - power_level is in dBm
author	nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2012-04-16 21:08:41 +0000
committer	nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2012-04-16 21:08:41 +0000
commit	691b253e47367f64097023ba2afcc595ca120786 (patch)
tree	f3d4a3ace1fce602fa8b9fb1e3c84e817c712d49 /package
parent	c9641b552eb8ecccb7b0e31a0f7bac250a930e25 (diff)