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

SVN-Revision: 31322

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= \

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/
  

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
  

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

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
  

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

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
  

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
  
  

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

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),)

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

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

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
  

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

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

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
  

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

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

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

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();
  

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 */
  

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

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>

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;
  

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) {

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. */

package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch

@@ -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;

package/mac80211/patches/402-ath9k_blink_default.patch → 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");
  

package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch → 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;
  	}

package/mac80211/patches/404-ath_regd_optional.patch → 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;
  

package/mac80211/patches/405-world_regd_fixup.patch → 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
  

package/mac80211/patches/406-regd_no_assoc_hints.patch → 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)
  {

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) },
+ };
+ 

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) },
+ };
+ 

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

package/mac80211/patches/430-ath5k_disable_fast_cc.patch → 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))

package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch → 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;
  

package/mac80211/patches/460-ath5k-add-pciids.patch → 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 */

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);
  

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;

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();

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) {

package/mac80211/patches/511-ath9k_increase_bcbuf.patch

@@ -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;

package/mac80211/patches/512-ath9k_reduce_rxbuf.patch → 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 */
  /***********/
  

package/mac80211/patches/513-ath9k_channelbw_debugfs.patch → 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) &&

package/mac80211/patches/521-mac80211_reduce_txqueuelen.patch → 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);

package/mac80211/patches/530-mac80211_cur_txpower.patch → 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;

package/mac80211/patches/520-mac80211_ht_change_rate_update.patch

@@ -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:

package/mac80211/patches/531-ath9k_cur_txpower.patch → 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);

package/mac80211/patches/550-ath9k_per_chain_signal_strength.patch → 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);
+ 

package/mac80211/patches/540-ath9k_limit_qlen.patch → 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;
  	}
  

package/mac80211/patches/543-ath9k_fix_initvals.patch → 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   */

package/mac80211/patches/551-ath9k_extra_leds.patch → 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
  

package/mac80211/patches/541-ath9k_fix_half_quarter_rx_latency.patch

@@ -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;

package/mac80211/patches/542-ath9k_fix_half_quarter_sifs.patch

@@ -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;

package/mac80211/patches/563-mac80211_optimize_mcs_rate_mask.patch → 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;

package/mac80211/patches/560-ath9k_optimize_hw_check.patch

@@ -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

package/mac80211/patches/562-mac80211_remove_code_duplication.patch

@@ -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;
- 	}

package/mac80211/patches/565-mac80211_optimize_aggregation_timeout.patch

@@ -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);

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>

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);

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

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
  	 */

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) = {

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);

package/mac80211/patches/805-fix_gpio_bcm5354.patch

@@ -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)

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;

package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch

@@ -19,7 +19,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
 
 --- 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;
  }
  

package/mac80211/patches/890-b43legay-antenna-gain.patch

@@ -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