mac80211: update to 2012-09-07, adds ath9k beacon fixes, mesh/adhoc fixes, and more
authorFelix Fietkau <nbd@openwrt.org>
Sat, 8 Sep 2012 11:10:54 +0000 (11:10 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 8 Sep 2012 11:10:54 +0000 (11:10 +0000)
SVN-Revision: 33331

54 files changed:
package/mac80211/Makefile
package/mac80211/patches/001-disable_b44.patch
package/mac80211/patches/002-disable_rfkill.patch
package/mac80211/patches/003-disable_bt.patch
package/mac80211/patches/005-disable_ssb_build.patch
package/mac80211/patches/006-disable_bcma_build.patch
package/mac80211/patches/007-remove_misc_drivers.patch
package/mac80211/patches/008-disable_mesh.patch
package/mac80211/patches/009-remove_mac80211_module_dependence.patch
package/mac80211/patches/010-no_pcmcia.patch
package/mac80211/patches/011-no_sdio.patch
package/mac80211/patches/013-disable_b43_nphy.patch
package/mac80211/patches/015-remove-rt2x00-options.patch
package/mac80211/patches/016-remove_pid_algo.patch
package/mac80211/patches/017-remove_ath9k_rc.patch
package/mac80211/patches/019-remove_ath5k_pci_option.patch
package/mac80211/patches/022-remove_crc8_and_cordic.patch
package/mac80211/patches/023-ath9k_disable_btcoex.patch
package/mac80211/patches/050-compat_firmware.patch
package/mac80211/patches/060-compat_add_module_pci_driver.patch
package/mac80211/patches/070-disable_codel.patch
package/mac80211/patches/100-disable_pcmcia_compat.patch
package/mac80211/patches/110-disable_usb_compat.patch
package/mac80211/patches/120-pr_fmt_warnings.patch [deleted file]
package/mac80211/patches/130-mesh_pathtbl_backport.patch
package/mac80211/patches/300-pending_work.patch
package/mac80211/patches/405-regd_no_assoc_hints.patch
package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
package/mac80211/patches/412-mac80211_allow_adhoc_and_ap.patch
package/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
package/mac80211/patches/501-ath9k-eeprom_endianess.patch
package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
package/mac80211/patches/513-mac80211_reduce_txqueuelen.patch
package/mac80211/patches/520-mac80211_cur_txpower.patch
package/mac80211/patches/521-ath9k_cur_txpower.patch
package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
package/mac80211/patches/540-ath9k_extra_leds.patch
package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
package/mac80211/patches/562-ath9k_add_idle_hack.patch
package/mac80211/patches/564-ath9k_debugfs_diag.patch [new file with mode: 0644]
package/mac80211/patches/564-ath9k_remove_imr_mib.patch [deleted file]
package/mac80211/patches/570-mac80211_tx_status_crash.patch [deleted file]
package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
package/mac80211/patches/605-rt2x00-pci-eeprom.patch
package/mac80211/patches/608-add_platform_data_mac_addr.patch
package/mac80211/patches/620-rt2x00-support-rt3352.patch
package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch
package/mac80211/patches/800-b43-gpio-mask-module-option.patch
package/mac80211/patches/810-b43_no_pio.patch
package/mac80211/patches/820-b43-add-antenna-control.patch
package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
package/mac80211/patches/849-brcmsmac-add-device-found-on-some-SoCs-like-the-bcm4.patch
package/mac80211/patches/851-brcmsmac-start-adding-support-for-core-rev-28.patch

index 986fd93..4cf4340 100644 (file)
@@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2012-07-16
+PKG_VERSION:=2012-09-07
 PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
-PKG_MD5SUM:=8e41a935ad147631b78f99eda7187c1f
+PKG_MD5SUM:=59e0a114ee4b755a6e47cb6cd0f32ebc
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
index 2bcead9..389dac1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -376,8 +376,8 @@ export CONFIG_B43_BCMA_EXTRA=y
+@@ -377,8 +377,8 @@ export CONFIG_B43_BCMA_EXTRA=y
  
  export CONFIG_P54_PCI=m
  
index f977c96..685006b 100644 (file)
@@ -1,15 +1,15 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -77,7 +77,7 @@ endif # build check
+@@ -78,7 +78,7 @@ endif # build check
  endif # kernel Makefile check
  
- # These both are needed by compat-wireless || compat-bluetooth so enable them
+ # These both are needed by 802.11 and bluetooth so enable
 - 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")
-@@ -688,10 +688,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
+@@ -690,10 +690,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
index 499c823..b56ccbd 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -99,9 +99,9 @@ ifndef CONFIG_COMPAT_KERNEL_2_6_27
+@@ -100,9 +100,9 @@ ifndef CONFIG_COMPAT_KERNEL_2_6_27
  ifeq ($(CONFIG_BT),y)
  # we'll ignore compiling bluetooth
  else
index 4bf9797..d42a612 100644 (file)
@@ -19,7 +19,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -352,7 +352,8 @@ export CONFIG_IPW2200_QOS=y
+@@ -353,7 +353,8 @@ export CONFIG_IPW2200_QOS=y
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  endif #CONFIG_WIRELESS_EXT
  
@@ -29,7 +29,7 @@
  # Sonics Silicon Backplane
  export CONFIG_SSB_SPROM=y
  
-@@ -365,7 +366,7 @@ endif #CONFIG_PCMCIA
+@@ -366,7 +367,7 @@ endif #CONFIG_PCMCIA
  # export CONFIG_SSB_DEBUG=y
  export CONFIG_SSB_DRIVER_PCICORE=y
  export CONFIG_B43_SSB=y
@@ -38,7 +38,7 @@
  
  export CONFIG_BCMA=m
  export CONFIG_BCMA_BLOCKIO=y
-@@ -582,7 +583,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+@@ -580,7 +581,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  
  ifdef CONFIG_MMC
  
index 1b53070..da11ad4 100644 (file)
@@ -10,7 +10,7 @@
  ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
 --- a/config.mk
 +++ b/config.mk
-@@ -368,12 +368,12 @@ export CONFIG_SSB_DRIVER_PCICORE=y
+@@ -369,12 +369,12 @@ export CONFIG_SSB_DRIVER_PCICORE=y
  export CONFIG_B43_SSB=y
  endif #__CONFIG_SSB
  
index d22bee4..9e7f651 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -240,7 +240,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+@@ -241,7 +241,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
  endif #CONFIG_WIRELESS_EXT
  
  ifdef CONFIG_STAGING
@@ -9,7 +9,7 @@
  endif #CONFIG_STAGING
  
  # mac80211 test driver
-@@ -405,15 +405,15 @@ endif #CONFIG_CRC_ITU_T
+@@ -406,12 +406,12 @@ endif #CONFIG_CRC_ITU_T
  export CONFIG_MWL8K=m
  
  # Ethernet drivers go here
 +# export CONFIG_ATL1=m
 +# export CONFIG_ATL2=m
 +# export CONFIG_ATL1E=m
- ifdef CONFIG_COMPAT_KERNEL_2_6_28
+ ifndef CONFIG_COMPAT_KERNEL_2_6_28
 -export CONFIG_ATL1C=m
--export CONFIG_ALX=n
-+# export CONFIG_ATL1C=m
-+# export CONFIG_ALX=n
- else #CONFIG_COMPAT_KERNEL_2_6_28
--export CONFIG_ATL1C=n
 -export CONFIG_ALX=m
-+# export CONFIG_ATL1C=n
++# export CONFIG_ATL1C=m
 +# export CONFIG_ALX=m
  endif #CONFIG_COMPAT_KERNEL_2_6_28
  
  ifdef CONFIG_WIRELESS_EXT
-@@ -474,21 +474,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
+@@ -472,21 +472,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
index 2f2cea8..d5a0ac8 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -176,7 +176,7 @@ export CONFIG_MAC80211_LEDS=y
+@@ -177,7 +177,7 @@ export CONFIG_MAC80211_LEDS=y
  endif #CONFIG_LEDS_TRIGGERS
  
  # enable mesh networking too
index e442c5e..2bc46c4 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -53,7 +53,7 @@ endif
+@@ -54,7 +54,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),)
index 6bde2d9..af6a754 100644 (file)
@@ -9,7 +9,7 @@
  # export CONFIG_SSB=m
  else
  include $(KLIB_BUILD)/.config
-@@ -303,7 +303,7 @@ export CONFIG_B43=m
+@@ -304,7 +304,7 @@ export CONFIG_B43=m
  export CONFIG_B43_HWRNG=y
  export CONFIG_B43_PCI_AUTOSELECT=y
  ifdef CONFIG_PCMCIA
index 19df10b..4d364e0 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -584,7 +584,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+@@ -582,7 +582,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  ifdef CONFIG_MMC
  
  # export CONFIG_SSB_SDIOHOST=y
index b959804..ba37bad 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -309,8 +309,8 @@ ifdef CONFIG_MAC80211_LEDS
+@@ -310,8 +310,8 @@ ifdef CONFIG_MAC80211_LEDS
  export CONFIG_B43_LEDS=y
  endif #CONFIG_MAC80211_LEDS
  export CONFIG_B43_PHY_LP=y
index 3762f73..66c0d67 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -384,7 +384,7 @@ export CONFIG_RTL8180=m
+@@ -385,7 +385,7 @@ export CONFIG_RTL8180=m
  
  export CONFIG_ADM8211=m
  
@@ -9,7 +9,7 @@
  export CONFIG_RT2400PCI=m
  export CONFIG_RT2500PCI=m
  ifdef CONFIG_CRC_CCITT
-@@ -530,7 +530,7 @@ export CONFIG_RT2800USB_RT35XX=y
+@@ -528,7 +528,7 @@ export CONFIG_RT2800USB_RT35XX=y
  export CONFIG_RT2800USB_RT53XX=y
  export CONFIG_RT2800USB_UNKNOWN=y
  endif #CONFIG_CRC_CCITT
index 19bbb2a..7180a63 100644 (file)
@@ -1,7 +1,7 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -168,7 +168,7 @@ export CONFIG_MAC80211_RC_DEFAULT_MINSTR
- # This is the one used by our compat-wireless net/mac80211/rate.c
+@@ -169,7 +169,7 @@ export CONFIG_MAC80211_RC_DEFAULT_MINSTR
+ # This is the one used by our compat-drivers net/mac80211/rate.c
  # in case you have and old kernel which is overriding this to pid.
  export CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
 -export CONFIG_MAC80211_RC_PID=y
index 933aec5..99b5209 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -264,7 +264,7 @@ export CONFIG_ATH9K_COMMON=m
+@@ -265,7 +265,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.
index 0dd905c..d0149d3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -281,7 +281,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
+@@ -282,7 +282,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
  # PCI Drivers
  ifdef CONFIG_PCI
  
index 86bbfe6..13ad2c8 100644 (file)
@@ -1,8 +1,8 @@
 --- a/compat/Makefile
 +++ b/compat/Makefile
-@@ -44,8 +44,6 @@ compat-$(CONFIG_COMPAT_KERNEL_3_3) += \
-       flow_dissector.o
+@@ -47,8 +47,6 @@ compat-$(CONFIG_COMPAT_KERNEL_3_3) += \
  compat-$(CONFIG_COMPAT_KERNEL_3_4) += compat-3.4.o
+ compat-$(CONFIG_COMPAT_KERNEL_3_7) += compat-3.7.o
  
 -compat-$(CONFIG_COMPAT_CORDIC) += cordic.o
 -compat-$(CONFIG_COMPAT_CRC8) += crc8.o
index 900f030..37ae2d5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -266,7 +266,7 @@ export CONFIG_ATH9K_COMMON=m
+@@ -267,7 +267,7 @@ export CONFIG_ATH9K_COMMON=m
  # for long range considerations.
  # export CONFIG_COMPAT_ATH9K_RATE_CONTROL=y
  
index 602e82d..e4b91a3 100644 (file)
@@ -10,8 +10,8 @@
 +endif
 +
  obj-$(CONFIG_COMPAT_NET_SCH_CODEL) += sch_codel.o
- obj-$(CONFIG_COMPAT_NET_SCH_FQ_CODEL) += sch_fq_codel.o
  
+ sch_fq_codel-y = sch_fq_codel_core.o flow_dissector.o
 --- a/compat/compat_firmware_class.c
 +++ b/compat/compat_firmware_class.c
 @@ -741,19 +741,16 @@ compat_request_firmware_nowait(
index 8a35d4e..277ca3d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/linux/compat-3.4.h
 +++ b/include/linux/compat-3.4.h
-@@ -81,6 +81,19 @@ static inline void eth_hw_addr_random(st
+@@ -112,6 +112,19 @@ static inline void eth_hw_addr_random(st
        module_driver(__pci_driver, pci_register_driver, \
                       pci_unregister_driver)
  
index 1ec7409..0d6d749 100644 (file)
@@ -1,8 +1,8 @@
 --- a/compat/scripts/gen-compat-config.sh
 +++ b/compat/scripts/gen-compat-config.sh
-@@ -62,16 +62,3 @@ fi
- if [[ ${CONFIG_COMPAT_KERNEL_2_6_36} = "y" ]]; then
-       echo "export CONFIG_COMPAT_KFIFO=y"
+@@ -66,16 +66,3 @@ if [[ ${CONFIG_COMPAT_KERNEL_2_6_36} = "
+               echo "export CONFIG_COMPAT_KFIFO=y"
+       fi
  fi
 -
 -if [[ ${CONFIG_COMPAT_KERNEL_3_5} = "y" ]]; then
index c038de9..6092755 100644 (file)
  struct pcmcia_cfg_mem {
 --- a/compat/compat-2.6.33.c
 +++ b/compat/compat-2.6.33.c
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
  #include <linux/compat.h>
- #include <linux/autoconf.h>
  
 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
 +#if 0
  
  /**
   * pccard_loop_tuple() - loop over tuples in the CIS
-@@ -73,7 +73,7 @@ next_entry:
+@@ -72,7 +72,7 @@ next_entry:
  EXPORT_SYMBOL_GPL(pccard_loop_tuple);
  /* Source: drivers/pcmcia/cistpl.c */
  
@@ -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
-@@ -48,7 +48,7 @@ typedef u32 phys_addr_t;
+@@ -49,7 +49,7 @@ typedef u32 phys_addr_t;
  })
  #endif /* From include/asm-generic/bug.h */
  
@@ -51,7 +51,7 @@
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cistpl.h>
  #include <pcmcia/ds.h>
-@@ -74,9 +74,9 @@ static inline struct sk_buff *netdev_all
+@@ -82,9 +82,9 @@ static inline struct sk_buff *netdev_all
        return skb;
  }
  
index 35f5814..d6287fd 100644 (file)
@@ -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
-@@ -73,7 +73,7 @@ int pcmcia_loop_config(struct pcmcia_dev
+@@ -74,7 +74,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,7 +33,7 @@
  #endif
 --- a/config.mk
 +++ b/config.mk
-@@ -512,7 +512,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
+@@ -510,7 +510,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.
diff --git a/package/mac80211/patches/120-pr_fmt_warnings.patch b/package/mac80211/patches/120-pr_fmt_warnings.patch
deleted file mode 100644 (file)
index 8014707..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
index bf6635a..fbe3e3a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/mac80211/mesh_pathtbl.c
 +++ b/net/mac80211/mesh_pathtbl.c
-@@ -817,7 +817,6 @@ static void table_flush_by_iface(struct 
+@@ -813,7 +813,6 @@ static void table_flush_by_iface(struct 
        struct hlist_node *p;
        int i;
  
index 5cdf05c..66f1abb 100644 (file)
---- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -210,8 +210,8 @@ ath5k_config(struct ieee80211_hw *hw, u3
-       }
-       if ((changed & IEEE80211_CONF_CHANGE_POWER) &&
--      (ah->power_level != conf->power_level)) {
--              ah->power_level = conf->power_level;
-+      (ah->ah_txpower.txp_requested != conf->power_level)) {
-+              ah->ah_txpower.txp_requested = conf->power_level;
-               /* Half dB steps */
-               ath5k_hw_set_txpower_limit(ah, (conf->power_level * 2));
-@@ -622,7 +622,7 @@ ath5k_conf_tx(struct ieee80211_hw *hw, s
-       qi.tqi_aifs = params->aifs;
-       qi.tqi_cw_min = params->cw_min;
-       qi.tqi_cw_max = params->cw_max;
--      qi.tqi_burst_time = params->txop;
-+      qi.tqi_burst_time = params->txop * 32;
-       ATH5K_DBG(ah, ATH5K_DEBUG_ANY,
-                 "Configure tx [queue %d],  "
---- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-@@ -26,106 +26,74 @@
- static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
- {
-       if (AR_SREV_9271(ah)) {
--              INIT_INI_ARRAY(&ah->iniModes, ar9271Modes_9271,
--                             ARRAY_SIZE(ar9271Modes_9271), 5);
--              INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271,
--                             ARRAY_SIZE(ar9271Common_9271), 2);
--              INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg,
--                             ARRAY_SIZE(ar9271Modes_9271_ANI_reg), 5);
-+              INIT_INI_ARRAY(&ah->iniModes, ar9271Modes_9271);
-+              INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271);
-+              INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg);
-               return;
-       }
-       if (ah->config.pcie_clock_req)
-               INIT_INI_ARRAY(&ah->iniPcieSerdes,
--                         ar9280PciePhy_clkreq_off_L1_9280,
--                         ARRAY_SIZE(ar9280PciePhy_clkreq_off_L1_9280), 2);
-+                         ar9280PciePhy_clkreq_off_L1_9280);
-       else
-               INIT_INI_ARRAY(&ah->iniPcieSerdes,
--                         ar9280PciePhy_clkreq_always_on_L1_9280,
--                         ARRAY_SIZE(ar9280PciePhy_clkreq_always_on_L1_9280), 2);
-+                         ar9280PciePhy_clkreq_always_on_L1_9280);
- #ifdef CONFIG_PM_SLEEP
-               INIT_INI_ARRAY(&ah->iniPcieSerdesWow,
--                             ar9280PciePhy_awow,
--                             ARRAY_SIZE(ar9280PciePhy_awow), 2);
-+                             ar9280PciePhy_awow);
- #endif
-       if (AR_SREV_9287_11_OR_LATER(ah)) {
--              INIT_INI_ARRAY(&ah->iniModes, ar9287Modes_9287_1_1,
--                              ARRAY_SIZE(ar9287Modes_9287_1_1), 5);
--              INIT_INI_ARRAY(&ah->iniCommon, ar9287Common_9287_1_1,
--                              ARRAY_SIZE(ar9287Common_9287_1_1), 2);
-+              INIT_INI_ARRAY(&ah->iniModes, ar9287Modes_9287_1_1);
-+              INIT_INI_ARRAY(&ah->iniCommon, ar9287Common_9287_1_1);
-       } else if (AR_SREV_9285_12_OR_LATER(ah)) {
--              INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285_1_2,
--                             ARRAY_SIZE(ar9285Modes_9285_1_2), 5);
--              INIT_INI_ARRAY(&ah->iniCommon, ar9285Common_9285_1_2,
--                             ARRAY_SIZE(ar9285Common_9285_1_2), 2);
-+              INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285_1_2);
-+              INIT_INI_ARRAY(&ah->iniCommon, ar9285Common_9285_1_2);
-       } else if (AR_SREV_9280_20_OR_LATER(ah)) {
--              INIT_INI_ARRAY(&ah->iniModes, ar9280Modes_9280_2,
--                             ARRAY_SIZE(ar9280Modes_9280_2), 5);
--              INIT_INI_ARRAY(&ah->iniCommon, ar9280Common_9280_2,
--                             ARRAY_SIZE(ar9280Common_9280_2), 2);
-+              INIT_INI_ARRAY(&ah->iniModes, ar9280Modes_9280_2);
-+              INIT_INI_ARRAY(&ah->iniCommon, ar9280Common_9280_2);
-               INIT_INI_ARRAY(&ah->iniModesFastClock,
--                             ar9280Modes_fast_clock_9280_2,
--                             ARRAY_SIZE(ar9280Modes_fast_clock_9280_2), 3);
-+                             ar9280Modes_fast_clock_9280_2);
-       } else if (AR_SREV_9160_10_OR_LATER(ah)) {
--              INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9160,
--                             ARRAY_SIZE(ar5416Modes_9160), 5);
--              INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9160,
--                             ARRAY_SIZE(ar5416Common_9160), 2);
-+              INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9160);
-+              INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9160);
-               if (AR_SREV_9160_11(ah)) {
-                       INIT_INI_ARRAY(&ah->iniAddac,
--                                     ar5416Addac_9160_1_1,
--                                     ARRAY_SIZE(ar5416Addac_9160_1_1), 2);
-+                                     ar5416Addac_9160_1_1);
-               } else {
--                      INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160,
--                                     ARRAY_SIZE(ar5416Addac_9160), 2);
-+                      INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160);
-               }
-       } else if (AR_SREV_9100_OR_LATER(ah)) {
--              INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9100,
--                             ARRAY_SIZE(ar5416Modes_9100), 5);
--              INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100,
--                             ARRAY_SIZE(ar5416Common_9100), 2);
--              INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100,
--                             ARRAY_SIZE(ar5416Bank6_9100), 3);
--              INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100,
--                             ARRAY_SIZE(ar5416Addac_9100), 2);
-+              INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9100);
-+              INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100);
-+              INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100);
-+              INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100);
-       } else {
--              INIT_INI_ARRAY(&ah->iniModes, ar5416Modes,
--                             ARRAY_SIZE(ar5416Modes), 5);
--              INIT_INI_ARRAY(&ah->iniCommon, ar5416Common,
--                             ARRAY_SIZE(ar5416Common), 2);
--              INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC,
--                             ARRAY_SIZE(ar5416Bank6TPC), 3);
--              INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,
--                             ARRAY_SIZE(ar5416Addac), 2);
-+              INIT_INI_ARRAY(&ah->iniModes, ar5416Modes);
-+              INIT_INI_ARRAY(&ah->iniCommon, ar5416Common);
-+              INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC);
-+              INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac);
-       }
-       if (!AR_SREV_9280_20_OR_LATER(ah)) {
-               /* Common for AR5416, AR913x, AR9160 */
--              INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain,
--                             ARRAY_SIZE(ar5416BB_RfGain), 3);
-+              INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain);
--              INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0,
--                             ARRAY_SIZE(ar5416Bank0), 2);
--              INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1,
--                             ARRAY_SIZE(ar5416Bank1), 2);
--              INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2,
--                             ARRAY_SIZE(ar5416Bank2), 2);
--              INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3,
--                             ARRAY_SIZE(ar5416Bank3), 3);
--              INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7,
--                             ARRAY_SIZE(ar5416Bank7), 2);
-+              INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0);
-+              INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1);
-+              INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2);
-+              INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3);
-+              INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7);
-               /* Common for AR5416, AR9160 */
-               if (!AR_SREV_9100(ah))
--                      INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6,
--                                     ARRAY_SIZE(ar5416Bank6), 3);
-+                      INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6);
-               /* Common for AR913x, AR9160 */
-               if (!AR_SREV_5416(ah))
--                      INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC_9100,
--                                     ARRAY_SIZE(ar5416Bank6TPC_9100), 3);
-+                      INIT_INI_ARRAY(&ah->iniBank6TPC,
-+                                    ar5416Bank6TPC_9100);
-       }
-       /* iniAddac needs to be modified for these chips */
-@@ -148,13 +116,9 @@ static void ar9002_hw_init_mode_regs(str
-       }
-       if (AR_SREV_9287_11_OR_LATER(ah)) {
-               INIT_INI_ARRAY(&ah->iniCckfirNormal,
--                     ar9287Common_normal_cck_fir_coeff_9287_1_1,
--                     ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_9287_1_1),
--                     2);
-+                     ar9287Common_normal_cck_fir_coeff_9287_1_1);
-               INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
--                     ar9287Common_japan_2484_cck_fir_coeff_9287_1_1,
--                     ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_9287_1_1),
--                     2);
-+                     ar9287Common_japan_2484_cck_fir_coeff_9287_1_1);
-       }
- }
-@@ -168,20 +132,16 @@ static void ar9280_20_hw_init_rxgain_ini
-               if (rxgain_type == AR5416_EEP_RXGAIN_13DB_BACKOFF)
-                       INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9280Modes_backoff_13db_rxgain_9280_2,
--                      ARRAY_SIZE(ar9280Modes_backoff_13db_rxgain_9280_2), 5);
-+                                     ar9280Modes_backoff_13db_rxgain_9280_2);
-               else if (rxgain_type == AR5416_EEP_RXGAIN_23DB_BACKOFF)
-                       INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9280Modes_backoff_23db_rxgain_9280_2,
--                      ARRAY_SIZE(ar9280Modes_backoff_23db_rxgain_9280_2), 5);
-+                                     ar9280Modes_backoff_23db_rxgain_9280_2);
-               else
-                       INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9280Modes_original_rxgain_9280_2,
--                      ARRAY_SIZE(ar9280Modes_original_rxgain_9280_2), 5);
-+                                     ar9280Modes_original_rxgain_9280_2);
-       } else {
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9280Modes_original_rxgain_9280_2,
--                      ARRAY_SIZE(ar9280Modes_original_rxgain_9280_2), 5);
-+                             ar9280Modes_original_rxgain_9280_2);
-       }
- }
-@@ -191,16 +151,13 @@ static void ar9280_20_hw_init_txgain_ini
-           AR5416_EEP_MINOR_VER_19) {
-               if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER)
-                       INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9280Modes_high_power_tx_gain_9280_2,
--                      ARRAY_SIZE(ar9280Modes_high_power_tx_gain_9280_2), 5);
-+                                     ar9280Modes_high_power_tx_gain_9280_2);
-               else
-                       INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9280Modes_original_tx_gain_9280_2,
--                      ARRAY_SIZE(ar9280Modes_original_tx_gain_9280_2), 5);
-+                                     ar9280Modes_original_tx_gain_9280_2);
-       } else {
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--              ar9280Modes_original_tx_gain_9280_2,
--              ARRAY_SIZE(ar9280Modes_original_tx_gain_9280_2), 5);
-+                             ar9280Modes_original_tx_gain_9280_2);
-       }
- }
-@@ -208,12 +165,10 @@ static void ar9271_hw_init_txgain_ini(st
- {
-       if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER)
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                             ar9271Modes_high_power_tx_gain_9271,
--                             ARRAY_SIZE(ar9271Modes_high_power_tx_gain_9271), 5);
-+                             ar9271Modes_high_power_tx_gain_9271);
-       else
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                             ar9271Modes_normal_power_tx_gain_9271,
--                             ARRAY_SIZE(ar9271Modes_normal_power_tx_gain_9271), 5);
-+                             ar9271Modes_normal_power_tx_gain_9271);
- }
- static void ar9002_hw_init_mode_gain_regs(struct ath_hw *ah)
-@@ -222,8 +177,7 @@ static void ar9002_hw_init_mode_gain_reg
-       if (AR_SREV_9287_11_OR_LATER(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--              ar9287Modes_rx_gain_9287_1_1,
--              ARRAY_SIZE(ar9287Modes_rx_gain_9287_1_1), 5);
-+                             ar9287Modes_rx_gain_9287_1_1);
-       else if (AR_SREV_9280_20(ah))
-               ar9280_20_hw_init_rxgain_ini(ah);
-@@ -231,8 +185,7 @@ static void ar9002_hw_init_mode_gain_reg
-               ar9271_hw_init_txgain_ini(ah, txgain_type);
-       } else if (AR_SREV_9287_11_OR_LATER(ah)) {
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--              ar9287Modes_tx_gain_9287_1_1,
--              ARRAY_SIZE(ar9287Modes_tx_gain_9287_1_1), 5);
-+                             ar9287Modes_tx_gain_9287_1_1);
-       } else if (AR_SREV_9280_20(ah)) {
-               ar9280_20_hw_init_txgain_ini(ah, txgain_type);
-       } else if (AR_SREV_9285_12_OR_LATER(ah)) {
-@@ -240,26 +193,18 @@ static void ar9002_hw_init_mode_gain_reg
-               if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER) {
-                       if (AR_SREV_9285E_20(ah)) {
-                               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9285Modes_XE2_0_high_power,
--                              ARRAY_SIZE(
--                                ar9285Modes_XE2_0_high_power), 5);
-+                                             ar9285Modes_XE2_0_high_power);
-                       } else {
-                               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9285Modes_high_power_tx_gain_9285_1_2,
--                              ARRAY_SIZE(
--                                ar9285Modes_high_power_tx_gain_9285_1_2), 5);
-+                                      ar9285Modes_high_power_tx_gain_9285_1_2);
-                       }
-               } else {
-                       if (AR_SREV_9285E_20(ah)) {
-                               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9285Modes_XE2_0_normal_power,
--                              ARRAY_SIZE(
--                                ar9285Modes_XE2_0_normal_power), 5);
-+                                             ar9285Modes_XE2_0_normal_power);
-                       } else {
-                               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9285Modes_original_tx_gain_9285_1_2,
--                              ARRAY_SIZE(
--                                ar9285Modes_original_tx_gain_9285_1_2), 5);
-+                                      ar9285Modes_original_tx_gain_9285_1_2);
-                       }
-               }
-       }
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-@@ -131,8 +131,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0cf0e0e0),
-               .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-        },
-       .base_ext1 = {
-@@ -331,8 +332,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0c80c080),
-               .papdRateMaskHt40 = LE32(0x0080c080),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-        },
-       .base_ext2 = {
-@@ -704,8 +706,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0c80c080),
-               .papdRateMaskHt40 = LE32(0x0080c080),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-        },
-        .base_ext1 = {
-@@ -904,8 +907,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0cf0e0e0),
-               .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-        },
-       .base_ext2 = {
-@@ -1278,8 +1282,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0c80c080),
-               .papdRateMaskHt40 = LE32(0x0080c080),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-       },
-       .base_ext1 = {
-@@ -1478,8 +1483,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0cf0e0e0),
-               .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-       },
-       .base_ext2 = {
-@@ -1852,8 +1858,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0c80c080),
-               .papdRateMaskHt40 = LE32(0x0080c080),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-       },
-       .base_ext1 = {
-@@ -2052,8 +2059,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0cf0e0e0),
-               .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-       },
-       .base_ext2 = {
-@@ -2425,8 +2433,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0c80C080),
-               .papdRateMaskHt40 = LE32(0x0080C080),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-        },
-        .base_ext1 = {
-@@ -2625,8 +2634,9 @@ static const struct ar9300_eeprom ar9300
-               .thresh62 = 28,
-               .papdRateMaskHt20 = LE32(0x0cf0e0e0),
-               .papdRateMaskHt40 = LE32(0x6cf0e0e0),
-+              .xlna_bias_strength = 0,
-               .futureModal = {
--                      0, 0, 0, 0, 0, 0, 0, 0,
-+                      0, 0, 0, 0, 0, 0, 0,
-               },
-        },
-       .base_ext2 = {
-@@ -2971,14 +2981,6 @@ static u32 ath9k_hw_ar9300_get_eeprom(st
-               return (pBase->txrxMask >> 4) & 0xf;
-       case EEP_RX_MASK:
-               return pBase->txrxMask & 0xf;
--      case EEP_DRIVE_STRENGTH:
--#define AR9300_EEP_BASE_DRIV_STRENGTH 0x1
--              return pBase->miscConfiguration & AR9300_EEP_BASE_DRIV_STRENGTH;
--      case EEP_INTERNAL_REGULATOR:
--              /* Bit 4 is internal regulator flag */
--              return (pBase->featureEnable & 0x10) >> 4;
--      case EEP_SWREG:
--              return le32_to_cpu(pBase->swreg);
-       case EEP_PAPRD:
-               return !!(pBase->featureEnable & BIT(5));
-       case EEP_CHAIN_MASK_REDUCE:
-@@ -2989,8 +2991,6 @@ static u32 ath9k_hw_ar9300_get_eeprom(st
-               return eep->modalHeader5G.antennaGain;
-       case EEP_ANTENNA_GAIN_2G:
-               return eep->modalHeader2G.antennaGain;
--      case EEP_QUICK_DROP:
--              return pBase->miscConfiguration & BIT(1);
-       default:
-               return 0;
-       }
-@@ -3260,10 +3260,20 @@ static int ar9300_eeprom_restore_interna
-       int it;
-       u16 checksum, mchecksum;
-       struct ath_common *common = ath9k_hw_common(ah);
-+      struct ar9300_eeprom *eep;
-       eeprom_read_op read;
--      if (ath9k_hw_use_flash(ah))
--              return ar9300_eeprom_restore_flash(ah, mptr, mdata_size);
-+      if (ath9k_hw_use_flash(ah)) {
-+              u8 txrx;
-+
-+              ar9300_eeprom_restore_flash(ah, mptr, mdata_size);
-+
-+              /* check if eeprom contains valid data */
-+              eep = (struct ar9300_eeprom *) mptr;
-+              txrx = eep->baseEepHeader.txrxMask;
-+              if (txrx != 0 && txrx != 0xff)
-+                      return 0;
-+      }
-       word = kzalloc(2048, GFP_KERNEL);
-       if (!word)
-@@ -3493,19 +3503,20 @@ static int ath9k_hw_ar9300_get_eeprom_re
-       return 0;
- }
--static s32 ar9003_hw_xpa_bias_level_get(struct ath_hw *ah, bool is2ghz)
-+static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
-+                                                         bool is2ghz)
- {
-       struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-       if (is2ghz)
--              return eep->modalHeader2G.xpaBiasLvl;
-+              return &eep->modalHeader2G;
-       else
--              return eep->modalHeader5G.xpaBiasLvl;
-+              return &eep->modalHeader5G;
- }
- static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)
- {
--      int bias = ar9003_hw_xpa_bias_level_get(ah, is2ghz);
-+      int bias = ar9003_modal_header(ah, is2ghz)->xpaBiasLvl;
-       if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
-               REG_RMW_FIELD(ah, AR_CH0_TOP2, AR_CH0_TOP2_XPABIASLVL, bias);
-@@ -3521,57 +3532,26 @@ static void ar9003_hw_xpa_bias_level_app
-       }
- }
--static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is_2ghz)
-+static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is2ghz)
- {
--      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
--      __le16 val;
--
--      if (is_2ghz)
--              val = eep->modalHeader2G.switchcomspdt;
--      else
--              val = eep->modalHeader5G.switchcomspdt;
--      return le16_to_cpu(val);
-+      return le16_to_cpu(ar9003_modal_header(ah, is2ghz)->switchcomspdt);
- }
- static u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
- {
--      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
--      __le32 val;
--
--      if (is2ghz)
--              val = eep->modalHeader2G.antCtrlCommon;
--      else
--              val = eep->modalHeader5G.antCtrlCommon;
--      return le32_to_cpu(val);
-+      return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon);
- }
- static u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
- {
--      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
--      __le32 val;
--
--      if (is2ghz)
--              val = eep->modalHeader2G.antCtrlCommon2;
--      else
--              val = eep->modalHeader5G.antCtrlCommon2;
--      return le32_to_cpu(val);
-+      return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon2);
- }
--static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah,
--                                      int chain,
-+static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain,
-                                       bool is2ghz)
- {
--      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
--      __le16 val = 0;
--
--      if (chain >= 0 && chain < AR9300_MAX_CHAINS) {
--              if (is2ghz)
--                      val = eep->modalHeader2G.antCtrlChain[chain];
--              else
--                      val = eep->modalHeader5G.antCtrlChain[chain];
--      }
--
-+      __le16 val = ar9003_modal_header(ah, is2ghz)->antCtrlChain[chain];
-       return le16_to_cpu(val);
- }
-@@ -3681,11 +3661,12 @@ static void ar9003_hw_ant_ctrl_apply(str
- static void ar9003_hw_drive_strength_apply(struct ath_hw *ah)
- {
-+      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+      struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
-       int drive_strength;
-       unsigned long reg;
--      drive_strength = ath9k_hw_ar9300_get_eeprom(ah, EEP_DRIVE_STRENGTH);
--
-+      drive_strength = pBase->miscConfiguration & BIT(0);
-       if (!drive_strength)
-               return;
-@@ -3815,11 +3796,11 @@ static bool is_pmu_set(struct ath_hw *ah
- void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
- {
--      int internal_regulator =
--              ath9k_hw_ar9300_get_eeprom(ah, EEP_INTERNAL_REGULATOR);
-+      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+      struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
-       u32 reg_val;
--      if (internal_regulator) {
-+      if (pBase->featureEnable & BIT(4)) {
-               if (AR_SREV_9330(ah) || AR_SREV_9485(ah)) {
-                       int reg_pmu_set;
-@@ -3863,11 +3844,11 @@ void ar9003_hw_internal_regulator_apply(
-                       if (!is_pmu_set(ah, AR_PHY_PMU2, reg_pmu_set))
-                               return;
-               } else if (AR_SREV_9462(ah)) {
--                      reg_val = ath9k_hw_ar9300_get_eeprom(ah, EEP_SWREG);
-+                      reg_val = le32_to_cpu(pBase->swreg);
-                       REG_WRITE(ah, AR_PHY_PMU1, reg_val);
-               } else {
-                       /* Internal regulator is ON. Write swreg register. */
--                      reg_val = ath9k_hw_ar9300_get_eeprom(ah, EEP_SWREG);
-+                      reg_val = le32_to_cpu(pBase->swreg);
-                       REG_WRITE(ah, AR_RTC_REG_CONTROL1,
-                                 REG_READ(ah, AR_RTC_REG_CONTROL1) &
-                                 (~AR_RTC_REG_CONTROL1_SWREG_PROGRAM));
-@@ -3909,6 +3890,9 @@ static void ar9003_hw_apply_tuning_caps(
-       struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-       u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0];
-+      if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
-+              return;
-+
-       if (eep->baseEepHeader.featureEnable & 0x40) {
-               tuning_caps_param &= 0x7f;
-               REG_RMW_FIELD(ah, AR_CH0_XTAL, AR_CH0_XTAL_CAPINDAC,
-@@ -3921,10 +3905,11 @@ static void ar9003_hw_apply_tuning_caps(
- static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq)
- {
-       struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
--      int quick_drop = ath9k_hw_ar9300_get_eeprom(ah, EEP_QUICK_DROP);
-+      struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
-+      int quick_drop;
-       s32 t[3], f[3] = {5180, 5500, 5785};
--      if (!quick_drop)
-+      if (!(pBase->miscConfiguration & BIT(1)))
-               return;
-       if (freq < 4000)
-@@ -3938,13 +3923,11 @@ static void ar9003_hw_quick_drop_apply(s
-       REG_RMW_FIELD(ah, AR_PHY_AGC, AR_PHY_AGC_QUICK_DROP, quick_drop);
- }
--static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, u16 freq)
-+static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, bool is2ghz)
- {
--      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-       u32 value;
--      value = (freq < 4000) ? eep->modalHeader2G.txEndToXpaOff :
--                              eep->modalHeader5G.txEndToXpaOff;
-+      value = ar9003_modal_header(ah, is2ghz)->txEndToXpaOff;
-       REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
-                     AR_PHY_XPA_TIMING_CTL_TX_END_XPAB_OFF, value);
-@@ -3952,19 +3935,63 @@ static void ar9003_hw_txend_to_xpa_off_a
-                     AR_PHY_XPA_TIMING_CTL_TX_END_XPAA_OFF, value);
- }
-+static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)
-+{
-+      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+      u8 xpa_ctl;
-+
-+      if (!(eep->baseEepHeader.featureEnable & 0x80))
-+              return;
-+
-+      if (!AR_SREV_9300(ah) && !AR_SREV_9340(ah) && !AR_SREV_9580(ah))
-+              return;
-+
-+      xpa_ctl = ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
-+      if (is2ghz)
-+              REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
-+                            AR_PHY_XPA_TIMING_CTL_FRAME_XPAB_ON, xpa_ctl);
-+      else
-+              REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
-+                            AR_PHY_XPA_TIMING_CTL_FRAME_XPAA_ON, xpa_ctl);
-+}
-+
-+static void ar9003_hw_xlna_bias_strength_apply(struct ath_hw *ah, bool is2ghz)
-+{
-+      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+      u8 bias;
-+
-+      if (!(eep->baseEepHeader.featureEnable & 0x40))
-+              return;
-+
-+      if (!AR_SREV_9300(ah))
-+              return;
-+
-+      bias = ar9003_modal_header(ah, is2ghz)->xlna_bias_strength;
-+      REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_RXTX4, AR_PHY_65NM_RXTX4_XLNA_BIAS,
-+                    bias & 0x3);
-+      bias >>= 2;
-+      REG_RMW_FIELD(ah, AR_PHY_65NM_CH1_RXTX4, AR_PHY_65NM_RXTX4_XLNA_BIAS,
-+                    bias & 0x3);
-+      bias >>= 2;
-+      REG_RMW_FIELD(ah, AR_PHY_65NM_CH2_RXTX4, AR_PHY_65NM_RXTX4_XLNA_BIAS,
-+                    bias & 0x3);
-+}
-+
- static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,
-                                            struct ath9k_channel *chan)
- {
--      ar9003_hw_xpa_bias_level_apply(ah, IS_CHAN_2GHZ(chan));
--      ar9003_hw_ant_ctrl_apply(ah, IS_CHAN_2GHZ(chan));
-+      bool is2ghz = IS_CHAN_2GHZ(chan);
-+      ar9003_hw_xpa_timing_control_apply(ah, is2ghz);
-+      ar9003_hw_xpa_bias_level_apply(ah, is2ghz);
-+      ar9003_hw_ant_ctrl_apply(ah, is2ghz);
-       ar9003_hw_drive_strength_apply(ah);
-+      ar9003_hw_xlna_bias_strength_apply(ah, is2ghz);
-       ar9003_hw_atten_apply(ah, chan);
-       ar9003_hw_quick_drop_apply(ah, chan->channel);
-       if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9550(ah))
-               ar9003_hw_internal_regulator_apply(ah);
--      if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
--              ar9003_hw_apply_tuning_caps(ah);
--      ar9003_hw_txend_to_xpa_off_apply(ah, chan->channel);
-+      ar9003_hw_apply_tuning_caps(ah);
-+      ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz);
- }
- static void ath9k_hw_ar9300_set_addac(struct ath_hw *ah,
-@@ -5100,14 +5127,9 @@ s32 ar9003_hw_get_rx_gain_idx(struct ath
-       return (eep->baseEepHeader.txrxgain) & 0xf; /* bits 3:0 */
- }
--u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is_2ghz)
-+u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is2ghz)
- {
--      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
--
--      if (is_2ghz)
--              return eep->modalHeader2G.spurChans;
--      else
--              return eep->modalHeader5G.spurChans;
-+      return ar9003_modal_header(ah, is2ghz)->spurChans;
- }
- unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-@@ -231,7 +231,8 @@ struct ar9300_modal_eep_header {
-       __le32 papdRateMaskHt20;
-       __le32 papdRateMaskHt40;
-       __le16 switchcomspdt;
--      u8 futureModal[8];
-+      u8 xlna_bias_strength;
-+      u8 futureModal[7];
- } __packed;
- struct ar9300_cal_data_per_freq_op_loop {
---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-@@ -44,462 +44,310 @@ static void ar9003_hw_init_mode_regs(str
-               ar9462_2p0_baseband_core_txfir_coeff_japan_2484
-       if (AR_SREV_9330_11(ah)) {
-               /* mac */
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
--                              ar9331_1p1_mac_core,
--                              ARRAY_SIZE(ar9331_1p1_mac_core), 2);
-+                              ar9331_1p1_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar9331_1p1_mac_postamble,
--                              ARRAY_SIZE(ar9331_1p1_mac_postamble), 5);
-+                              ar9331_1p1_mac_postamble);
-               /* bb */
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar9331_1p1_baseband_core,
--                              ARRAY_SIZE(ar9331_1p1_baseband_core), 2);
-+                              ar9331_1p1_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar9331_1p1_baseband_postamble,
--                              ARRAY_SIZE(ar9331_1p1_baseband_postamble), 5);
-+                              ar9331_1p1_baseband_postamble);
-               /* radio */
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar9331_1p1_radio_core,
--                              ARRAY_SIZE(ar9331_1p1_radio_core), 2);
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST], NULL, 0, 0);
-+                              ar9331_1p1_radio_core);
-               /* soc */
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar9331_1p1_soc_preamble,
--                              ARRAY_SIZE(ar9331_1p1_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+                              ar9331_1p1_soc_preamble);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
--                              ar9331_1p1_soc_postamble,
--                              ARRAY_SIZE(ar9331_1p1_soc_postamble), 2);
-+                              ar9331_1p1_soc_postamble);
-               /* rx/tx gain */
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9331_common_rx_gain_1p1,
--                              ARRAY_SIZE(ar9331_common_rx_gain_1p1), 2);
-+                              ar9331_common_rx_gain_1p1);
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_lowest_ob_db_tx_gain_1p1,
--                      ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p1),
--                      5);
-+                              ar9331_modes_lowest_ob_db_tx_gain_1p1);
-               /* additional clock settings */
-               if (ah->is_clk_25mhz)
-                       INIT_INI_ARRAY(&ah->iniAdditional,
--                                      ar9331_1p1_xtal_25M,
--                                      ARRAY_SIZE(ar9331_1p1_xtal_25M), 2);
-+                                      ar9331_1p1_xtal_25M);
-               else
-                       INIT_INI_ARRAY(&ah->iniAdditional,
--                                      ar9331_1p1_xtal_40M,
--                                      ARRAY_SIZE(ar9331_1p1_xtal_40M), 2);
-+                                      ar9331_1p1_xtal_40M);
-       } else if (AR_SREV_9330_12(ah)) {
-               /* mac */
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
--                              ar9331_1p2_mac_core,
--                              ARRAY_SIZE(ar9331_1p2_mac_core), 2);
-+                              ar9331_1p2_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar9331_1p2_mac_postamble,
--                              ARRAY_SIZE(ar9331_1p2_mac_postamble), 5);
-+                              ar9331_1p2_mac_postamble);
-               /* bb */
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar9331_1p2_baseband_core,
--                              ARRAY_SIZE(ar9331_1p2_baseband_core), 2);
-+                              ar9331_1p2_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar9331_1p2_baseband_postamble,
--                              ARRAY_SIZE(ar9331_1p2_baseband_postamble), 5);
-+                              ar9331_1p2_baseband_postamble);
-               /* radio */
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar9331_1p2_radio_core,
--                              ARRAY_SIZE(ar9331_1p2_radio_core), 2);
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST], NULL, 0, 0);
-+                              ar9331_1p2_radio_core);
-               /* soc */
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar9331_1p2_soc_preamble,
--                              ARRAY_SIZE(ar9331_1p2_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+                              ar9331_1p2_soc_preamble);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
--                              ar9331_1p2_soc_postamble,
--                              ARRAY_SIZE(ar9331_1p2_soc_postamble), 2);
-+                              ar9331_1p2_soc_postamble);
-               /* rx/tx gain */
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9331_common_rx_gain_1p2,
--                              ARRAY_SIZE(ar9331_common_rx_gain_1p2), 2);
-+                              ar9331_common_rx_gain_1p2);
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_lowest_ob_db_tx_gain_1p2,
--                      ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p2),
--                      5);
-+                              ar9331_modes_lowest_ob_db_tx_gain_1p2);
-               /* additional clock settings */
-               if (ah->is_clk_25mhz)
-                       INIT_INI_ARRAY(&ah->iniAdditional,
--                                      ar9331_1p2_xtal_25M,
--                                      ARRAY_SIZE(ar9331_1p2_xtal_25M), 2);
-+                                      ar9331_1p2_xtal_25M);
-               else
-                       INIT_INI_ARRAY(&ah->iniAdditional,
--                                      ar9331_1p2_xtal_40M,
--                                      ARRAY_SIZE(ar9331_1p2_xtal_40M), 2);
-+                                      ar9331_1p2_xtal_40M);
-       } else if (AR_SREV_9340(ah)) {
-               /* mac */
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
--                              ar9340_1p0_mac_core,
--                              ARRAY_SIZE(ar9340_1p0_mac_core), 2);
-+                              ar9340_1p0_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar9340_1p0_mac_postamble,
--                              ARRAY_SIZE(ar9340_1p0_mac_postamble), 5);
-+                              ar9340_1p0_mac_postamble);
-               /* bb */
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar9340_1p0_baseband_core,
--                              ARRAY_SIZE(ar9340_1p0_baseband_core), 2);
-+                              ar9340_1p0_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar9340_1p0_baseband_postamble,
--                              ARRAY_SIZE(ar9340_1p0_baseband_postamble), 5);
-+                              ar9340_1p0_baseband_postamble);
-               /* radio */
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar9340_1p0_radio_core,
--                              ARRAY_SIZE(ar9340_1p0_radio_core), 2);
-+                              ar9340_1p0_radio_core);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
--                              ar9340_1p0_radio_postamble,
--                              ARRAY_SIZE(ar9340_1p0_radio_postamble), 5);
-+                              ar9340_1p0_radio_postamble);
-               /* soc */
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar9340_1p0_soc_preamble,
--                              ARRAY_SIZE(ar9340_1p0_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+                              ar9340_1p0_soc_preamble);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
--                              ar9340_1p0_soc_postamble,
--                              ARRAY_SIZE(ar9340_1p0_soc_postamble), 5);
-+                              ar9340_1p0_soc_postamble);
-               /* rx/tx gain */
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9340Common_wo_xlna_rx_gain_table_1p0,
--                              ARRAY_SIZE(ar9340Common_wo_xlna_rx_gain_table_1p0),
--                              5);
--              INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9340Modes_high_ob_db_tx_gain_table_1p0,
--                              ARRAY_SIZE(ar9340Modes_high_ob_db_tx_gain_table_1p0),
--                              5);
-+                              ar9340Common_wo_xlna_rx_gain_table_1p0);
-+              INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                              ar9340Modes_high_ob_db_tx_gain_table_1p0);
-               INIT_INI_ARRAY(&ah->iniModesFastClock,
--                              ar9340Modes_fast_clock_1p0,
--                              ARRAY_SIZE(ar9340Modes_fast_clock_1p0),
--                              3);
-+                              ar9340Modes_fast_clock_1p0);
-               if (!ah->is_clk_25mhz)
-                       INIT_INI_ARRAY(&ah->iniAdditional,
--                                     ar9340_1p0_radio_core_40M,
--                                     ARRAY_SIZE(ar9340_1p0_radio_core_40M),
--                                     2);
-+                                     ar9340_1p0_radio_core_40M);
-       } else if (AR_SREV_9485_11(ah)) {
-               /* mac */
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
--                              ar9485_1_1_mac_core,
--                              ARRAY_SIZE(ar9485_1_1_mac_core), 2);
-+                              ar9485_1_1_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar9485_1_1_mac_postamble,
--                              ARRAY_SIZE(ar9485_1_1_mac_postamble), 5);
-+                              ar9485_1_1_mac_postamble);
-               /* bb */
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_1,
--                              ARRAY_SIZE(ar9485_1_1), 2);
-+              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_1);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar9485_1_1_baseband_core,
--                              ARRAY_SIZE(ar9485_1_1_baseband_core), 2);
-+                              ar9485_1_1_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar9485_1_1_baseband_postamble,
--                              ARRAY_SIZE(ar9485_1_1_baseband_postamble), 5);
-+                              ar9485_1_1_baseband_postamble);
-               /* radio */
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar9485_1_1_radio_core,
--                              ARRAY_SIZE(ar9485_1_1_radio_core), 2);
-+                              ar9485_1_1_radio_core);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
--                              ar9485_1_1_radio_postamble,
--                              ARRAY_SIZE(ar9485_1_1_radio_postamble), 2);
-+                              ar9485_1_1_radio_postamble);
-               /* soc */
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar9485_1_1_soc_preamble,
--                              ARRAY_SIZE(ar9485_1_1_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST], NULL, 0, 0);
-+                              ar9485_1_1_soc_preamble);
-               /* rx/tx gain */
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9485Common_wo_xlna_rx_gain_1_1,
--                              ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1), 2);
-+                              ar9485Common_wo_xlna_rx_gain_1_1);
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9485_modes_lowest_ob_db_tx_gain_1_1,
--                              ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
--                              5);
-+                              ar9485_modes_lowest_ob_db_tx_gain_1_1);
-               /* Load PCIE SERDES settings from INI */
-               /* Awake Setting */
-               INIT_INI_ARRAY(&ah->iniPcieSerdes,
--                              ar9485_1_1_pcie_phy_clkreq_disable_L1,
--                              ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
--                              2);
-+                              ar9485_1_1_pcie_phy_clkreq_disable_L1);
-               /* Sleep Setting */
-               INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
--                              ar9485_1_1_pcie_phy_clkreq_disable_L1,
--                              ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
--                              2);
-+                              ar9485_1_1_pcie_phy_clkreq_disable_L1);
-       } else if (AR_SREV_9462_20(ah)) {
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE], ar9462_2p0_mac_core,
--                              ARRAY_SIZE(ar9462_2p0_mac_core), 2);
-+              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE], ar9462_2p0_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar9462_2p0_mac_postamble,
--                              ARRAY_SIZE(ar9462_2p0_mac_postamble), 5);
-+                              ar9462_2p0_mac_postamble);
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar9462_2p0_baseband_core,
--                              ARRAY_SIZE(ar9462_2p0_baseband_core), 2);
-+                              ar9462_2p0_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar9462_2p0_baseband_postamble,
--                              ARRAY_SIZE(ar9462_2p0_baseband_postamble), 5);
-+                              ar9462_2p0_baseband_postamble);
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar9462_2p0_radio_core,
--                              ARRAY_SIZE(ar9462_2p0_radio_core), 2);
-+                              ar9462_2p0_radio_core);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
--                              ar9462_2p0_radio_postamble,
--                              ARRAY_SIZE(ar9462_2p0_radio_postamble), 5);
-+                              ar9462_2p0_radio_postamble);
-               INIT_INI_ARRAY(&ah->ini_radio_post_sys2ant,
--                              ar9462_2p0_radio_postamble_sys2ant,
--                              ARRAY_SIZE(ar9462_2p0_radio_postamble_sys2ant),
--                              5);
-+                              ar9462_2p0_radio_postamble_sys2ant);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar9462_2p0_soc_preamble,
--                              ARRAY_SIZE(ar9462_2p0_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+                              ar9462_2p0_soc_preamble);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
--                              ar9462_2p0_soc_postamble,
--                              ARRAY_SIZE(ar9462_2p0_soc_postamble), 5);
-+                              ar9462_2p0_soc_postamble);
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9462_common_rx_gain_table_2p0,
--                              ARRAY_SIZE(ar9462_common_rx_gain_table_2p0), 2);
-+                              ar9462_common_rx_gain_table_2p0);
-               /* Awake -> Sleep Setting */
-               INIT_INI_ARRAY(&ah->iniPcieSerdes,
--                              PCIE_PLL_ON_CREQ_DIS_L1_2P0,
--                              ARRAY_SIZE(PCIE_PLL_ON_CREQ_DIS_L1_2P0),
--                              2);
-+                              PCIE_PLL_ON_CREQ_DIS_L1_2P0);
-               /* Sleep -> Awake Setting */
-               INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
--                              PCIE_PLL_ON_CREQ_DIS_L1_2P0,
--                              ARRAY_SIZE(PCIE_PLL_ON_CREQ_DIS_L1_2P0),
--                              2);
-+                              PCIE_PLL_ON_CREQ_DIS_L1_2P0);
-               /* Fast clock modal settings */
-               INIT_INI_ARRAY(&ah->iniModesFastClock,
--                              ar9462_modes_fast_clock_2p0,
--                              ARRAY_SIZE(ar9462_modes_fast_clock_2p0), 3);
-+                              ar9462_modes_fast_clock_2p0);
-               INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
--                              AR9462_BB_CTX_COEFJ(2p0),
--                              ARRAY_SIZE(AR9462_BB_CTX_COEFJ(2p0)), 2);
-+                              AR9462_BB_CTX_COEFJ(2p0));
--              INIT_INI_ARRAY(&ah->ini_japan2484, AR9462_BBC_TXIFR_COEFFJ,
--                              ARRAY_SIZE(AR9462_BBC_TXIFR_COEFFJ), 2);
-+              INIT_INI_ARRAY(&ah->ini_japan2484, AR9462_BBC_TXIFR_COEFFJ);
-       } else if (AR_SREV_9550(ah)) {
-               /* mac */
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
--                              ar955x_1p0_mac_core,
--                              ARRAY_SIZE(ar955x_1p0_mac_core), 2);
-+                              ar955x_1p0_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar955x_1p0_mac_postamble,
--                              ARRAY_SIZE(ar955x_1p0_mac_postamble), 5);
-+                              ar955x_1p0_mac_postamble);
-               /* bb */
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar955x_1p0_baseband_core,
--                              ARRAY_SIZE(ar955x_1p0_baseband_core), 2);
-+                              ar955x_1p0_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar955x_1p0_baseband_postamble,
--                              ARRAY_SIZE(ar955x_1p0_baseband_postamble), 5);
-+                              ar955x_1p0_baseband_postamble);
-               /* radio */
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar955x_1p0_radio_core,
--                              ARRAY_SIZE(ar955x_1p0_radio_core), 2);
-+                              ar955x_1p0_radio_core);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
--                              ar955x_1p0_radio_postamble,
--                              ARRAY_SIZE(ar955x_1p0_radio_postamble), 5);
-+                              ar955x_1p0_radio_postamble);
-               /* soc */
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar955x_1p0_soc_preamble,
--                              ARRAY_SIZE(ar955x_1p0_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+                              ar955x_1p0_soc_preamble);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
--                              ar955x_1p0_soc_postamble,
--                              ARRAY_SIZE(ar955x_1p0_soc_postamble), 5);
-+                              ar955x_1p0_soc_postamble);
-               /* rx/tx gain */
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar955x_1p0_common_wo_xlna_rx_gain_table,
--                      ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_table),
--                      2);
-+                      ar955x_1p0_common_wo_xlna_rx_gain_table);
-               INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
--                      ar955x_1p0_common_wo_xlna_rx_gain_bounds,
--                      ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_bounds),
--                      5);
--              INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar955x_1p0_modes_xpa_tx_gain_table,
--                              ARRAY_SIZE(ar955x_1p0_modes_xpa_tx_gain_table),
--                              9);
-+                      ar955x_1p0_common_wo_xlna_rx_gain_bounds);
-+              INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                              ar955x_1p0_modes_xpa_tx_gain_table);
-               /* Fast clock modal settings */
-               INIT_INI_ARRAY(&ah->iniModesFastClock,
--                              ar955x_1p0_modes_fast_clock,
--                              ARRAY_SIZE(ar955x_1p0_modes_fast_clock), 3);
-+                              ar955x_1p0_modes_fast_clock);
-       } else if (AR_SREV_9580(ah)) {
-               /* mac */
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
--                              ar9580_1p0_mac_core,
--                              ARRAY_SIZE(ar9580_1p0_mac_core), 2);
-+                              ar9580_1p0_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar9580_1p0_mac_postamble,
--                              ARRAY_SIZE(ar9580_1p0_mac_postamble), 5);
-+                              ar9580_1p0_mac_postamble);
-               /* bb */
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar9580_1p0_baseband_core,
--                              ARRAY_SIZE(ar9580_1p0_baseband_core), 2);
-+                              ar9580_1p0_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar9580_1p0_baseband_postamble,
--                              ARRAY_SIZE(ar9580_1p0_baseband_postamble), 5);
-+                              ar9580_1p0_baseband_postamble);
-               /* radio */
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar9580_1p0_radio_core,
--                              ARRAY_SIZE(ar9580_1p0_radio_core), 2);
-+                              ar9580_1p0_radio_core);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
--                              ar9580_1p0_radio_postamble,
--                              ARRAY_SIZE(ar9580_1p0_radio_postamble), 5);
-+                              ar9580_1p0_radio_postamble);
-               /* soc */
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar9580_1p0_soc_preamble,
--                              ARRAY_SIZE(ar9580_1p0_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+                              ar9580_1p0_soc_preamble);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
--                              ar9580_1p0_soc_postamble,
--                              ARRAY_SIZE(ar9580_1p0_soc_postamble), 5);
-+                              ar9580_1p0_soc_postamble);
-               /* rx/tx gain */
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9580_1p0_rx_gain_table,
--                              ARRAY_SIZE(ar9580_1p0_rx_gain_table), 2);
-+                              ar9580_1p0_rx_gain_table);
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9580_1p0_low_ob_db_tx_gain_table,
--                              ARRAY_SIZE(ar9580_1p0_low_ob_db_tx_gain_table),
--                              5);
-+                              ar9580_1p0_low_ob_db_tx_gain_table);
-               INIT_INI_ARRAY(&ah->iniModesFastClock,
--                              ar9580_1p0_modes_fast_clock,
--                              ARRAY_SIZE(ar9580_1p0_modes_fast_clock),
--                              3);
-+                              ar9580_1p0_modes_fast_clock);
-       } else {
-               /* mac */
--              INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
--                              ar9300_2p2_mac_core,
--                              ARRAY_SIZE(ar9300_2p2_mac_core), 2);
-+                              ar9300_2p2_mac_core);
-               INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
--                              ar9300_2p2_mac_postamble,
--                              ARRAY_SIZE(ar9300_2p2_mac_postamble), 5);
-+                              ar9300_2p2_mac_postamble);
-               /* bb */
--              INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
--                              ar9300_2p2_baseband_core,
--                              ARRAY_SIZE(ar9300_2p2_baseband_core), 2);
-+                              ar9300_2p2_baseband_core);
-               INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
--                              ar9300_2p2_baseband_postamble,
--                              ARRAY_SIZE(ar9300_2p2_baseband_postamble), 5);
-+                              ar9300_2p2_baseband_postamble);
-               /* radio */
--              INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
--                              ar9300_2p2_radio_core,
--                              ARRAY_SIZE(ar9300_2p2_radio_core), 2);
-+                              ar9300_2p2_radio_core);
-               INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
--                              ar9300_2p2_radio_postamble,
--                              ARRAY_SIZE(ar9300_2p2_radio_postamble), 5);
-+                              ar9300_2p2_radio_postamble);
-               /* soc */
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
--                              ar9300_2p2_soc_preamble,
--                              ARRAY_SIZE(ar9300_2p2_soc_preamble), 2);
--              INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-+                              ar9300_2p2_soc_preamble);
-               INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
--                              ar9300_2p2_soc_postamble,
--                              ARRAY_SIZE(ar9300_2p2_soc_postamble), 5);
-+                              ar9300_2p2_soc_postamble);
-               /* rx/tx gain */
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9300Common_rx_gain_table_2p2,
--                              ARRAY_SIZE(ar9300Common_rx_gain_table_2p2), 2);
-+                              ar9300Common_rx_gain_table_2p2);
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                              ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
--                              ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2),
--                              5);
-+                              ar9300Modes_lowest_ob_db_tx_gain_table_2p2);
-               /* Load PCIE SERDES settings from INI */
-               /* Awake Setting */
-               INIT_INI_ARRAY(&ah->iniPcieSerdes,
--                              ar9300PciePhy_pll_on_clkreq_disable_L1_2p2,
--                              ARRAY_SIZE(ar9300PciePhy_pll_on_clkreq_disable_L1_2p2),
--                              2);
-+                              ar9300PciePhy_pll_on_clkreq_disable_L1_2p2);
-               /* Sleep Setting */
-               INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
--                              ar9300PciePhy_pll_on_clkreq_disable_L1_2p2,
--                              ARRAY_SIZE(ar9300PciePhy_pll_on_clkreq_disable_L1_2p2),
--                              2);
-+                              ar9300PciePhy_pll_on_clkreq_disable_L1_2p2);
-               /* Fast clock modal settings */
-               INIT_INI_ARRAY(&ah->iniModesFastClock,
--                              ar9300Modes_fast_clock_2p2,
--                              ARRAY_SIZE(ar9300Modes_fast_clock_2p2),
--                              3);
-+                              ar9300Modes_fast_clock_2p2);
-       }
- }
-@@ -507,156 +355,110 @@ static void ar9003_tx_gain_table_mode0(s
- {
-       if (AR_SREV_9330_12(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_lowest_ob_db_tx_gain_1p2,
--                      ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p2),
--                      5);
-+                      ar9331_modes_lowest_ob_db_tx_gain_1p2);
-       else if (AR_SREV_9330_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_lowest_ob_db_tx_gain_1p1,
--                      ARRAY_SIZE(ar9331_modes_lowest_ob_db_tx_gain_1p1),
--                      5);
-+                      ar9331_modes_lowest_ob_db_tx_gain_1p1);
-       else if (AR_SREV_9340(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
--                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
--                      5);
-+                      ar9340Modes_lowest_ob_db_tx_gain_table_1p0);
-       else if (AR_SREV_9485_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9485_modes_lowest_ob_db_tx_gain_1_1,
--                      ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
--                      5);
-+                      ar9485_modes_lowest_ob_db_tx_gain_1_1);
-       else if (AR_SREV_9550(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar955x_1p0_modes_xpa_tx_gain_table,
--                      ARRAY_SIZE(ar955x_1p0_modes_xpa_tx_gain_table),
--                      9);
-+                      ar955x_1p0_modes_xpa_tx_gain_table);
-       else if (AR_SREV_9580(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9580_1p0_lowest_ob_db_tx_gain_table,
--                      ARRAY_SIZE(ar9580_1p0_lowest_ob_db_tx_gain_table),
--                      5);
-+                      ar9580_1p0_lowest_ob_db_tx_gain_table);
-       else if (AR_SREV_9462_20(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9462_modes_low_ob_db_tx_gain_table_2p0,
--                      ARRAY_SIZE(ar9462_modes_low_ob_db_tx_gain_table_2p0),
--                      5);
-+                      ar9462_modes_low_ob_db_tx_gain_table_2p0);
-       else
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
--                      ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2),
--                      5);
-+                      ar9300Modes_lowest_ob_db_tx_gain_table_2p2);
- }
- static void ar9003_tx_gain_table_mode1(struct ath_hw *ah)
- {
-       if (AR_SREV_9330_12(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_high_ob_db_tx_gain_1p2,
--                      ARRAY_SIZE(ar9331_modes_high_ob_db_tx_gain_1p2),
--                      5);
-+                      ar9331_modes_high_ob_db_tx_gain_1p2);
-       else if (AR_SREV_9330_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_high_ob_db_tx_gain_1p1,
--                      ARRAY_SIZE(ar9331_modes_high_ob_db_tx_gain_1p1),
--                      5);
-+                      ar9331_modes_high_ob_db_tx_gain_1p1);
-       else if (AR_SREV_9340(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
--                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
--                      5);
-+                      ar9340Modes_high_ob_db_tx_gain_table_1p0);
-       else if (AR_SREV_9485_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9485Modes_high_ob_db_tx_gain_1_1,
--                      ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_1),
--                      5);
-+                      ar9485Modes_high_ob_db_tx_gain_1_1);
-       else if (AR_SREV_9580(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9580_1p0_high_ob_db_tx_gain_table,
--                      ARRAY_SIZE(ar9580_1p0_high_ob_db_tx_gain_table),
--                      5);
-+                      ar9580_1p0_high_ob_db_tx_gain_table);
-       else if (AR_SREV_9550(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar955x_1p0_modes_no_xpa_tx_gain_table,
--                      ARRAY_SIZE(ar955x_1p0_modes_no_xpa_tx_gain_table),
--                      9);
-+                      ar955x_1p0_modes_no_xpa_tx_gain_table);
-       else if (AR_SREV_9462_20(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9462_modes_high_ob_db_tx_gain_table_2p0,
--                      ARRAY_SIZE(ar9462_modes_high_ob_db_tx_gain_table_2p0),
--                      5);
-+                      ar9462_modes_high_ob_db_tx_gain_table_2p0);
-       else
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9300Modes_high_ob_db_tx_gain_table_2p2,
--                      ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p2),
--                      5);
-+                      ar9300Modes_high_ob_db_tx_gain_table_2p2);
- }
- static void ar9003_tx_gain_table_mode2(struct ath_hw *ah)
- {
-       if (AR_SREV_9330_12(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_low_ob_db_tx_gain_1p2,
--                      ARRAY_SIZE(ar9331_modes_low_ob_db_tx_gain_1p2),
--                      5);
-+                      ar9331_modes_low_ob_db_tx_gain_1p2);
-       else if (AR_SREV_9330_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_low_ob_db_tx_gain_1p1,
--                      ARRAY_SIZE(ar9331_modes_low_ob_db_tx_gain_1p1),
--                      5);
-+                      ar9331_modes_low_ob_db_tx_gain_1p1);
-       else if (AR_SREV_9340(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
--                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
--                      5);
-+                      ar9340Modes_low_ob_db_tx_gain_table_1p0);
-       else if (AR_SREV_9485_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9485Modes_low_ob_db_tx_gain_1_1,
--                      ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_1),
--                      5);
-+                      ar9485Modes_low_ob_db_tx_gain_1_1);
-       else if (AR_SREV_9580(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9580_1p0_low_ob_db_tx_gain_table,
--                      ARRAY_SIZE(ar9580_1p0_low_ob_db_tx_gain_table),
--                      5);
-+                      ar9580_1p0_low_ob_db_tx_gain_table);
-       else
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9300Modes_low_ob_db_tx_gain_table_2p2,
--                      ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p2),
--                      5);
-+                      ar9300Modes_low_ob_db_tx_gain_table_2p2);
- }
- static void ar9003_tx_gain_table_mode3(struct ath_hw *ah)
- {
-       if (AR_SREV_9330_12(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_high_power_tx_gain_1p2,
--                      ARRAY_SIZE(ar9331_modes_high_power_tx_gain_1p2),
--                      5);
-+                      ar9331_modes_high_power_tx_gain_1p2);
-       else if (AR_SREV_9330_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9331_modes_high_power_tx_gain_1p1,
--                      ARRAY_SIZE(ar9331_modes_high_power_tx_gain_1p1),
--                      5);
-+                      ar9331_modes_high_power_tx_gain_1p1);
-       else if (AR_SREV_9340(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9340Modes_lowest_ob_db_tx_gain_table_1p0,
--                      ARRAY_SIZE(ar9340Modes_lowest_ob_db_tx_gain_table_1p0),
--                      5);
-+                      ar9340Modes_high_power_tx_gain_table_1p0);
-       else if (AR_SREV_9485_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9485Modes_high_power_tx_gain_1_1,
--                      ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_1),
--                      5);
-+                      ar9485Modes_high_power_tx_gain_1_1);
-       else if (AR_SREV_9580(ah))
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9580_1p0_high_power_tx_gain_table,
--                      ARRAY_SIZE(ar9580_1p0_high_power_tx_gain_table),
--                      5);
-+                      ar9580_1p0_high_power_tx_gain_table);
-       else
-               INIT_INI_ARRAY(&ah->iniModesTxGain,
--                      ar9300Modes_high_power_tx_gain_table_2p2,
--                      ARRAY_SIZE(ar9300Modes_high_power_tx_gain_table_2p2),
--                      5);
-+                      ar9300Modes_high_power_tx_gain_table_2p2);
-+}
-+
-+static void ar9003_tx_gain_table_mode4(struct ath_hw *ah)
-+{
-+      if (AR_SREV_9340(ah))
-+              INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                      ar9340Modes_mixed_ob_db_tx_gain_table_1p0);
-+      else if (AR_SREV_9580(ah))
-+              INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                      ar9580_1p0_mixed_ob_db_tx_gain_table);
- }
- static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
-@@ -675,6 +477,9 @@ static void ar9003_tx_gain_table_apply(s
-       case 3:
-               ar9003_tx_gain_table_mode3(ah);
-               break;
-+      case 4:
-+              ar9003_tx_gain_table_mode4(ah);
-+              break;
-       }
- }
-@@ -682,104 +487,67 @@ static void ar9003_rx_gain_table_mode0(s
- {
-       if (AR_SREV_9330_12(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9331_common_rx_gain_1p2,
--                              ARRAY_SIZE(ar9331_common_rx_gain_1p2),
--                              2);
-+                              ar9331_common_rx_gain_1p2);
-       else if (AR_SREV_9330_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9331_common_rx_gain_1p1,
--                              ARRAY_SIZE(ar9331_common_rx_gain_1p1),
--                              2);
-+                              ar9331_common_rx_gain_1p1);
-       else if (AR_SREV_9340(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9340Common_rx_gain_table_1p0,
--                              ARRAY_SIZE(ar9340Common_rx_gain_table_1p0),
--                              2);
-+                              ar9340Common_rx_gain_table_1p0);
-       else if (AR_SREV_9485_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9485Common_wo_xlna_rx_gain_1_1,
--                              ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
--                              2);
-+                              ar9485Common_wo_xlna_rx_gain_1_1);
-       else if (AR_SREV_9550(ah)) {
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar955x_1p0_common_rx_gain_table,
--                              ARRAY_SIZE(ar955x_1p0_common_rx_gain_table),
--                              2);
-+                              ar955x_1p0_common_rx_gain_table);
-               INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
--                              ar955x_1p0_common_rx_gain_bounds,
--                              ARRAY_SIZE(ar955x_1p0_common_rx_gain_bounds),
--                              5);
-+                              ar955x_1p0_common_rx_gain_bounds);
-       } else if (AR_SREV_9580(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9580_1p0_rx_gain_table,
--                              ARRAY_SIZE(ar9580_1p0_rx_gain_table),
--                              2);
-+                              ar9580_1p0_rx_gain_table);
-       else if (AR_SREV_9462_20(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9462_common_rx_gain_table_2p0,
--                              ARRAY_SIZE(ar9462_common_rx_gain_table_2p0),
--                              2);
-+                              ar9462_common_rx_gain_table_2p0);
-       else
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                              ar9300Common_rx_gain_table_2p2,
--                              ARRAY_SIZE(ar9300Common_rx_gain_table_2p2),
--                              2);
-+                              ar9300Common_rx_gain_table_2p2);
- }
- static void ar9003_rx_gain_table_mode1(struct ath_hw *ah)
- {
-       if (AR_SREV_9330_12(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9331_common_wo_xlna_rx_gain_1p2,
--                      ARRAY_SIZE(ar9331_common_wo_xlna_rx_gain_1p2),
--                      2);
-+                      ar9331_common_wo_xlna_rx_gain_1p2);
-       else if (AR_SREV_9330_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9331_common_wo_xlna_rx_gain_1p1,
--                      ARRAY_SIZE(ar9331_common_wo_xlna_rx_gain_1p1),
--                      2);
-+                      ar9331_common_wo_xlna_rx_gain_1p1);
-       else if (AR_SREV_9340(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9340Common_wo_xlna_rx_gain_table_1p0,
--                      ARRAY_SIZE(ar9340Common_wo_xlna_rx_gain_table_1p0),
--                      2);
-+                      ar9340Common_wo_xlna_rx_gain_table_1p0);
-       else if (AR_SREV_9485_11(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9485Common_wo_xlna_rx_gain_1_1,
--                      ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
--                      2);
-+                      ar9485Common_wo_xlna_rx_gain_1_1);
-       else if (AR_SREV_9462_20(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9462_common_wo_xlna_rx_gain_table_2p0,
--                      ARRAY_SIZE(ar9462_common_wo_xlna_rx_gain_table_2p0),
--                      2);
-+                      ar9462_common_wo_xlna_rx_gain_table_2p0);
-       else if (AR_SREV_9550(ah)) {
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar955x_1p0_common_wo_xlna_rx_gain_table,
--                      ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_table),
--                      2);
-+                      ar955x_1p0_common_wo_xlna_rx_gain_table);
-               INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
--                      ar955x_1p0_common_wo_xlna_rx_gain_bounds,
--                      ARRAY_SIZE(ar955x_1p0_common_wo_xlna_rx_gain_bounds),
--                      5);
-+                      ar955x_1p0_common_wo_xlna_rx_gain_bounds);
-       } else if (AR_SREV_9580(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9580_1p0_wo_xlna_rx_gain_table,
--                      ARRAY_SIZE(ar9580_1p0_wo_xlna_rx_gain_table),
--                      2);
-+                      ar9580_1p0_wo_xlna_rx_gain_table);
-       else
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                      ar9300Common_wo_xlna_rx_gain_table_2p2,
--                      ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p2),
--                      2);
-+                      ar9300Common_wo_xlna_rx_gain_table_2p2);
- }
- static void ar9003_rx_gain_table_mode2(struct ath_hw *ah)
- {
-       if (AR_SREV_9462_20(ah))
-               INIT_INI_ARRAY(&ah->iniModesRxGain,
--                             ar9462_common_mixed_rx_gain_table_2p0,
--                             ARRAY_SIZE(ar9462_common_mixed_rx_gain_table_2p0), 2);
-+                             ar9462_common_mixed_rx_gain_table_2p0);
- }
- static void ar9003_rx_gain_table_apply(struct ath_hw *ah)
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -117,8 +117,8 @@ static int ar9003_hw_set_channel(struct 
-                   ah->is_clk_25mhz) {
-                       u32 chan_frac;
--                      channelSel = (freq * 2) / 75;
--                      chan_frac = (((freq * 2) % 75) * 0x20000) / 75;
-+                      channelSel = freq / 75;
-+                      chan_frac = ((freq % 75) * 0x20000) / 75;
-                       channelSel = (channelSel << 17) | chan_frac;
-               } else {
-                       channelSel = CHANSEL_5G(freq);
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -625,6 +625,10 @@
- #define AR_PHY_AIC_CTRL_4_B0  (AR_SM_BASE + 0x4c0)
- #define AR_PHY_AIC_STAT_2_B0  (AR_SM_BASE + 0x4cc)
-+#define AR_PHY_65NM_CH0_TXRF3       0x16048
-+#define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G                0x0000001e
-+#define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G_S      1
-+
- #define AR_PHY_65NM_CH0_SYNTH4      0x1608c
- #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   (AR_SREV_9462(ah) ? 0x00000001 : 0x00000002)
- #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT_S (AR_SREV_9462(ah) ? 0 : 1)
-@@ -633,6 +637,8 @@
- #define AR_PHY_65NM_CH0_BIAS2       0x160c4
- #define AR_PHY_65NM_CH0_BIAS4       0x160cc
- #define AR_PHY_65NM_CH0_RXTX4       0x1610c
-+#define AR_PHY_65NM_CH1_RXTX4       0x1650c
-+#define AR_PHY_65NM_CH2_RXTX4       0x1690c
- #define AR_CH0_TOP    (AR_SREV_9300(ah) ? 0x16288 : \
-                               ((AR_SREV_9462(ah) ? 0x1628c : 0x16280)))
-@@ -876,6 +882,9 @@
- #define AR_PHY_65NM_CH0_RXTX4_THERM_ON          0x10000000
- #define AR_PHY_65NM_CH0_RXTX4_THERM_ON_S        28
-+#define AR_PHY_65NM_RXTX4_XLNA_BIAS           0xC0000000
-+#define AR_PHY_65NM_RXTX4_XLNA_BIAS_S         30
-+
- /*
-  * Channel 1 Register Map
-  */
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -297,6 +297,8 @@ struct ath_tx {
-       struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
-       struct ath_descdma txdma;
-       struct ath_txq *txq_map[WME_NUM_AC];
-+      u32 txq_max_pending[WME_NUM_AC];
-+      u16 max_aggr_framelen[WME_NUM_AC][4][32];
- };
- struct ath_rx_edma {
-@@ -341,6 +343,7 @@ int ath_tx_init(struct ath_softc *sc, in
- void ath_tx_cleanup(struct ath_softc *sc);
- int ath_txq_update(struct ath_softc *sc, int qnum,
-                  struct ath9k_tx_queue_info *q);
-+void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop);
- int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
-                struct ath_tx_control *txctl);
- void ath_tx_tasklet(struct ath_softc *sc);
-@@ -360,7 +363,7 @@ void ath_tx_aggr_sleep(struct ieee80211_
- struct ath_vif {
-       int av_bslot;
--      bool is_bslot_active, primary_sta_vif;
-+      bool primary_sta_vif;
-       __le64 tsf_adjust; /* TSF adjustment for staggered beacons */
-       struct ath_buf *av_bcbuf;
- };
-@@ -386,6 +389,7 @@ struct ath_beacon_config {
-       u16 dtim_period;
-       u16 bmiss_timeout;
-       u8 dtim_count;
-+      bool enable_beacon;
- };
- struct ath_beacon {
-@@ -397,7 +401,6 @@ struct ath_beacon {
-       u32 beaconq;
-       u32 bmisscnt;
--      u32 ast_be_xmit;
-       u32 bc_tstamp;
-       struct ieee80211_vif *bslot[ATH_BCBUF];
-       int slottime;
-@@ -411,12 +414,14 @@ struct ath_beacon {
-       bool tx_last;
- };
--void ath_beacon_tasklet(unsigned long data);
--void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);
--int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif);
--void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp);
--int ath_beaconq_config(struct ath_softc *sc);
--void ath_set_beacon(struct ath_softc *sc);
-+void ath9k_beacon_tasklet(unsigned long data);
-+bool ath9k_allow_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
-+                       u32 changed);
-+void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif);
-+void ath9k_set_beacon(struct ath_softc *sc);
- void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);
- /*******************/
-@@ -442,9 +447,12 @@ void ath_rx_poll(unsigned long data);
- void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon);
- void ath_paprd_calibrate(struct work_struct *work);
- void ath_ani_calibrate(unsigned long data);
--void ath_start_ani(struct ath_common *common);
-+void ath_start_ani(struct ath_softc *sc);
-+void ath_stop_ani(struct ath_softc *sc);
-+void ath_check_ani(struct ath_softc *sc);
- int ath_update_survey_stats(struct ath_softc *sc);
- void ath_update_survey_nf(struct ath_softc *sc, int channel);
-+void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
- /**********/
- /* BTCOEX */
-@@ -619,7 +627,6 @@ enum sc_op_flags {
-       SC_OP_INVALID,
-       SC_OP_BEACONS,
-       SC_OP_RXFLUSH,
--      SC_OP_TSF_RESET,
-       SC_OP_ANI_RUN,
-       SC_OP_PRIM_STA_VIF,
-       SC_OP_HW_RESET,
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -30,7 +30,7 @@ static void ath9k_reset_beacon_status(st
-  *  the operating mode of the station (AP or AdHoc).  Parameters are AIFS
-  *  settings and channel width min/max
- */
--int ath_beaconq_config(struct ath_softc *sc)
-+static void ath9k_beaconq_config(struct ath_softc *sc)
- {
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-@@ -38,6 +38,7 @@ int ath_beaconq_config(struct ath_softc 
-       struct ath_txq *txq;
-       ath9k_hw_get_txq_props(ah, sc->beacon.beaconq, &qi);
-+
-       if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
-               /* Always burst out beacon and CAB traffic. */
-               qi.tqi_aifs = 1;
-@@ -56,12 +57,9 @@ int ath_beaconq_config(struct ath_softc 
-       }
-       if (!ath9k_hw_set_txq_props(ah, sc->beacon.beaconq, &qi)) {
--              ath_err(common,
--                      "Unable to update h/w beacon queue parameters\n");
--              return 0;
-+              ath_err(common, "Unable to update h/w beacon queue parameters\n");
-       } else {
-               ath9k_hw_resettxqueue(ah, sc->beacon.beaconq);
--              return 1;
-       }
- }
-@@ -70,7 +68,7 @@ int ath_beaconq_config(struct ath_softc 
-  *  up rate codes, and channel flags. Beacons are always sent out at the
-  *  lowest rate, and are not retried.
- */
--static void ath_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,
-+static void ath9k_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,
-                            struct ath_buf *bf, int rateidx)
- {
-       struct sk_buff *skb = bf->bf_mpdu;
-@@ -81,8 +79,6 @@ static void ath_beacon_setup(struct ath_
-       u8 chainmask = ah->txchainmask;
-       u8 rate = 0;
--      ath9k_reset_beacon_status(sc);
--
-       sband = &sc->sbands[common->hw->conf.channel->band];
-       rate = sband->bitrates[rateidx].hw_value;
-       if (vif->bss_conf.use_short_preamble)
-@@ -111,7 +107,7 @@ static void ath_beacon_setup(struct ath_
-       ath9k_hw_set_txdesc(ah, bf->bf_desc, &info);
- }
--static void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
-+static void ath9k_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
- {
-       struct ath_softc *sc = hw->priv;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-@@ -128,28 +124,22 @@ static void ath_tx_cabq(struct ieee80211
-       }
- }
--static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,
--                                         struct ieee80211_vif *vif)
-+static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
-+                                           struct ieee80211_vif *vif)
- {
-       struct ath_softc *sc = hw->priv;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       struct ath_buf *bf;
--      struct ath_vif *avp;
-+      struct ath_vif *avp = (void *)vif->drv_priv;
-       struct sk_buff *skb;
--      struct ath_txq *cabq;
-+      struct ath_txq *cabq = sc->beacon.cabq;
-       struct ieee80211_tx_info *info;
-+      struct ieee80211_mgmt *mgmt_hdr;
-       int cabq_depth;
--      ath9k_reset_beacon_status(sc);
--
--      avp = (void *)vif->drv_priv;
--      cabq = sc->beacon.cabq;
--
--      if ((avp->av_bcbuf == NULL) || !avp->is_bslot_active)
-+      if (avp->av_bcbuf == NULL)
-               return NULL;
--      /* Release the old beacon first */
--
-       bf = avp->av_bcbuf;
-       skb = bf->bf_mpdu;
-       if (skb) {
-@@ -159,14 +149,14 @@ static struct ath_buf *ath_beacon_genera
-               bf->bf_buf_addr = 0;
-       }
--      /* Get a new beacon from mac80211 */
--
-       skb = ieee80211_beacon_get(hw, vif);
--      bf->bf_mpdu = skb;
-       if (skb == NULL)
-               return NULL;
--      ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp =
--              avp->tsf_adjust;
-+
-+      bf->bf_mpdu = skb;
-+
-+      mgmt_hdr = (struct ieee80211_mgmt *)skb->data;
-+      mgmt_hdr->u.beacon.timestamp = avp->tsf_adjust;
-       info = IEEE80211_SKB_CB(skb);
-       if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
-@@ -212,61 +202,52 @@ static struct ath_buf *ath_beacon_genera
-               }
-       }
--      ath_beacon_setup(sc, vif, bf, info->control.rates[0].idx);
-+      ath9k_beacon_setup(sc, vif, bf, info->control.rates[0].idx);
-       while (skb) {
--              ath_tx_cabq(hw, skb);
-+              ath9k_tx_cabq(hw, skb);
-               skb = ieee80211_get_buffered_bc(hw, vif);
-       }
-       return bf;
- }
--int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
-+void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
- {
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--      struct ath_vif *avp;
--      struct ath_buf *bf;
--      struct sk_buff *skb;
--      struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
--      __le64 tstamp;
-+      struct ath_vif *avp = (void *)vif->drv_priv;
-+      int slot;
--      avp = (void *)vif->drv_priv;
-+      avp->av_bcbuf = list_first_entry(&sc->beacon.bbuf, struct ath_buf, list);
-+      list_del(&avp->av_bcbuf->list);
--      /* Allocate a beacon descriptor if we haven't done so. */
--      if (!avp->av_bcbuf) {
--              /* Allocate beacon state for hostap/ibss.  We know
--               * a buffer is available. */
--              avp->av_bcbuf = list_first_entry(&sc->beacon.bbuf,
--                                               struct ath_buf, list);
--              list_del(&avp->av_bcbuf->list);
--
--              if (ath9k_uses_beacons(vif->type)) {
--                      int slot;
--                      /*
--                       * Assign the vif to a beacon xmit slot. As
--                       * above, this cannot fail to find one.
--                       */
--                      avp->av_bslot = 0;
--                      for (slot = 0; slot < ATH_BCBUF; slot++)
--                              if (sc->beacon.bslot[slot] == NULL) {
--                                      avp->av_bslot = slot;
--                                      avp->is_bslot_active = false;
--
--                                      /* NB: keep looking for a double slot */
--                                      if (slot == 0 || !sc->beacon.bslot[slot-1])
--                                              break;
--                              }
--                      BUG_ON(sc->beacon.bslot[avp->av_bslot] != NULL);
--                      sc->beacon.bslot[avp->av_bslot] = vif;
--                      sc->nbcnvifs++;
-+      for (slot = 0; slot < ATH_BCBUF; slot++) {
-+              if (sc->beacon.bslot[slot] == NULL) {
-+                      avp->av_bslot = slot;
-+                      break;
-               }
-       }
--      /* release the previous beacon frame, if it already exists. */
--      bf = avp->av_bcbuf;
--      if (bf->bf_mpdu != NULL) {
--              skb = bf->bf_mpdu;
-+      sc->beacon.bslot[avp->av_bslot] = vif;
-+      sc->nbcnvifs++;
-+
-+      ath_dbg(common, CONFIG, "Added interface at beacon slot: %d\n",
-+              avp->av_bslot);
-+}
-+
-+void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
-+{
-+      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+      struct ath_vif *avp = (void *)vif->drv_priv;
-+      struct ath_buf *bf = avp->av_bcbuf;
-+
-+      ath_dbg(common, CONFIG, "Removing interface at beacon slot: %d\n",
-+              avp->av_bslot);
-+
-+      tasklet_disable(&sc->bcon_tasklet);
-+
-+      if (bf && bf->bf_mpdu) {
-+              struct sk_buff *skb = bf->bf_mpdu;
-               dma_unmap_single(sc->dev, bf->bf_buf_addr,
-                                skb->len, DMA_TO_DEVICE);
-               dev_kfree_skb_any(skb);
-@@ -274,99 +255,74 @@ int ath_beacon_alloc(struct ath_softc *s
-               bf->bf_buf_addr = 0;
-       }
--      /* NB: the beacon data buffer must be 32-bit aligned. */
--      skb = ieee80211_beacon_get(sc->hw, vif);
--      if (skb == NULL)
--              return -ENOMEM;
--
--      tstamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
--      sc->beacon.bc_tstamp = (u32) le64_to_cpu(tstamp);
--      /* Calculate a TSF adjustment factor required for staggered beacons. */
--      if (avp->av_bslot > 0) {
--              u64 tsfadjust;
--              int intval;
-+      avp->av_bcbuf = NULL;
-+      sc->beacon.bslot[avp->av_bslot] = NULL;
-+      sc->nbcnvifs--;
-+      list_add_tail(&bf->list, &sc->beacon.bbuf);
--              intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
-+      tasklet_enable(&sc->bcon_tasklet);
-+}
--              /*
--               * Calculate the TSF offset for this beacon slot, i.e., the
--               * number of usecs that need to be added to the timestamp field
--               * in Beacon and Probe Response frames. Beacon slot 0 is
--               * processed at the correct offset, so it does not require TSF
--               * adjustment. Other slots are adjusted to get the timestamp
--               * close to the TBTT for the BSS.
--               */
--              tsfadjust = TU_TO_USEC(intval * avp->av_bslot) / ATH_BCBUF;
--              avp->tsf_adjust = cpu_to_le64(tsfadjust);
-+static int ath9k_beacon_choose_slot(struct ath_softc *sc)
-+{
-+      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+      struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-+      u16 intval;
-+      u32 tsftu;
-+      u64 tsf;
-+      int slot;
--              ath_dbg(common, BEACON,
--                      "stagger beacons, bslot %d intval %u tsfadjust %llu\n",
--                      avp->av_bslot, intval, (unsigned long long)tsfadjust);
-+      if (sc->sc_ah->opmode != NL80211_IFTYPE_AP) {
-+              ath_dbg(common, BEACON, "slot 0, tsf: %llu\n",
-+                      ath9k_hw_gettsf64(sc->sc_ah));
-+              return 0;
-+      }
--              ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp =
--                      avp->tsf_adjust;
--      } else
--              avp->tsf_adjust = cpu_to_le64(0);
-+      intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
-+      tsf = ath9k_hw_gettsf64(sc->sc_ah);
-+      tsf += TU_TO_USEC(sc->sc_ah->config.sw_beacon_response_time);
-+      tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
-+      slot = (tsftu % (intval * ATH_BCBUF)) / intval;
--      bf->bf_mpdu = skb;
--      bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
--                                       skb->len, DMA_TO_DEVICE);
--      if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {
--              dev_kfree_skb_any(skb);
--              bf->bf_mpdu = NULL;
--              bf->bf_buf_addr = 0;
--              ath_err(common, "dma_mapping_error on beacon alloc\n");
--              return -ENOMEM;
--      }
--      avp->is_bslot_active = true;
-+      ath_dbg(common, BEACON, "slot: %d tsf: %llu tsftu: %u\n",
-+              slot, tsf, tsftu / ATH_BCBUF);
--      return 0;
-+      return slot;
- }
--void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp)
-+void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif)
- {
--      if (avp->av_bcbuf != NULL) {
--              struct ath_buf *bf;
-+      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+      struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-+      struct ath_vif *avp = (void *)vif->drv_priv;
-+      u64 tsfadjust;
--              avp->is_bslot_active = false;
--              if (avp->av_bslot != -1) {
--                      sc->beacon.bslot[avp->av_bslot] = NULL;
--                      sc->nbcnvifs--;
--                      avp->av_bslot = -1;
--              }
-+      if (avp->av_bslot == 0)
-+              return;
--              bf = avp->av_bcbuf;
--              if (bf->bf_mpdu != NULL) {
--                      struct sk_buff *skb = bf->bf_mpdu;
--                      dma_unmap_single(sc->dev, bf->bf_buf_addr,
--                                       skb->len, DMA_TO_DEVICE);
--                      dev_kfree_skb_any(skb);
--                      bf->bf_mpdu = NULL;
--                      bf->bf_buf_addr = 0;
--              }
--              list_add_tail(&bf->list, &sc->beacon.bbuf);
-+      tsfadjust = cur_conf->beacon_interval * avp->av_bslot / ATH_BCBUF;
-+      avp->tsf_adjust = cpu_to_le64(TU_TO_USEC(tsfadjust));
--              avp->av_bcbuf = NULL;
--      }
-+      ath_dbg(common, CONFIG, "tsfadjust is: %llu for bslot: %d\n",
-+              (unsigned long long)tsfadjust, avp->av_bslot);
- }
--void ath_beacon_tasklet(unsigned long data)
-+void ath9k_beacon_tasklet(unsigned long data)
- {
-       struct ath_softc *sc = (struct ath_softc *)data;
--      struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-       struct ath_buf *bf = NULL;
-       struct ieee80211_vif *vif;
-       bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
-       int slot;
--      u32 bfaddr, bc = 0;
--      if (work_pending(&sc->hw_reset_work)) {
-+      if (test_bit(SC_OP_HW_RESET, &sc->sc_flags)) {
-               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
-@@ -390,55 +346,25 @@ void ath_beacon_tasklet(unsigned long da
-               } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
-                       ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
-                       sc->beacon.bmisscnt = 0;
--                      set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
--                      ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+                      ath9k_queue_reset(sc, RESET_TYPE_BEACON_STUCK);
-               }
-               return;
-       }
--      /*
--       * Generate beacon frames. we are sending frames
--       * staggered so calculate the slot for this frame based
--       * on the tsf to safeguard against missing an swba.
--       */
--
--
--      if (ah->opmode == NL80211_IFTYPE_AP) {
--              u16 intval;
--              u32 tsftu;
--              u64 tsf;
--
--              intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
--              tsf = ath9k_hw_gettsf64(ah);
--              tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
--              tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
--              slot = (tsftu % (intval * ATH_BCBUF)) / intval;
--              vif = sc->beacon.bslot[slot];
--
--              ath_dbg(common, BEACON,
--                      "slot %d [tsf %llu tsftu %u intval %u] vif %p\n",
--                      slot, tsf, tsftu / ATH_BCBUF, intval, vif);
--      } else {
--              slot = 0;
--              vif = sc->beacon.bslot[slot];
--      }
-+      slot = ath9k_beacon_choose_slot(sc);
-+      vif = sc->beacon.bslot[slot];
-+      if (!vif || !vif->bss_conf.enable_beacon)
-+              return;
--      bfaddr = 0;
--      if (vif) {
--              bf = ath_beacon_generate(sc->hw, vif);
--              if (bf != NULL) {
--                      bfaddr = bf->bf_daddr;
--                      bc = 1;
--              }
-+      bf = ath9k_beacon_generate(sc->hw, vif);
-+      WARN_ON(!bf);
--              if (sc->beacon.bmisscnt != 0) {
--                      ath_dbg(common, BSTUCK,
--                              "resume beacon xmit after %u misses\n",
--                              sc->beacon.bmisscnt);
--                      sc->beacon.bmisscnt = 0;
--              }
-+      if (sc->beacon.bmisscnt != 0) {
-+              ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
-+                      sc->beacon.bmisscnt);
-+              sc->beacon.bmisscnt = 0;
-       }
-       /*
-@@ -458,39 +384,37 @@ void ath_beacon_tasklet(unsigned long da
-        *     set to ATH_BCBUF so this check is a noop.
-        */
-       if (sc->beacon.updateslot == UPDATE) {
--              sc->beacon.updateslot = COMMIT; /* commit next beacon */
-+              sc->beacon.updateslot = COMMIT;
-               sc->beacon.slotupdate = slot;
--      } else if (sc->beacon.updateslot == COMMIT && sc->beacon.slotupdate == slot) {
-+      } else if (sc->beacon.updateslot == COMMIT &&
-+                 sc->beacon.slotupdate == slot) {
-               ah->slottime = sc->beacon.slottime;
-               ath9k_hw_init_global_settings(ah);
-               sc->beacon.updateslot = OK;
-       }
--      if (bfaddr != 0) {
-+
-+      if (bf) {
-+              ath9k_reset_beacon_status(sc);
-+
-               /* NB: cabq traffic should already be queued and primed */
--              ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bfaddr);
-+              ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bf->bf_daddr);
-               if (!edma)
-                       ath9k_hw_txstart(ah, sc->beacon.beaconq);
--
--              sc->beacon.ast_be_xmit += bc;     /* XXX per-vif? */
-       }
- }
--static void ath9k_beacon_init(struct ath_softc *sc,
--                            u32 next_beacon,
--                            u32 beacon_period)
-+static void ath9k_beacon_init(struct ath_softc *sc, u32 nexttbtt, u32 intval)
- {
--      if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
--              ath9k_ps_wakeup(sc);
--              ath9k_hw_reset_tsf(sc->sc_ah);
--      }
--
--      ath9k_hw_beaconinit(sc->sc_ah, next_beacon, beacon_period);
-+      struct ath_hw *ah = sc->sc_ah;
--      if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
--              ath9k_ps_restore(sc);
--              clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
--      }
-+      ath9k_hw_disable_interrupts(ah);
-+      ath9k_hw_reset_tsf(ah);
-+      ath9k_beaconq_config(sc);
-+      ath9k_hw_beaconinit(ah, nexttbtt, intval);
-+      sc->beacon.bmisscnt = 0;
-+      ath9k_hw_set_interrupts(ah);
-+      ath9k_hw_enable_interrupts(ah);
- }
- /*
-@@ -498,32 +422,27 @@ static void ath9k_beacon_init(struct ath
-  * burst together.  For the former arrange for the SWBA to be delivered for each
-  * slot. Slots that are not occupied will generate nothing.
-  */
--static void ath_beacon_config_ap(struct ath_softc *sc,
--                               struct ath_beacon_config *conf)
-+static void ath9k_beacon_config_ap(struct ath_softc *sc,
-+                                 struct ath_beacon_config *conf)
- {
-       struct ath_hw *ah = sc->sc_ah;
-+      struct ath_common *common = ath9k_hw_common(ah);
-       u32 nexttbtt, intval;
-       /* NB: the beacon interval is kept internally in TU's */
-       intval = TU_TO_USEC(conf->beacon_interval);
--      intval /= ATH_BCBUF;    /* for staggered beacons */
-+      intval /= ATH_BCBUF;
-       nexttbtt = intval;
--      /*
--       * In AP mode we enable the beacon timers and SWBA interrupts to
--       * prepare beacon frames.
--       */
--      ah->imask |= ATH9K_INT_SWBA;
--      ath_beaconq_config(sc);
-+      if (conf->enable_beacon)
-+              ah->imask |= ATH9K_INT_SWBA;
-+      else
-+              ah->imask &= ~ATH9K_INT_SWBA;
--      /* Set the computed AP beacon timers */
-+      ath_dbg(common, BEACON, "AP nexttbtt: %u intval: %u conf_intval: %u\n",
-+              nexttbtt, intval, conf->beacon_interval);
--      ath9k_hw_disable_interrupts(ah);
--      set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
-       ath9k_beacon_init(sc, nexttbtt, intval);
--      sc->beacon.bmisscnt = 0;
--      ath9k_hw_set_interrupts(ah);
--      ath9k_hw_enable_interrupts(ah);
- }
- /*
-@@ -534,8 +453,8 @@ static void ath_beacon_config_ap(struct 
-  * we'll receive a BMISS interrupt when we stop seeing beacons from the AP
-  * we've associated with.
-  */
--static void ath_beacon_config_sta(struct ath_softc *sc,
--                                struct ath_beacon_config *conf)
-+static void ath9k_beacon_config_sta(struct ath_softc *sc,
-+                                  struct ath_beacon_config *conf)
- {
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-@@ -654,8 +573,8 @@ static void ath_beacon_config_sta(struct
-       ath9k_hw_enable_interrupts(ah);
- }
--static void ath_beacon_config_adhoc(struct ath_softc *sc,
--                                  struct ath_beacon_config *conf)
-+static void ath9k_beacon_config_adhoc(struct ath_softc *sc,
-+                                    struct ath_beacon_config *conf)
- {
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-@@ -669,82 +588,53 @@ static void ath_beacon_config_adhoc(stru
-       tsf = roundup(ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE), intval);
-       nexttbtt = tsf + intval;
--      ath_dbg(common, BEACON, "IBSS nexttbtt %u intval %u (%u)\n",
--              nexttbtt, intval, conf->beacon_interval);
--
--      /*
--       * In IBSS mode enable the beacon timers but only enable SWBA interrupts
--       * if we need to manually prepare beacon frames.  Otherwise we use a
--       * self-linked tx descriptor and let the hardware deal with things.
--       */
--      ah->imask |= ATH9K_INT_SWBA;
--
--      ath_beaconq_config(sc);
-+      if (conf->enable_beacon)
-+              ah->imask |= ATH9K_INT_SWBA;
-+      else
-+              ah->imask &= ~ATH9K_INT_SWBA;
--      /* Set the computed ADHOC beacon timers */
-+      ath_dbg(common, BEACON, "IBSS nexttbtt: %u intval: %u conf_intval: %u\n",
-+              nexttbtt, intval, conf->beacon_interval);
--      ath9k_hw_disable_interrupts(ah);
-       ath9k_beacon_init(sc, nexttbtt, intval);
--      sc->beacon.bmisscnt = 0;
--
--      ath9k_hw_set_interrupts(ah);
--      ath9k_hw_enable_interrupts(ah);
- }
--static bool ath9k_allow_beacon_config(struct ath_softc *sc,
--                                    struct ieee80211_vif *vif)
-+bool ath9k_allow_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif)
- {
--      struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--      struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-       struct ath_vif *avp = (void *)vif->drv_priv;
--      /*
--       * Can not have different beacon interval on multiple
--       * AP interface case
--       */
--      if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
--          (sc->nbcnvifs > 1) &&
--          (vif->type == NL80211_IFTYPE_AP) &&
--          (cur_conf->beacon_interval != bss_conf->beacon_int)) {
--              ath_dbg(common, CONFIG,
--                      "Changing beacon interval of multiple AP interfaces !\n");
--              return false;
--      }
--      /*
--       * Can not configure station vif's beacon config
--       * while on AP opmode
--       */
--      if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
--          (vif->type != NL80211_IFTYPE_AP)) {
--              ath_dbg(common, CONFIG,
--                      "STA vif's beacon not allowed on AP mode\n");
--              return false;
-+      if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
-+              if ((vif->type != NL80211_IFTYPE_AP) ||
-+                  (sc->nbcnvifs > 1)) {
-+                      ath_dbg(common, CONFIG,
-+                              "An AP interface is already present !\n");
-+                      return false;
-+              }
-       }
--      /*
--       * Do not allow beacon config if HW was already configured
--       * with another STA vif
--       */
--      if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) &&
--          (vif->type == NL80211_IFTYPE_STATION) &&
--          test_bit(SC_OP_BEACONS, &sc->sc_flags) &&
--          !avp->primary_sta_vif) {
--              ath_dbg(common, CONFIG,
--                      "Beacon already configured for a station interface\n");
--              return false;
-+
-+      if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
-+              if ((vif->type == NL80211_IFTYPE_STATION) &&
-+                  test_bit(SC_OP_BEACONS, &sc->sc_flags) &&
-+                  !avp->primary_sta_vif) {
-+                      ath_dbg(common, CONFIG,
-+                              "Beacon already configured for a station interface\n");
-+                      return false;
-+              }
-       }
-+
-       return true;
- }
--void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif)
-+static void ath9k_cache_beacon_config(struct ath_softc *sc,
-+                                    struct ieee80211_bss_conf *bss_conf)
- {
-+      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
--      struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
--      if (!ath9k_allow_beacon_config(sc, vif))
--              return;
-+      ath_dbg(common, BEACON,
-+              "Caching beacon data for BSS: %pM\n", bss_conf->bssid);
--      /* Setup the beacon configuration parameters */
-       cur_conf->beacon_interval = bss_conf->beacon_int;
-       cur_conf->dtim_period = bss_conf->dtim_period;
-       cur_conf->listen_interval = 1;
-@@ -769,73 +659,59 @@ void ath_beacon_config(struct ath_softc 
-       if (cur_conf->dtim_period == 0)
-               cur_conf->dtim_period = 1;
--      ath_set_beacon(sc);
- }
--static bool ath_has_valid_bslot(struct ath_softc *sc)
-+void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
-+                       u32 changed)
- {
--      struct ath_vif *avp;
--      int slot;
--      bool found = false;
-+      struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-+      struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
--      for (slot = 0; slot < ATH_BCBUF; slot++) {
--              if (sc->beacon.bslot[slot]) {
--                      avp = (void *)sc->beacon.bslot[slot]->drv_priv;
--                      if (avp->is_bslot_active) {
--                              found = true;
--                              break;
--                      }
-+      ath9k_cache_beacon_config(sc, bss_conf);
-+
-+      if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
-+              ath9k_set_beacon(sc);
-+              set_bit(SC_OP_BEACONS, &sc->sc_flags);
-+      } else {
-+              /*
-+               * Take care of multiple interfaces when
-+               * enabling/disabling SWBA.
-+               */
-+              if (changed & BSS_CHANGED_BEACON_ENABLED) {
-+                      if (!bss_conf->enable_beacon &&
-+                          (sc->nbcnvifs <= 1))
-+                              cur_conf->enable_beacon = false;
-+                      else if (bss_conf->enable_beacon)
-+                              cur_conf->enable_beacon = true;
-               }
-+
-+              ath9k_set_beacon(sc);
-+
-+              if (cur_conf->enable_beacon)
-+                      set_bit(SC_OP_BEACONS, &sc->sc_flags);
-+              else
-+                      clear_bit(SC_OP_BEACONS, &sc->sc_flags);
-       }
--      return found;
- }
--
--void ath_set_beacon(struct ath_softc *sc)
-+void ath9k_set_beacon(struct ath_softc *sc)
- {
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-       switch (sc->sc_ah->opmode) {
-       case NL80211_IFTYPE_AP:
--              if (ath_has_valid_bslot(sc))
--                      ath_beacon_config_ap(sc, cur_conf);
-+              ath9k_beacon_config_ap(sc, cur_conf);
-               break;
-       case NL80211_IFTYPE_ADHOC:
-       case NL80211_IFTYPE_MESH_POINT:
--              ath_beacon_config_adhoc(sc, cur_conf);
-+              ath9k_beacon_config_adhoc(sc, cur_conf);
-               break;
-       case NL80211_IFTYPE_STATION:
--              ath_beacon_config_sta(sc, cur_conf);
-+              ath9k_beacon_config_sta(sc, cur_conf);
-               break;
-       default:
-               ath_dbg(common, CONFIG, "Unsupported beaconing mode\n");
-               return;
-       }
--
--      set_bit(SC_OP_BEACONS, &sc->sc_flags);
--}
--
--void ath9k_set_beaconing_status(struct ath_softc *sc, bool status)
--{
--      struct ath_hw *ah = sc->sc_ah;
--
--      if (!ath_has_valid_bslot(sc)) {
--              clear_bit(SC_OP_BEACONS, &sc->sc_flags);
--              return;
--      }
--
--      ath9k_ps_wakeup(sc);
--      if (status) {
--              /* Re-enable beaconing */
--              ah->imask |= ATH9K_INT_SWBA;
--              ath9k_hw_set_interrupts(ah);
--      } else {
--              /* Disable SWBA interrupt */
--              ah->imask &= ~ATH9K_INT_SWBA;
--              ath9k_hw_set_interrupts(ah);
--              tasklet_kill(&sc->bcon_tasklet);
--              ath9k_hw_stop_dma_queue(ah, sc->beacon.beaconq);
--      }
--      ath9k_ps_restore(sc);
- }
---- a/drivers/net/wireless/ath/ath9k/calib.h
-+++ b/drivers/net/wireless/ath/ath9k/calib.h
-@@ -30,10 +30,10 @@ struct ar5416IniArray {
-       u32 ia_columns;
- };
--#define INIT_INI_ARRAY(iniarray, array, rows, columns) do {   \
-+#define INIT_INI_ARRAY(iniarray, array) do {  \
-               (iniarray)->ia_array = (u32 *)(array);          \
--              (iniarray)->ia_rows = (rows);                   \
--              (iniarray)->ia_columns = (columns);             \
-+              (iniarray)->ia_rows = ARRAY_SIZE(array);        \
-+              (iniarray)->ia_columns = ARRAY_SIZE(array[0]);  \
-       } while (0)
- #define INI_RA(iniarray, row, column) \
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -206,10 +206,9 @@ static ssize_t write_file_disable_ani(st
-       if (disable_ani) {
-               clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--              del_timer_sync(&common->ani.timer);
-+              ath_stop_ani(sc);
-       } else {
--              set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--              ath_start_ani(common);
-+              ath_check_ani(sc);
-       }
-       return count;
-@@ -1556,6 +1555,14 @@ int ath9k_init_debug(struct ath_hw *ah)
-                           &fops_interrupt);
-       debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,
-                           &fops_xmit);
-+      debugfs_create_u32("qlen_bk", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+                         &sc->tx.txq_max_pending[WME_AC_BK]);
-+      debugfs_create_u32("qlen_be", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+                         &sc->tx.txq_max_pending[WME_AC_BE]);
-+      debugfs_create_u32("qlen_vi", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+                         &sc->tx.txq_max_pending[WME_AC_VI]);
-+      debugfs_create_u32("qlen_vo", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+                         &sc->tx.txq_max_pending[WME_AC_VO]);
-       debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy, sc,
-                           &fops_stations);
-       debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,
---- a/drivers/net/wireless/ath/ath9k/debug.h
-+++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -32,6 +32,19 @@ struct ath_buf;
- #define RESET_STAT_INC(sc, type) do { } while (0)
- #endif
-+enum ath_reset_type {
-+      RESET_TYPE_BB_HANG,
-+      RESET_TYPE_BB_WATCHDOG,
-+      RESET_TYPE_FATAL_INT,
-+      RESET_TYPE_TX_ERROR,
-+      RESET_TYPE_TX_HANG,
-+      RESET_TYPE_PLL_HANG,
-+      RESET_TYPE_MAC_HANG,
-+      RESET_TYPE_BEACON_STUCK,
-+      RESET_TYPE_MCI,
-+      __RESET_TYPE_MAX
-+};
-+
- #ifdef CONFIG_ATH9K_DEBUGFS
- /**
-@@ -209,17 +222,6 @@ struct ath_rx_stats {
-       u32 rx_frags;
- };
--enum ath_reset_type {
--      RESET_TYPE_BB_HANG,
--      RESET_TYPE_BB_WATCHDOG,
--      RESET_TYPE_FATAL_INT,
--      RESET_TYPE_TX_ERROR,
--      RESET_TYPE_TX_HANG,
--      RESET_TYPE_PLL_HANG,
--      RESET_TYPE_MAC_HANG,
--      __RESET_TYPE_MAX
--};
--
- struct ath_stats {
-       struct ath_interrupt_stats istats;
-       struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];
---- a/drivers/net/wireless/ath/ath9k/eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
-@@ -241,16 +241,12 @@ enum eeprom_param {
-       EEP_TEMPSENSE_SLOPE,
-       EEP_TEMPSENSE_SLOPE_PAL_ON,
-       EEP_PWR_TABLE_OFFSET,
--      EEP_DRIVE_STRENGTH,
--      EEP_INTERNAL_REGULATOR,
--      EEP_SWREG,
-       EEP_PAPRD,
-       EEP_MODAL_VER,
-       EEP_ANT_DIV_CTL1,
-       EEP_CHAIN_MASK_REDUCE,
-       EEP_ANTENNA_GAIN_2G,
-       EEP_ANTENNA_GAIN_5G,
--      EEP_QUICK_DROP
- };
- enum ar5416_rates {
---- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-@@ -1111,7 +1111,7 @@ static int ath9k_htc_add_interface(struc
-       if ((priv->ah->opmode == NL80211_IFTYPE_AP) &&
-           !test_bit(OP_ANI_RUNNING, &priv->op_flags)) {
--              ath9k_hw_set_tsfadjust(priv->ah, 1);
-+              ath9k_hw_set_tsfadjust(priv->ah, true);
-               ath9k_htc_start_ani(priv);
-       }
-@@ -1351,7 +1351,7 @@ static int ath9k_htc_conf_tx(struct ieee
-       qi.tqi_aifs = params->aifs;
-       qi.tqi_cwmin = params->cw_min;
-       qi.tqi_cwmax = params->cw_max;
--      qi.tqi_burstTime = params->txop;
-+      qi.tqi_burstTime = params->txop * 32;
-       qnum = get_hw_qnum(queue, priv->hwq_map);
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -463,9 +463,6 @@ static void ath9k_hw_init_config(struct 
-               ah->config.spurchans[i][1] = AR_NO_SPUR;
-       }
--      /* PAPRD needs some more work to be enabled */
--      ah->config.paprd_disable = 1;
--
-       ah->config.rx_intr_mitigation = true;
-       ah->config.pcieSerDesWrite = true;
-@@ -671,10 +668,6 @@ static int __ath9k_hw_init(struct ath_hw
-       if (!AR_SREV_9300_20_OR_LATER(ah))
-               ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
--      /* disable ANI for 9340 */
--      if (AR_SREV_9340(ah))
--              ah->config.enable_ani = false;
--
-       ath9k_hw_init_mode_regs(ah);
-       if (!ah->is_pciexpress)
-@@ -1781,6 +1774,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-               /* Operating channel changed, reset channel calibration data */
-               memset(caldata, 0, sizeof(*caldata));
-               ath9k_init_nfcal_hist_buffer(ah, chan);
-+      } else if (caldata) {
-+              caldata->paprd_packet_sent = false;
-       }
-       ah->noise = ath9k_hw_getchan_noise(ah, chan);
-@@ -2505,7 +2500,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw
-               pCap->tx_desc_len = sizeof(struct ar9003_txc);
-               pCap->txs_len = sizeof(struct ar9003_txs);
-               if (!ah->config.paprd_disable &&
--                  ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
-+                  ah->eep_ops->get_eeprom(ah, EEP_PAPRD) &&
-+                  !AR_SREV_9462(ah))
-                       pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
-       } else {
-               pCap->tx_desc_len = sizeof(struct ath_desc);
-@@ -2916,9 +2912,9 @@ void ath9k_hw_reset_tsf(struct ath_hw *a
- }
- EXPORT_SYMBOL(ath9k_hw_reset_tsf);
--void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting)
-+void ath9k_hw_set_tsfadjust(struct ath_hw *ah, bool set)
- {
--      if (setting)
-+      if (set)
-               ah->misc_mode |= AR_PCU_TX_ADD_TSF;
-       else
-               ah->misc_mode &= ~AR_PCU_TX_ADD_TSF;
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -404,6 +404,7 @@ struct ath9k_hw_cal_data {
-       int8_t iCoff;
-       int8_t qCoff;
-       bool rtt_done;
-+      bool paprd_packet_sent;
-       bool paprd_done;
-       bool nfcal_pending;
-       bool nfcal_interference;
-@@ -994,7 +995,7 @@ u32 ath9k_hw_gettsf32(struct ath_hw *ah)
- u64 ath9k_hw_gettsf64(struct ath_hw *ah);
- void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
- void ath9k_hw_reset_tsf(struct ath_hw *ah);
--void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting);
-+void ath9k_hw_set_tsfadjust(struct ath_hw *ah, bool set);
- void ath9k_hw_init_global_settings(struct ath_hw *ah);
- u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah);
- void ath9k_hw_set11nmac2040(struct ath_hw *ah);
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -436,6 +436,7 @@ static int ath9k_init_queues(struct ath_
-       for (i = 0; i < WME_NUM_AC; i++) {
-               sc->tx.txq_map[i] = ath_txq_setup(sc, ATH9K_TX_QUEUE_DATA, i);
-               sc->tx.txq_map[i]->mac80211_qnum = i;
-+              sc->tx.txq_max_pending[i] = ATH_MAX_QDEPTH;
-       }
-       return 0;
- }
-@@ -560,7 +561,7 @@ static int ath9k_init_softc(u16 devid, s
-       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,
-+      tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
-                    (unsigned long)sc);
-       INIT_WORK(&sc->hw_reset_work, ath_reset_work);
---- a/drivers/net/wireless/ath/ath9k/link.c
-+++ b/drivers/net/wireless/ath/ath9k/link.c
-@@ -50,8 +50,7 @@ void ath_tx_complete_poll_work(struct wo
-       if (needreset) {
-               ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
-                       "tx hung, resetting the chip\n");
--              RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);
--              ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+              ath9k_queue_reset(sc, RESET_TYPE_TX_HANG);
-               return;
-       }
-@@ -69,6 +68,7 @@ void ath_hw_check(struct work_struct *wo
-       unsigned long flags;
-       int busy;
-       u8 is_alive, nbeacon = 1;
-+      enum ath_reset_type type;
-       ath9k_ps_wakeup(sc);
-       is_alive = ath9k_hw_check_alive(sc->sc_ah);
-@@ -78,7 +78,7 @@ void ath_hw_check(struct work_struct *wo
-       else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
-               ath_dbg(common, RESET,
-                       "DCU stuck is detected. Schedule chip reset\n");
--              RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
-+              type = RESET_TYPE_MAC_HANG;
-               goto sched_reset;
-       }
-@@ -90,7 +90,7 @@ void ath_hw_check(struct work_struct *wo
-               busy, sc->hw_busy_count + 1);
-       if (busy >= 99) {
-               if (++sc->hw_busy_count >= 3) {
--                      RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
-+                      type = RESET_TYPE_BB_HANG;
-                       goto sched_reset;
-               }
-       } else if (busy >= 0) {
-@@ -102,7 +102,7 @@ void ath_hw_check(struct work_struct *wo
-       goto out;
- sched_reset:
--      ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+      ath9k_queue_reset(sc, type);
- out:
-       ath9k_ps_restore(sc);
- }
-@@ -119,8 +119,7 @@ static bool ath_hw_pll_rx_hang_check(str
-               count++;
-               if (count == 3) {
-                       ath_dbg(common, RESET, "PLL WAR, resetting the chip\n");
--                      RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
--                      ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+                      ath9k_queue_reset(sc, RESET_TYPE_PLL_HANG);
-                       count = 0;
-                       return true;
-               }
-@@ -255,8 +254,9 @@ void ath_paprd_calibrate(struct work_str
-       int chain_ok = 0;
-       int chain;
-       int len = 1800;
-+      int ret;
--      if (!caldata)
-+      if (!caldata || !caldata->paprd_packet_sent || caldata->paprd_done)
-               return;
-       ath9k_ps_wakeup(sc);
-@@ -283,13 +283,6 @@ void ath_paprd_calibrate(struct work_str
-                       continue;
-               chain_ok = 0;
--
--              ath_dbg(common, CALIBRATE,
--                      "Sending PAPRD frame for thermal measurement on chain %d\n",
--                      chain);
--              if (!ath_paprd_send_frame(sc, skb, chain))
--                      goto fail_paprd;
--
-               ar9003_paprd_setup_gain_table(ah, chain);
-               ath_dbg(common, CALIBRATE,
-@@ -303,7 +296,13 @@ void ath_paprd_calibrate(struct work_str
-                       break;
-               }
--              if (ar9003_paprd_create_curve(ah, caldata, chain)) {
-+              ret = ar9003_paprd_create_curve(ah, caldata, chain);
-+              if (ret == -EINPROGRESS) {
-+                      ath_dbg(common, CALIBRATE,
-+                              "PAPRD curve on chain %d needs to be re-trained\n",
-+                              chain);
-+                      break;
-+              } else if (ret) {
-                       ath_dbg(common, CALIBRATE,
-                               "PAPRD create curve failed on chain %d\n",
-                               chain);
-@@ -432,26 +431,69 @@ set_timer:
-       }
- }
--void ath_start_ani(struct ath_common *common)
-+void ath_start_ani(struct ath_softc *sc)
- {
--      struct ath_hw *ah = common->ah;
-+      struct ath_hw *ah = sc->sc_ah;
-+      struct ath_common *common = ath9k_hw_common(ah);
-       unsigned long timestamp = jiffies_to_msecs(jiffies);
--      struct ath_softc *sc = (struct ath_softc *) common->priv;
--      if (!test_bit(SC_OP_ANI_RUN, &sc->sc_flags))
--              return;
--
--      if (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
-+      if (common->disable_ani ||
-+          !test_bit(SC_OP_ANI_RUN, &sc->sc_flags) ||
-+          (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
-               return;
-       common->ani.longcal_timer = timestamp;
-       common->ani.shortcal_timer = timestamp;
-       common->ani.checkani_timer = timestamp;
-+      ath_dbg(common, ANI, "Starting ANI\n");
-       mod_timer(&common->ani.timer,
-                 jiffies + msecs_to_jiffies((u32)ah->config.ani_poll_interval));
- }
-+void ath_stop_ani(struct ath_softc *sc)
-+{
-+      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+
-+      ath_dbg(common, ANI, "Stopping ANI\n");
-+      del_timer_sync(&common->ani.timer);
-+}
-+
-+void ath_check_ani(struct ath_softc *sc)
-+{
-+      struct ath_hw *ah = sc->sc_ah;
-+      struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
-+
-+      /*
-+       * Check for the various conditions in which ANI has to
-+       * be stopped.
-+       */
-+      if (ah->opmode == NL80211_IFTYPE_ADHOC) {
-+              if (!cur_conf->enable_beacon)
-+                      goto stop_ani;
-+      } else if (ah->opmode == NL80211_IFTYPE_AP) {
-+              if (!cur_conf->enable_beacon) {
-+                      /*
-+                       * Disable ANI only when there are no
-+                       * associated stations.
-+                       */
-+                      if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
-+                              goto stop_ani;
-+              }
-+      } else if (ah->opmode == NL80211_IFTYPE_STATION) {
-+              if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
-+                      goto stop_ani;
-+      }
-+
-+      set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-+      ath_start_ani(sc);
-+      return;
-+
-+stop_ani:
-+      clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
-+      ath_stop_ani(sc);
-+}
-+
- void ath_update_survey_nf(struct ath_softc *sc, int channel)
- {
-       struct ath_hw *ah = sc->sc_ah;
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -167,8 +167,6 @@ static void ath_cancel_work(struct ath_s
- static void ath_restart_work(struct ath_softc *sc)
- {
--      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--
-       ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
-       if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9485(sc->sc_ah) ||
-@@ -177,21 +175,18 @@ static void ath_restart_work(struct ath_
-                                    msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
-       ath_start_rx_poll(sc, 3);
--
--      if (!common->disable_ani)
--              ath_start_ani(common);
-+      ath_start_ani(sc);
- }
- static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
- {
-       struct ath_hw *ah = sc->sc_ah;
--      struct ath_common *common = ath9k_hw_common(ah);
-       bool ret = true;
-       ieee80211_stop_queues(sc->hw);
-       sc->hw_busy_count = 0;
--      del_timer_sync(&common->ani.timer);
-+      ath_stop_ani(sc);
-       del_timer_sync(&sc->rx_poll_timer);
-       ath9k_debug_samp_bb_mac(sc);
-@@ -236,7 +231,7 @@ static bool ath_complete_reset(struct at
-               if (!test_bit(SC_OP_BEACONS, &sc->sc_flags))
-                       goto work;
--              ath_set_beacon(sc);
-+              ath9k_set_beacon(sc);
-               if (ah->opmode == NL80211_IFTYPE_STATION &&
-                   test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
-@@ -365,6 +360,7 @@ void ath9k_tasklet(unsigned long data)
-       struct ath_softc *sc = (struct ath_softc *)data;
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-+      enum ath_reset_type type;
-       unsigned long flags;
-       u32 status = sc->intrstatus;
-       u32 rxmask;
-@@ -374,18 +370,13 @@ void ath9k_tasklet(unsigned long data)
-       if ((status & ATH9K_INT_FATAL) ||
-           (status & ATH9K_INT_BB_WATCHDOG)) {
--#ifdef CONFIG_ATH9K_DEBUGFS
--              enum ath_reset_type type;
-               if (status & ATH9K_INT_FATAL)
-                       type = RESET_TYPE_FATAL_INT;
-               else
-                       type = RESET_TYPE_BB_WATCHDOG;
--              RESET_STAT_INC(sc, type);
--#endif
--              set_bit(SC_OP_HW_RESET, &sc->sc_flags);
--              ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+              ath9k_queue_reset(sc, type);
-               goto out;
-       }
-@@ -468,8 +459,10 @@ irqreturn_t ath_isr(int irq, void *dev)
-       if (!ath9k_hw_intrpend(ah))
-               return IRQ_NONE;
--      if(test_bit(SC_OP_HW_RESET, &sc->sc_flags))
-+      if (test_bit(SC_OP_HW_RESET, &sc->sc_flags)) {
-+              ath9k_hw_kill_interrupts(ah);
-               return IRQ_HANDLED;
-+      }
-       /*
-        * Figure out the reason(s) for the interrupt.  Note
-@@ -586,6 +579,15 @@ static int ath_reset(struct ath_softc *s
-       return r;
- }
-+void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type)
-+{
-+#ifdef CONFIG_ATH9K_DEBUGFS
-+      RESET_STAT_INC(sc, type);
-+#endif
-+      set_bit(SC_OP_HW_RESET, &sc->sc_flags);
-+      ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+}
-+
- void ath_reset_work(struct work_struct *work)
- {
-       struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work);
-@@ -852,16 +854,6 @@ bool ath9k_uses_beacons(int type)
-       }
- }
--static void ath9k_reclaim_beacon(struct ath_softc *sc,
--                               struct ieee80211_vif *vif)
--{
--      struct ath_vif *avp = (void *)vif->drv_priv;
--
--      ath9k_set_beaconing_status(sc, false);
--      ath_beacon_return(sc, avp);
--      ath9k_set_beaconing_status(sc, true);
--}
--
- static void ath9k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
- {
-       struct ath9k_vif_iter_data *iter_data = data;
-@@ -929,18 +921,14 @@ static void ath9k_calculate_summary_stat
-       ath9k_calculate_iter_data(hw, vif, &iter_data);
--      /* Set BSSID mask. */
-       memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
-       ath_hw_setbssidmask(common);
--      /* Set op-mode & TSF */
-       if (iter_data.naps > 0) {
--              ath9k_hw_set_tsfadjust(ah, 1);
--              set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
-+              ath9k_hw_set_tsfadjust(ah, true);
-               ah->opmode = NL80211_IFTYPE_AP;
-       } else {
--              ath9k_hw_set_tsfadjust(ah, 0);
--              clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
-+              ath9k_hw_set_tsfadjust(ah, false);
-               if (iter_data.nmeshes)
-                       ah->opmode = NL80211_IFTYPE_MESH_POINT;
-@@ -952,45 +940,14 @@ static void ath9k_calculate_summary_stat
-                       ah->opmode = NL80211_IFTYPE_STATION;
-       }
--      /*
--       * Enable MIB interrupts when there are hardware phy counters.
--       */
-+      ath9k_hw_setopmode(ah);
-+
-       if ((iter_data.nstations + iter_data.nadhocs + iter_data.nmeshes) > 0)
-               ah->imask |= ATH9K_INT_TSFOOR;
-       else
-               ah->imask &= ~ATH9K_INT_TSFOOR;
-       ath9k_hw_set_interrupts(ah);
--
--      /* Set up ANI */
--      if (iter_data.naps > 0) {
--              sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
--
--              if (!common->disable_ani) {
--                      set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--                      ath_start_ani(common);
--              }
--
--      } else {
--              clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--              del_timer_sync(&common->ani.timer);
--      }
--}
--
--/* Called with sc->mutex held, vif counts set up properly. */
--static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
--                                 struct ieee80211_vif *vif)
--{
--      struct ath_softc *sc = hw->priv;
--
--      ath9k_calculate_summary_state(hw, vif);
--
--      if (ath9k_uses_beacons(vif->type)) {
--              /* Reserve a beacon slot for the vif */
--              ath9k_set_beaconing_status(sc, false);
--              ath_beacon_alloc(sc, vif);
--              ath9k_set_beaconing_status(sc, true);
--      }
- }
- static int ath9k_add_interface(struct ieee80211_hw *hw,
-@@ -1032,7 +989,10 @@ static int ath9k_add_interface(struct ie
-       sc->nvifs++;
--      ath9k_do_vif_add_setup(hw, vif);
-+      ath9k_calculate_summary_state(hw, vif);
-+      if (ath9k_uses_beacons(vif->type))
-+              ath9k_beacon_assign_slot(sc, vif);
-+
- out:
-       mutex_unlock(&sc->mutex);
-       ath9k_ps_restore(sc);
-@@ -1049,6 +1009,7 @@ static int ath9k_change_interface(struct
-       int ret = 0;
-       ath_dbg(common, CONFIG, "Change Interface\n");
-+
-       mutex_lock(&sc->mutex);
-       ath9k_ps_wakeup(sc);
-@@ -1061,15 +1022,16 @@ static int ath9k_change_interface(struct
-               }
-       }
--      /* Clean up old vif stuff */
-       if (ath9k_uses_beacons(vif->type))
--              ath9k_reclaim_beacon(sc, vif);
-+              ath9k_beacon_remove_slot(sc, vif);
--      /* Add new settings */
-       vif->type = new_type;
-       vif->p2p = p2p;
--      ath9k_do_vif_add_setup(hw, vif);
-+      ath9k_calculate_summary_state(hw, vif);
-+      if (ath9k_uses_beacons(vif->type))
-+              ath9k_beacon_assign_slot(sc, vif);
-+
- out:
-       ath9k_ps_restore(sc);
-       mutex_unlock(&sc->mutex);
-@@ -1089,9 +1051,8 @@ static void ath9k_remove_interface(struc
-       sc->nvifs--;
--      /* Reclaim beacon resources */
-       if (ath9k_uses_beacons(vif->type))
--              ath9k_reclaim_beacon(sc, vif);
-+              ath9k_beacon_remove_slot(sc, vif);
-       ath9k_calculate_summary_state(hw, NULL);
-@@ -1388,21 +1349,18 @@ static int ath9k_conf_tx(struct ieee8021
-       qi.tqi_aifs = params->aifs;
-       qi.tqi_cwmin = params->cw_min;
-       qi.tqi_cwmax = params->cw_max;
--      qi.tqi_burstTime = params->txop;
-+      qi.tqi_burstTime = params->txop * 32;
-       ath_dbg(common, CONFIG,
-               "Configure tx [queue/halq] [%d/%d], aifs: %d, cw_min: %d, cw_max: %d, txop: %d\n",
-               queue, txq->axq_qnum, params->aifs, params->cw_min,
-               params->cw_max, params->txop);
-+      ath_update_max_aggr_framelen(sc, queue, qi.tqi_burstTime);
-       ret = ath_txq_update(sc, txq->axq_qnum, &qi);
-       if (ret)
-               ath_err(common, "TXQ Update failed\n");
--      if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)
--              if (queue == WME_AC_BE && !ret)
--                      ath_beaconq_config(sc);
--
-       mutex_unlock(&sc->mutex);
-       ath9k_ps_restore(sc);
-@@ -1471,85 +1429,36 @@ static int ath9k_set_key(struct ieee8021
-       return ret;
- }
--static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
-+
-+static void ath9k_bss_assoc_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
- {
-       struct ath_softc *sc = data;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--      struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-       struct ath_vif *avp = (void *)vif->drv_priv;
-+      struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-       unsigned long flags;
--      /*
--       * Skip iteration if primary station vif's bss info
--       * was not changed
--       */
-+
-       if (test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
-               return;
-       if (bss_conf->assoc) {
-               set_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
-               avp->primary_sta_vif = true;
-+
-               memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
-               common->curaid = bss_conf->aid;
-               ath9k_hw_write_associd(sc->sc_ah);
--              ath_dbg(common, CONFIG, "Bss Info ASSOC %d, bssid: %pM\n",
--                      bss_conf->aid, common->curbssid);
--              ath_beacon_config(sc, vif);
--              /*
--               * Request a re-configuration of Beacon related timers
--               * on the receipt of the first Beacon frame (i.e.,
--               * after time sync with the AP).
--               */
--              spin_lock_irqsave(&sc->sc_pm_lock, flags);
--              sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
--              spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
--              /* Reset rssi stats */
-               sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
-               sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
--              ath_start_rx_poll(sc, 3);
--
--              if (!common->disable_ani) {
--                      set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--                      ath_start_ani(common);
--              }
--
--      }
--}
--
--static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
--{
--      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--      struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
--      struct ath_vif *avp = (void *)vif->drv_priv;
--
--      if (sc->sc_ah->opmode != NL80211_IFTYPE_STATION)
--              return;
--
--      /* Reconfigure bss info */
--      if (avp->primary_sta_vif && !bss_conf->assoc) {
--              ath_dbg(common, CONFIG, "Bss Info DISASSOC %d, bssid %pM\n",
--                      common->curaid, common->curbssid);
--              clear_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
--              clear_bit(SC_OP_BEACONS, &sc->sc_flags);
--              avp->primary_sta_vif = false;
--              memset(common->curbssid, 0, ETH_ALEN);
--              common->curaid = 0;
--      }
--
--      ieee80211_iterate_active_interfaces_atomic(
--                      sc->hw, ath9k_bss_iter, sc);
-+              spin_lock_irqsave(&sc->sc_pm_lock, flags);
-+              sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
-+              spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
--      /*
--       * None of station vifs are associated.
--       * Clear bssid & aid
--       */
--      if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
--              ath9k_hw_write_associd(sc->sc_ah);
--              clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--              del_timer_sync(&common->ani.timer);
--              del_timer_sync(&sc->rx_poll_timer);
--              memset(&sc->caldata, 0, sizeof(sc->caldata));
-+              ath_dbg(common, CONFIG,
-+                      "Primary Station interface: %pM, BSSID: %pM\n",
-+                      vif->addr, common->curbssid);
-       }
- }
-@@ -1558,6 +1467,11 @@ static void ath9k_bss_info_changed(struc
-                                  struct ieee80211_bss_conf *bss_conf,
-                                  u32 changed)
- {
-+#define CHECK_ANI                             \
-+      (BSS_CHANGED_ASSOC |                    \
-+       BSS_CHANGED_IBSS |                     \
-+       BSS_CHANGED_BEACON_ENABLED)
-+
-       struct ath_softc *sc = hw->priv;
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-@@ -1568,53 +1482,43 @@ static void ath9k_bss_info_changed(struc
-       mutex_lock(&sc->mutex);
-       if (changed & BSS_CHANGED_ASSOC) {
--              ath9k_config_bss(sc, vif);
-+              ath_dbg(common, CONFIG, "BSSID %pM Changed ASSOC %d\n",
-+                      bss_conf->bssid, bss_conf->assoc);
--              ath_dbg(common, CONFIG, "BSSID: %pM aid: 0x%x\n",
--                      common->curbssid, common->curaid);
-+              /*
-+               * Do not do anything when the opmode is not STATION.
-+               */
-+              if (ah->opmode == NL80211_IFTYPE_STATION) {
-+                      if (avp->primary_sta_vif && !bss_conf->assoc) {
-+                              clear_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
-+                              clear_bit(SC_OP_BEACONS, &sc->sc_flags);
-+                              avp->primary_sta_vif = false;
-+                      }
-+
-+                      ieee80211_iterate_active_interfaces_atomic(sc->hw,
-+                                                 ath9k_bss_assoc_iter, sc);
-+
-+                      if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
-+                              memset(common->curbssid, 0, ETH_ALEN);
-+                              common->curaid = 0;
-+                              ath9k_hw_write_associd(sc->sc_ah);
-+                      }
-+              }
-       }
-       if (changed & BSS_CHANGED_IBSS) {
--              /* There can be only one vif available */
-               memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
-               common->curaid = bss_conf->aid;
-               ath9k_hw_write_associd(sc->sc_ah);
--
--              if (bss_conf->ibss_joined) {
--                      sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
--
--                      if (!common->disable_ani) {
--                              set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--                              ath_start_ani(common);
--                      }
--
--              } else {
--                      clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
--                      del_timer_sync(&common->ani.timer);
--                      del_timer_sync(&sc->rx_poll_timer);
--              }
-       }
--      /*
--       * In case of AP mode, the HW TSF has to be reset
--       * when the beacon interval changes.
--       */
--      if ((changed & BSS_CHANGED_BEACON_INT) &&
--          (vif->type == NL80211_IFTYPE_AP))
--              set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
--
--      /* Configure beaconing (AP, IBSS, MESH) */
--      if (ath9k_uses_beacons(vif->type) &&
--          ((changed & BSS_CHANGED_BEACON) ||
--           (changed & BSS_CHANGED_BEACON_ENABLED) ||
--           (changed & BSS_CHANGED_BEACON_INT))) {
--              ath9k_set_beaconing_status(sc, false);
--              if (bss_conf->enable_beacon)
--                      ath_beacon_alloc(sc, vif);
--              else
--                      avp->is_bslot_active = false;
--              ath_beacon_config(sc, vif);
--              ath9k_set_beaconing_status(sc, true);
-+      if ((changed & BSS_CHANGED_BEACON) ||
-+          (changed & BSS_CHANGED_BEACON_ENABLED) ||
-+          (changed & BSS_CHANGED_BEACON_INT)) {
-+              if (ah->opmode == NL80211_IFTYPE_AP)
-+                      ath9k_set_tsfadjust(sc, vif);
-+              if (ath9k_allow_beacon_config(sc, vif))
-+                      ath9k_beacon_config(sc, vif, changed);
-       }
-       if (changed & BSS_CHANGED_ERP_SLOT) {
-@@ -1636,8 +1540,13 @@ static void ath9k_bss_info_changed(struc
-               }
-       }
-+      if (changed & CHECK_ANI)
-+              ath_check_ani(sc);
-+
-       mutex_unlock(&sc->mutex);
-       ath9k_ps_restore(sc);
-+
-+#undef CHECK_ANI
- }
- static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-@@ -1866,10 +1775,11 @@ static int ath9k_tx_last_beacon(struct i
-       if (!vif)
-               return 0;
--      avp = (void *)vif->drv_priv;
--      if (!avp->is_bslot_active)
-+      if (!vif->bss_conf.enable_beacon)
-               return 0;
-+      avp = (void *)vif->drv_priv;
-+
-       if (!sc->beacon.tx_processed && !edma) {
-               tasklet_disable(&sc->bcon_tasklet);
-@@ -1923,12 +1833,29 @@ static u32 fill_chainmask(u32 cap, u32 n
-       return filled;
- }
-+static bool validate_antenna_mask(struct ath_hw *ah, u32 val)
-+{
-+      switch (val & 0x7) {
-+      case 0x1:
-+      case 0x3:
-+      case 0x7:
-+              return true;
-+      case 0x2:
-+              return (ah->caps.rx_chainmask == 1);
-+      default:
-+              return false;
-+      }
-+}
-+
- static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
- {
-       struct ath_softc *sc = hw->priv;
-       struct ath_hw *ah = sc->sc_ah;
--      if (!rx_ant || !tx_ant)
-+      if (ah->caps.rx_chainmask != 1)
-+              rx_ant |= tx_ant;
-+
-+      if (!validate_antenna_mask(ah, rx_ant) || !tx_ant)
-               return -EINVAL;
-       sc->ant_rx = rx_ant;
---- a/drivers/net/wireless/ath/ath9k/mci.c
-+++ b/drivers/net/wireless/ath/ath9k/mci.c
-@@ -202,7 +202,7 @@ static void ath_mci_cal_msg(struct ath_s
-       case MCI_GPM_BT_CAL_REQ:
-               if (mci_hw->bt_state == MCI_BT_AWAKE) {
-                       ar9003_mci_state(ah, MCI_STATE_SET_BT_CAL_START);
--                      ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-+                      ath9k_queue_reset(sc, RESET_TYPE_MCI);
-               }
-               ath_dbg(common, MCI, "MCI State : %d\n", mci_hw->bt_state);
-               break;
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -553,7 +553,7 @@ static void ath_rx_ps_beacon(struct ath_
-               sc->ps_flags &= ~PS_BEACON_SYNC;
-               ath_dbg(common, PS,
-                       "Reconfigure Beacon timers based on timestamp from the AP\n");
--              ath_set_beacon(sc);
-+              ath9k_set_beacon(sc);
-       }
-       if (ath_beacon_dtim_pending_cab(skb)) {
-@@ -1044,7 +1044,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
-       struct ieee80211_hw *hw = sc->hw;
-       struct ieee80211_hdr *hdr;
-       int retval;
--      bool decrypt_error = false;
-       struct ath_rx_status rs;
-       enum ath9k_rx_qtype qtype;
-       bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
-@@ -1066,6 +1065,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
-       tsf_lower = tsf & 0xffffffff;
-       do {
-+              bool decrypt_error = false;
-               /* If handling rx interrupt and flush is in progress => exit */
-               if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
-                       break;
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -29,6 +29,8 @@
- #define HT_LTF(_ns)             (4 * (_ns))
- #define SYMBOL_TIME(_ns)        ((_ns) << 2) /* ns * 4 us */
- #define SYMBOL_TIME_HALFGI(_ns) (((_ns) * 18 + 4) / 5)  /* ns * 3.6 us */
-+#define TIME_SYMBOLS(t)         ((t) >> 2)
-+#define TIME_SYMBOLS_HALFGI(t)  (((t) * 5 - 4) / 18)
- #define NUM_SYMBOLS_PER_USEC(_usec) (_usec >> 2)
- #define NUM_SYMBOLS_PER_USEC_HALFGI(_usec) (((_usec*5)-4)/18)
-@@ -74,33 +76,6 @@ enum {
-       MCS_HT40_SGI,
- };
--static int ath_max_4ms_framelen[4][32] = {
--      [MCS_HT20] = {
--              3212,  6432,  9648,  12864,  19300,  25736,  28952,  32172,
--              6424,  12852, 19280, 25708,  38568,  51424,  57852,  64280,
--              9628,  19260, 28896, 38528,  57792,  65532,  65532,  65532,
--              12828, 25656, 38488, 51320,  65532,  65532,  65532,  65532,
--      },
--      [MCS_HT20_SGI] = {
--              3572,  7144,  10720,  14296,  21444,  28596,  32172,  35744,
--              7140,  14284, 21428,  28568,  42856,  57144,  64288,  65532,
--              10700, 21408, 32112,  42816,  64228,  65532,  65532,  65532,
--              14256, 28516, 42780,  57040,  65532,  65532,  65532,  65532,
--      },
--      [MCS_HT40] = {
--              6680,  13360,  20044,  26724,  40092,  53456,  60140,  65532,
--              13348, 26700,  40052,  53400,  65532,  65532,  65532,  65532,
--              20004, 40008,  60016,  65532,  65532,  65532,  65532,  65532,
--              26644, 53292,  65532,  65532,  65532,  65532,  65532,  65532,
--      },
--      [MCS_HT40_SGI] = {
--              7420,  14844,  22272,  29696,  44544,  59396,  65532,  65532,
--              14832, 29668,  44504,  59340,  65532,  65532,  65532,  65532,
--              22232, 44464,  65532,  65532,  65532,  65532,  65532,  65532,
--              29616, 59232,  65532,  65532,  65532,  65532,  65532,  65532,
--      }
--};
--
- /*********************/
- /* Aggregation logic */
- /*********************/
-@@ -593,7 +568,7 @@ static void ath_tx_complete_aggr(struct 
-               if (!an->sleeping) {
-                       ath_tx_queue_tid(txq, tid);
--                      if (ts->ts_status & ATH9K_TXERR_FILT)
-+                      if (ts->ts_status & (ATH9K_TXERR_FILT | ATH9K_TXERR_XRETRY))
-                               tid->ac->clear_ps_filter = true;
-               }
-       }
-@@ -614,10 +589,8 @@ static void ath_tx_complete_aggr(struct 
-       rcu_read_unlock();
--      if (needreset) {
--              RESET_STAT_INC(sc, RESET_TYPE_TX_ERROR);
--              ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
--      }
-+      if (needreset)
-+              ath9k_queue_reset(sc, RESET_TYPE_TX_ERROR);
- }
- static bool ath_lookup_legacy(struct ath_buf *bf)
-@@ -650,6 +623,7 @@ static u32 ath_lookup_rate(struct ath_so
-       struct ieee80211_tx_rate *rates;
-       u32 max_4ms_framelen, frmlen;
-       u16 aggr_limit, bt_aggr_limit, legacy = 0;
-+      int q = tid->ac->txq->mac80211_qnum;
-       int i;
-       skb = bf->bf_mpdu;
-@@ -658,8 +632,7 @@ static u32 ath_lookup_rate(struct ath_so
-       /*
-        * Find the lowest frame length among the rate series that will have a
--       * 4ms transmit duration.
--       * TODO - TXOP limit needs to be considered.
-+       * 4ms (or TXOP limited) transmit duration.
-        */
-       max_4ms_framelen = ATH_AMPDU_LIMIT_MAX;
-@@ -682,7 +655,7 @@ static u32 ath_lookup_rate(struct ath_so
-               if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI)
-                       modeidx++;
--              frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];
-+              frmlen = sc->tx.max_aggr_framelen[q][modeidx][rates[i].idx];
-               max_4ms_framelen = min(max_4ms_framelen, frmlen);
-       }
-@@ -929,6 +902,44 @@ static u32 ath_pkt_duration(struct ath_s
-       return duration;
- }
-+static int ath_max_framelen(int usec, int mcs, bool ht40, bool sgi)
-+{
-+      int streams = HT_RC_2_STREAMS(mcs);
-+      int symbols, bits;
-+      int bytes = 0;
-+
-+      symbols = sgi ? TIME_SYMBOLS_HALFGI(usec) : TIME_SYMBOLS(usec);
-+      bits = symbols * bits_per_symbol[mcs % 8][ht40] * streams;
-+      bits -= OFDM_PLCP_BITS;
-+      bytes = bits / 8;
-+      bytes -= L_STF + L_LTF + L_SIG + HT_SIG + HT_STF + HT_LTF(streams);
-+      if (bytes > 65532)
-+              bytes = 65532;
-+
-+      return bytes;
-+}
-+
-+void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop)
-+{
-+      u16 *cur_ht20, *cur_ht20_sgi, *cur_ht40, *cur_ht40_sgi;
-+      int mcs;
-+
-+      /* 4ms is the default (and maximum) duration */
-+      if (!txop || txop > 4096)
-+              txop = 4096;
-+
-+      cur_ht20 = sc->tx.max_aggr_framelen[queue][MCS_HT20];
-+      cur_ht20_sgi = sc->tx.max_aggr_framelen[queue][MCS_HT20_SGI];
-+      cur_ht40 = sc->tx.max_aggr_framelen[queue][MCS_HT40];
-+      cur_ht40_sgi = sc->tx.max_aggr_framelen[queue][MCS_HT40_SGI];
-+      for (mcs = 0; mcs < 32; mcs++) {
-+              cur_ht20[mcs] = ath_max_framelen(txop, mcs, false, false);
-+              cur_ht20_sgi[mcs] = ath_max_framelen(txop, mcs, false, true);
-+              cur_ht40[mcs] = ath_max_framelen(txop, mcs, true, false);
-+              cur_ht40_sgi[mcs] = ath_max_framelen(txop, mcs, true, true);
-+      }
-+}
-+
- static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
-                            struct ath_tx_info *info, int len)
- {
-@@ -1586,7 +1597,8 @@ void ath_txq_schedule(struct ath_softc *
-       struct ath_atx_ac *ac, *ac_tmp, *last_ac;
-       struct ath_atx_tid *tid, *last_tid;
--      if (work_pending(&sc->hw_reset_work) || list_empty(&txq->axq_acq) ||
-+      if (test_bit(SC_OP_HW_RESET, &sc->sc_flags) ||
-+          list_empty(&txq->axq_acq) ||
-           txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
-               return;
-@@ -1988,7 +2000,8 @@ int ath_tx_start(struct ieee80211_hw *hw
-       ath_txq_lock(sc, txq);
-       if (txq == sc->tx.txq_map[q] &&
--          ++txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
-+          ++txq->pending_frames > sc->tx.txq_max_pending[q] &&
-+          !txq->stopped) {
-               ieee80211_stop_queue(sc->hw, q);
-               txq->stopped = true;
-       }
-@@ -2015,6 +2028,9 @@ static void ath_tx_complete(struct ath_s
-       ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -325,6 +325,8 @@ ath5k_setup_channels(struct ath5k_hw *ah
+               if (!ath5k_is_standard_channel(ch, band))
+                       continue;
  
-+      if (sc->sc_ah->caldata)
-+              sc->sc_ah->caldata->paprd_packet_sent = true;
++              channels[count].max_power = AR5K_TUNE_MAX_TXPOWER/2;
 +
-       if (!(tx_flags & ATH_TX_ERROR))
-               /* Frame was ACKed */
-               tx_info->flags |= IEEE80211_TX_STAT_ACK;
-@@ -2047,7 +2063,8 @@ static void ath_tx_complete(struct ath_s
-               if (WARN_ON(--txq->pending_frames < 0))
-                       txq->pending_frames = 0;
--              if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
-+              if (txq->stopped &&
-+                  txq->pending_frames < sc->tx.txq_max_pending[q]) {
-                       ieee80211_wake_queue(sc->hw, q);
-                       txq->stopped = false;
-               }
-@@ -2191,7 +2208,7 @@ static void ath_tx_processq(struct ath_s
-       ath_txq_lock(sc, txq);
-       for (;;) {
--              if (work_pending(&sc->hw_reset_work))
-+              if (test_bit(SC_OP_HW_RESET, &sc->sc_flags))
-                       break;
-               if (list_empty(&txq->axq_q)) {
-@@ -2274,7 +2291,7 @@ void ath_tx_edma_tasklet(struct ath_soft
-       int status;
-       for (;;) {
--              if (work_pending(&sc->hw_reset_work))
-+              if (test_bit(SC_OP_HW_RESET, &sc->sc_flags))
-                       break;
-               status = ath9k_hw_txprocdesc(ah, NULL, (void *)&ts);
---- a/drivers/net/wireless/b43/xmit.c
-+++ b/drivers/net/wireless/b43/xmit.c
-@@ -663,7 +663,7 @@ void b43_rx(struct b43_wldev *dev, struc
-       u32 uninitialized_var(macstat);
-       u16 chanid;
-       u16 phytype;
--      int padding;
-+      int padding, rate_idx;
-       memset(&status, 0, sizeof(status));
-@@ -766,16 +766,17 @@ void b43_rx(struct b43_wldev *dev, struc
-       }
-       if (phystat0 & B43_RX_PHYST0_OFDM)
--              status.rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp,
-+              rate_idx = b43_plcp_get_bitrate_idx_ofdm(plcp,
-                                               phytype == B43_PHYTYPE_A);
-       else
--              status.rate_idx = b43_plcp_get_bitrate_idx_cck(plcp);
--      if (unlikely(status.rate_idx == -1)) {
-+              rate_idx = b43_plcp_get_bitrate_idx_cck(plcp);
-+      if (unlikely(rate_idx == -1)) {
-               /* PLCP seems to be corrupted.
-                * Drop the frame, if we are not interested in corrupted frames. */
-               if (!(dev->wl->filter_flags & FIF_PLCPFAIL))
-                       goto drop;
-       }
-+      status.rate_idx = rate_idx;
-       status.antenna = !!(phystat0 & B43_RX_PHYST0_ANT);
-       /*
---- a/drivers/net/wireless/libertas/cfg.c
-+++ b/drivers/net/wireless/libertas/cfg.c
-@@ -2182,13 +2182,15 @@ int lbs_reg_notifier(struct wiphy *wiphy
-               struct regulatory_request *request)
- {
-       struct lbs_private *priv = wiphy_priv(wiphy);
--      int ret;
-+      int ret = 0;
-       lbs_deb_enter_args(LBS_DEB_CFG80211, "cfg80211 regulatory domain "
-                       "callback for domain %c%c\n", request->alpha2[0],
-                       request->alpha2[1]);
--      ret = lbs_set_11d_domain_info(priv, request, wiphy->bands);
-+      memcpy(priv->country_code, request->alpha2, sizeof(request->alpha2));
-+      if (lbs_iface_active(priv))
-+              ret = lbs_set_11d_domain_info(priv);
-       lbs_deb_leave(LBS_DEB_CFG80211);
-       return ret;
---- a/drivers/net/wireless/libertas/cmd.c
-+++ b/drivers/net/wireless/libertas/cmd.c
-@@ -733,15 +733,13 @@ int lbs_get_rssi(struct lbs_private *pri
-  *  to the firmware
-  *
-  *  @priv:    pointer to &struct lbs_private
-- *  @request: cfg80211 regulatory request structure
-- *  @bands:   the device's supported bands and channels
-  *
-  *  returns:  0 on success, error code on failure
- */
--int lbs_set_11d_domain_info(struct lbs_private *priv,
--                          struct regulatory_request *request,
--                          struct ieee80211_supported_band **bands)
-+int lbs_set_11d_domain_info(struct lbs_private *priv)
- {
-+      struct wiphy *wiphy = priv->wdev->wiphy;
-+      struct ieee80211_supported_band **bands = wiphy->bands;
-       struct cmd_ds_802_11d_domain_info cmd;
-       struct mrvl_ie_domain_param_set *domain = &cmd.domain;
-       struct ieee80211_country_ie_triplet *t;
-@@ -752,21 +750,23 @@ int lbs_set_11d_domain_info(struct lbs_p
-       u8 first_channel = 0, next_chan = 0, max_pwr = 0;
-       u8 i, flag = 0;
-       size_t triplet_size;
--      int ret;
-+      int ret = 0;
-       lbs_deb_enter(LBS_DEB_11D);
-+      if (!priv->country_code[0])
-+              goto out;
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.action = cpu_to_le16(CMD_ACT_SET);
-       lbs_deb_11d("Setting country code '%c%c'\n",
--                  request->alpha2[0], request->alpha2[1]);
-+                  priv->country_code[0], priv->country_code[1]);
-       domain->header.type = cpu_to_le16(TLV_TYPE_DOMAIN);
-       /* Set country code */
--      domain->country_code[0] = request->alpha2[0];
--      domain->country_code[1] = request->alpha2[1];
-+      domain->country_code[0] = priv->country_code[0];
-+      domain->country_code[1] = priv->country_code[1];
-       domain->country_code[2] = ' ';
-       /* Now set up the channel triplets; firmware is somewhat picky here
-@@ -848,6 +848,7 @@ int lbs_set_11d_domain_info(struct lbs_p
-       ret = lbs_cmd_with_response(priv, CMD_802_11D_DOMAIN_INFO, &cmd);
-+out:
-       lbs_deb_leave_args(LBS_DEB_11D, "ret %d", ret);
-       return ret;
- }
-@@ -1019,9 +1020,9 @@ static void lbs_submit_command(struct lb
-       if (ret) {
-               netdev_info(priv->dev, "DNLD_CMD: hw_host_to_card failed: %d\n",
-                           ret);
--              /* Let the timer kick in and retry, and potentially reset
--                 the whole thing if the condition persists */
--              timeo = HZ/4;
-+              /* Reset dnld state machine, report failure */
-+              priv->dnld_sent = DNLD_RES_RECEIVED;
-+              lbs_complete_command(priv, cmdnode, ret);
-       }
-       if (command == CMD_802_11_DEEP_SLEEP) {
---- a/drivers/net/wireless/libertas/cmd.h
-+++ b/drivers/net/wireless/libertas/cmd.h
-@@ -128,9 +128,7 @@ int lbs_set_monitor_mode(struct lbs_priv
- int lbs_get_rssi(struct lbs_private *priv, s8 *snr, s8 *nf);
--int lbs_set_11d_domain_info(struct lbs_private *priv,
--                          struct regulatory_request *request,
--                          struct ieee80211_supported_band **bands);
-+int lbs_set_11d_domain_info(struct lbs_private *priv);
- int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value);
---- a/drivers/net/wireless/libertas/dev.h
-+++ b/drivers/net/wireless/libertas/dev.h
-@@ -49,6 +49,7 @@ struct lbs_private {
-       bool wiphy_registered;
-       struct cfg80211_scan_request *scan_req;
-       u8 assoc_bss[ETH_ALEN];
-+      u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
-       u8 disassoc_reason;
-       /* Mesh */
---- a/drivers/net/wireless/libertas/if_usb.c
-+++ b/drivers/net/wireless/libertas/if_usb.c
-@@ -311,7 +311,6 @@ static void if_usb_disconnect(struct usb
-       cardp->surprise_removed = 1;
-       if (priv) {
--              priv->surpriseremoved = 1;
-               lbs_stop_card(priv);
-               lbs_remove_card(priv);
-       }
---- a/drivers/net/wireless/libertas/main.c
-+++ b/drivers/net/wireless/libertas/main.c
-@@ -154,6 +154,12 @@ int lbs_start_iface(struct lbs_private *
-               goto err;
+               count++;
        }
  
-+      ret = lbs_set_11d_domain_info(priv);
-+      if (ret) {
-+              lbs_deb_net("set 11d domain info failed\n");
-+              goto err;
-+      }
-+
-       lbs_update_channel(priv);
-       priv->iface_running = true;
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -1504,8 +1504,6 @@ struct cfg80211_gtk_rekey_data {
-  *    interfaces are active this callback should reject the configuration.
-  *    If no interfaces are active or the device is down, the channel should
-  *    be stored for when a monitor interface becomes active.
-- * @set_monitor_enabled: Notify driver that there are only monitor
-- *    interfaces running.
-  *
-  * @scan: Request to do a scan. If returning zero, the scan request is given
-  *    the driver, and will be valid until passed to cfg80211_scan_done().
-@@ -1612,6 +1610,10 @@ struct cfg80211_gtk_rekey_data {
-  * @get_et_strings:  Ethtool API to get a set of strings to describe stats
-  *    and perhaps other supported types of ethtool data-sets.
-  *    See @ethtool_ops.get_strings
-+ *
-+ * @get_channel: Get the current operating channel for the virtual interface.
-+ *    For monitor interfaces, it should return %NULL unless there's a single
-+ *    current monitoring channel.
-  */
- struct cfg80211_ops {
-       int     (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
-@@ -1820,7 +1822,10 @@ struct cfg80211_ops {
-       void    (*get_et_strings)(struct wiphy *wiphy, struct net_device *dev,
-                                 u32 sset, u8 *data);
--      void (*set_monitor_enabled)(struct wiphy *wiphy, bool enabled);
-+      struct ieee80211_channel *
-+              (*get_channel)(struct wiphy *wiphy,
-+                             struct wireless_dev *wdev,
-+                             enum nl80211_channel_type *type);
- };
- /*
 --- a/net/mac80211/agg-rx.c
 +++ b/net/mac80211/agg-rx.c
 @@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
            sdata->vif.type != NL80211_IFTYPE_ADHOC)
                return -EINVAL;
  
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -2982,14 +2982,14 @@ static int ieee80211_probe_client(struct
-       return 0;
- }
--static void ieee80211_set_monitor_enabled(struct wiphy *wiphy, bool enabled)
-+static struct ieee80211_channel *
-+ieee80211_cfg_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev,
-+                        enum nl80211_channel_type *type)
- {
-       struct ieee80211_local *local = wiphy_priv(wiphy);
--      if (enabled)
--              WARN_ON(ieee80211_add_virtual_monitor(local));
--      else
--              ieee80211_del_virtual_monitor(local);
-+      *type = local->_oper_channel_type;
-+      return local->oper_channel;
- }
- #ifdef CONFIG_PM
-@@ -3066,11 +3066,11 @@ struct cfg80211_ops mac80211_config_ops 
-       .tdls_mgmt = ieee80211_tdls_mgmt,
-       .probe_client = ieee80211_probe_client,
-       .set_noack_map = ieee80211_set_noack_map,
--      .set_monitor_enabled = ieee80211_set_monitor_enabled,
- #ifdef CONFIG_PM
-       .set_wakeup = ieee80211_set_wakeup,
- #endif
-       .get_et_sset_count = ieee80211_get_et_sset_count,
-       .get_et_stats = ieee80211_get_et_stats,
-       .get_et_strings = ieee80211_get_et_strings,
-+      .get_channel = ieee80211_cfg_get_channel,
- };
 --- a/net/mac80211/debugfs_sta.c
 +++ b/net/mac80211/debugfs_sta.c
 @@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
                            TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
                            TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
                            TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -1496,10 +1496,6 @@ int ieee80211_add_srates_ie(struct ieee8
- int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata,
-                               struct sk_buff *skb, bool need_basic);
--/* virtual monitor */
--int ieee80211_add_virtual_monitor(struct ieee80211_local *local);
--void ieee80211_del_virtual_monitor(struct ieee80211_local *local);
--
- /* channel management */
- enum ieee80211_chan_mode {
-       CHAN_MODE_UNDEFINED,
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -331,7 +331,7 @@ static void ieee80211_set_default_queues
-       sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
- }
--int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
-+static int ieee80211_add_virtual_monitor(struct ieee80211_local *local)
- {
-       struct ieee80211_sub_if_data *sdata;
-       int ret = 0;
-@@ -377,7 +377,7 @@ int ieee80211_add_virtual_monitor(struct
-       return ret;
- }
--void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
-+static void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
- {
-       struct ieee80211_sub_if_data *sdata;
-@@ -410,7 +410,6 @@ static int ieee80211_do_open(struct net_
- {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+@@ -420,7 +420,6 @@ int ieee80211_do_open(struct wireless_de
+       struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
+       struct net_device *dev = wdev->netdev;
        struct ieee80211_local *local = sdata->local;
 -      struct sta_info *sta;
        u32 changed = 0;
        int res;
        u32 hw_reconf_flags = 0;
-@@ -497,6 +496,12 @@ static int ieee80211_do_open(struct net_
-                       break;
-               }
-+              if (local->monitors == 0 && local->open_count == 0) {
-+                      res = ieee80211_add_virtual_monitor(local);
-+                      if (res)
-+                              goto err_stop;
-+              }
-+
-               /* must be before the call to ieee80211_configure_filter */
-               local->monitors++;
-               if (local->monitors == 1) {
-@@ -511,6 +516,8 @@ static int ieee80211_do_open(struct net_
-               break;
-       default:
-               if (coming_up) {
-+                      ieee80211_del_virtual_monitor(local);
-+
-                       res = drv_add_interface(local, sdata);
-                       if (res)
-                               goto err_stop;
-@@ -548,28 +555,6 @@ static int ieee80211_do_open(struct net_
+@@ -575,30 +574,8 @@ int ieee80211_do_open(struct wireless_de
  
        set_bit(SDATA_STATE_RUNNING, &sdata->state);
  
 -              }
 -
 -              rate_control_rate_init(sta);
+-              netif_carrier_on(dev);
+-      } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
++      if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
+               rcu_assign_pointer(local->p2p_sdata, sdata);
 -      }
--
        /*
         * set_multicast_list will be invoked by the networking core
-        * which will check whether any increments here were done in
-@@ -750,6 +735,7 @@ static void ieee80211_do_stop(struct iee
-               if (local->monitors == 0) {
-                       local->hw.conf.flags &= ~IEEE80211_CONF_MONITOR;
-                       hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR;
-+                      ieee80211_del_virtual_monitor(local);
-               }
-               ieee80211_adjust_monitor_flags(sdata, -1);
-@@ -823,6 +809,9 @@ static void ieee80211_do_stop(struct iee
-               }
-       }
-       spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
-+
-+      if (local->monitors == local->open_count && local->monitors > 0)
-+              ieee80211_add_virtual_monitor(local);
- }
- static int ieee80211_stop(struct net_device *dev)
-@@ -959,6 +948,72 @@ static void ieee80211_if_setup(struct ne
+@@ -997,6 +974,72 @@ static void ieee80211_if_setup(struct ne
        dev->destructor = free_netdev;
  }
  
  static void ieee80211_iface_work(struct work_struct *work)
  {
        struct ieee80211_sub_if_data *sdata =
-@@ -1063,6 +1118,9 @@ static void ieee80211_iface_work(struct 
+@@ -1101,6 +1144,9 @@ static void ieee80211_iface_work(struct 
                                break;
                        ieee80211_mesh_rx_queued_mgmt(sdata, skb);
                        break;
                default:
                        WARN(1, "frame for unexpected interface type");
                        break;
---- a/net/mac80211/offchannel.c
-+++ b/net/mac80211/offchannel.c
-@@ -324,6 +324,7 @@ void ieee80211_sw_roc_work(struct work_s
-               container_of(work, struct ieee80211_roc_work, work.work);
-       struct ieee80211_sub_if_data *sdata = roc->sdata;
-       struct ieee80211_local *local = sdata->local;
-+      bool started;
-       mutex_lock(&local->mtx);
-@@ -366,9 +367,10 @@ void ieee80211_sw_roc_work(struct work_s
-               /* finish this ROC */
-  finish:
-               list_del(&roc->list);
-+              started = roc->started;
-               ieee80211_roc_notify_destroy(roc);
--              if (roc->started) {
-+              if (started) {
-                       drv_flush(local, false);
-                       local->tmp_channel = NULL;
-@@ -379,7 +381,7 @@ void ieee80211_sw_roc_work(struct work_s
-               ieee80211_recalc_idle(local);
--              if (roc->started)
-+              if (started)
-                       ieee80211_start_next_roc(local);
-       }
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -2239,6 +2239,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+@@ -2279,6 +2279,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 &&
                    sdata->vif.type != NL80211_IFTYPE_ADHOC)
                        break;
  
-@@ -2456,14 +2457,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2496,14 +2497,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
  
        if (!ieee80211_vif_is_mesh(&sdata->vif) &&
            sdata->vif.type != NL80211_IFTYPE_ADHOC &&
                break;
        case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
        case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-@@ -2788,10 +2790,16 @@ static int prepare_for_handlers(struct i
+@@ -2827,10 +2829,16 @@ static int prepare_for_handlers(struct i
                }
                break;
        case NL80211_IFTYPE_WDS:
 +                      return 0;
 +
                break;
-       default:
-               /* should never get here */
+       case NL80211_IFTYPE_P2P_DEVICE:
+               if (!ieee80211_is_public_action(hdr, skb->len) &&
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h
 @@ -32,7 +32,6 @@
        WLAN_STA_CLEAR_PS_FILT,
        WLAN_STA_MFP,
        WLAN_STA_BLOCK_BA,
---- a/net/wireless/chan.c
-+++ b/net/wireless/chan.c
-@@ -82,7 +82,6 @@ int cfg80211_set_monitor_channel(struct 
-                                int freq, enum nl80211_channel_type chantype)
- {
-       struct ieee80211_channel *chan;
--      int err;
-       if (!rdev->ops->set_monitor_channel)
-               return -EOPNOTSUPP;
-@@ -93,13 +92,7 @@ int cfg80211_set_monitor_channel(struct 
-       if (!chan)
-               return -EINVAL;
--      err = rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
--      if (!err) {
--              rdev->monitor_channel = chan;
--              rdev->monitor_channel_type = chantype;
--      }
--
--      return err;
-+      return rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
- }
- void
-@@ -134,9 +127,16 @@ cfg80211_get_chan_state(struct wireless_
-               break;
-       case NL80211_IFTYPE_AP:
-       case NL80211_IFTYPE_P2P_GO:
-+              if (wdev->beacon_interval) {
-+                      *chan = wdev->channel;
-+                      *chanmode = CHAN_MODE_SHARED;
-+              }
-+              return;
-       case NL80211_IFTYPE_MESH_POINT:
--              *chan = wdev->channel;
--              *chanmode = CHAN_MODE_SHARED;
-+              if (wdev->mesh_id_len) {
-+                      *chan = wdev->channel;
-+                      *chanmode = CHAN_MODE_SHARED;
-+              }
-               return;
-       case NL80211_IFTYPE_MONITOR:
-       case NL80211_IFTYPE_AP_VLAN:
---- a/net/wireless/core.c
-+++ b/net/wireless/core.c
-@@ -747,60 +747,14 @@ static struct device_type wiphy_type = {
- };
- #endif
--static struct ieee80211_channel *
--cfg80211_get_any_chan(struct cfg80211_registered_device *rdev)
--{
--      struct ieee80211_supported_band *sband;
--      int i;
--
--      for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
--              sband = rdev->wiphy.bands[i];
--              if (sband && sband->n_channels > 0)
--                      return &sband->channels[0];
--      }
--
--      return NULL;
--}
--
--static void cfg80211_init_mon_chan(struct cfg80211_registered_device *rdev)
--{
--      struct ieee80211_channel *chan;
--
--      chan = cfg80211_get_any_chan(rdev);
--      if (WARN_ON(!chan))
--              return;
--
--      mutex_lock(&rdev->devlist_mtx);
--      WARN_ON(cfg80211_set_monitor_channel(rdev, chan->center_freq,
--                                           NL80211_CHAN_NO_HT));
--      mutex_unlock(&rdev->devlist_mtx);
--}
--
- void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
-                              enum nl80211_iftype iftype, int num)
- {
--      bool has_monitors_only_old = cfg80211_has_monitors_only(rdev);
--      bool has_monitors_only_new;
--
-       ASSERT_RTNL();
-       rdev->num_running_ifaces += num;
-       if (iftype == NL80211_IFTYPE_MONITOR)
-               rdev->num_running_monitor_ifaces += num;
--
--      has_monitors_only_new = cfg80211_has_monitors_only(rdev);
--      if (has_monitors_only_new != has_monitors_only_old) {
--              if (rdev->ops->set_monitor_enabled)
--                      rdev->ops->set_monitor_enabled(&rdev->wiphy,
--                                                     has_monitors_only_new);
--
--              if (!has_monitors_only_new) {
--                      rdev->monitor_channel = NULL;
--                      rdev->monitor_channel_type = NL80211_CHAN_NO_HT;
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -517,29 +517,41 @@ void ieee80211_tx_status(struct ieee8021
+       if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
+               u64 cookie = (unsigned long)skb;
++              bool found = false;
++
+               acked = info->flags & IEEE80211_TX_STAT_ACK;
+-              if (ieee80211_is_nullfunc(hdr->frame_control) ||
+-                  ieee80211_is_qos_nullfunc(hdr->frame_control)) {
+-                      cfg80211_probe_status(skb->dev, hdr->addr1,
+-                                            cookie, acked, GFP_ATOMIC);
+-              } else if (skb->dev) {
+-                      cfg80211_mgmt_tx_status(
+-                              skb->dev->ieee80211_ptr, cookie, skb->data,
+-                              skb->len, acked, GFP_ATOMIC);
 -              } else {
--                      cfg80211_init_mon_chan(rdev);
--              }
--      }
- }
- static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
-@@ -932,6 +886,7 @@ static int cfg80211_netdev_notifier_call
-                       mutex_unlock(&rdev->devlist_mtx);
-                       dev_put(dev);
-               }
-+              cfg80211_update_iface_num(rdev, wdev->iftype, 1);
-               cfg80211_lock_rdev(rdev);
-               mutex_lock(&rdev->devlist_mtx);
-               wdev_lock(wdev);
-@@ -1026,7 +981,6 @@ static int cfg80211_netdev_notifier_call
-               mutex_unlock(&rdev->devlist_mtx);
-               if (ret)
-                       return notifier_from_errno(ret);
--              cfg80211_update_iface_num(rdev, wdev->iftype, 1);
-               break;
-       }
---- a/net/wireless/core.h
-+++ b/net/wireless/core.h
-@@ -61,9 +61,6 @@ struct cfg80211_registered_device {
-       int num_running_ifaces;
-       int num_running_monitor_ifaces;
--      struct ieee80211_channel *monitor_channel;
--      enum nl80211_channel_type monitor_channel_type;
--
-       /* BSSes/scanning */
-       spinlock_t bss_lock;
-       struct list_head bss_list;
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -1759,11 +1759,17 @@ static int nl80211_send_iface(struct sk_
-                       (cfg80211_rdev_list_generation << 2)))
-               goto nla_put_failure;
--      if (rdev->monitor_channel) {
--              if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
--                              rdev->monitor_channel->center_freq) ||
--                  nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
--                              rdev->monitor_channel_type))
-+      if (rdev->ops->get_channel) {
-+              struct ieee80211_channel *chan;
-+              enum nl80211_channel_type channel_type;
-+
-+              chan = rdev->ops->get_channel(&rdev->wiphy, wdev,
-+                                            &channel_type);
-+              if (chan &&
-+                  (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
-+                               chan->center_freq) ||
-+                   nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-+                               channel_type)))
-                       goto nla_put_failure;
-       }
---- a/net/wireless/wext-compat.c
-+++ b/net/wireless/wext-compat.c
-@@ -827,6 +827,8 @@ static int cfg80211_wext_giwfreq(struct 
- {
-       struct wireless_dev *wdev = dev->ieee80211_ptr;
-       struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
-+      struct ieee80211_channel *chan;
-+      enum nl80211_channel_type channel_type;
-       switch (wdev->iftype) {
-       case NL80211_IFTYPE_STATION:
-@@ -834,10 +836,13 @@ static int cfg80211_wext_giwfreq(struct 
-       case NL80211_IFTYPE_ADHOC:
-               return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
-       case NL80211_IFTYPE_MONITOR:
--              if (!rdev->monitor_channel)
-+              if (!rdev->ops->get_channel)
-                       return -EINVAL;
--              freq->m = rdev->monitor_channel->center_freq;
-+              chan = rdev->ops->get_channel(wdev->wiphy, wdev, &channel_type);
-+              if (!chan)
-+                      return -EINVAL;
-+              freq->m = chan->center_freq;
-               freq->e = 6;
-               return 0;
-       default:
---- a/drivers/net/wireless/ath/ath5k/ath5k.h
-+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
-@@ -1331,7 +1331,6 @@ struct ath5k_hw {
-       unsigned int            nexttbtt;       /* next beacon time in TU */
-       struct ath5k_txq        *cabq;          /* content after beacon */
--      int                     power_level;    /* Requested tx power in dBm */
-       bool                    assoc;          /* associate state */
-       bool                    enable_beacon;  /* true if beacons are on */
-@@ -1425,6 +1424,7 @@ struct ath5k_hw {
-               /* Value in dB units */
-               s16             txp_cck_ofdm_pwr_delta;
-               bool            txp_setup;
-+              int             txp_requested;  /* Requested tx power in dBm */
-       } ah_txpower;
-       struct ath5k_nfcal_hist ah_nfcal_hist;
---- a/drivers/net/wireless/ath/ath5k/base.c
-+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -325,6 +325,8 @@ ath5k_setup_channels(struct ath5k_hw *ah
-               if (!ath5k_is_standard_channel(ch, band))
-                       continue;
-+              channels[count].max_power = AR5K_TUNE_MAX_TXPOWER/2;
-+
-               count++;
-       }
-@@ -725,7 +727,7 @@ ath5k_txbuf_setup(struct ath5k_hw *ah, s
-       ret = ah->ah_setup_tx_desc(ah, ds, pktlen,
-               ieee80211_get_hdrlen_from_skb(skb), padsize,
-               get_hw_packet_type(skb),
--              (ah->power_level * 2),
-+              (ah->ah_txpower.txp_requested * 2),
-               hw_rate,
-               info->control.rates[0].count, keyidx, ah->ah_tx_ant, flags,
-               cts_rate, duration);
-@@ -1780,7 +1782,8 @@ ath5k_beacon_setup(struct ath5k_hw *ah, 
-       ds->ds_data = bf->skbaddr;
-       ret = ah->ah_setup_tx_desc(ah, ds, skb->len,
-                       ieee80211_get_hdrlen_from_skb(skb), padsize,
--                      AR5K_PKT_TYPE_BEACON, (ah->power_level * 2),
-+                      AR5K_PKT_TYPE_BEACON,
-+                      (ah->ah_txpower.txp_requested * 2),
-                       ieee80211_get_tx_rate(ah->hw, info)->hw_value,
-                       1, AR5K_TXKEYIX_INVALID,
-                       antenna, flags, 0, 0);
---- a/drivers/net/wireless/ath/ath5k/phy.c
-+++ b/drivers/net/wireless/ath/ath5k/phy.c
-@@ -3518,6 +3518,7 @@ ath5k_setup_rate_powertable(struct ath5k
- {
-       unsigned int i;
-       u16 *rates;
-+      s16 rate_idx_scaled = 0;
-       /* max_pwr is power level we got from driver/user in 0.5dB
-        * units, switch to 0.25dB units so we can compare */
-@@ -3564,20 +3565,32 @@ ath5k_setup_rate_powertable(struct ath5k
-               for (i = 8; i <= 15; i++)
-                       rates[i] -= ah->ah_txpower.txp_cck_ofdm_gainf_delta;
-+      /* Save min/max and current tx power for this channel
-+       * in 0.25dB units.
-+       *
-+       * Note: We use rates[0] for current tx power because
-+       * it covers most of the rates, in most cases. It's our
-+       * tx power limit and what the user expects to see. */
-+      ah->ah_txpower.txp_min_pwr = 2 * rates[7];
-+      ah->ah_txpower.txp_cur_pwr = 2 * rates[0];
-+
-+      /* Set max txpower for correct OFDM operation on all rates
-+       * -that is the txpower for 54Mbit-, it's used for the PAPD
-+       * gain probe and it's in 0.5dB units */
-+      ah->ah_txpower.txp_ofdm = rates[7];
-+
-       /* Now that we have all rates setup use table offset to
-        * match the power range set by user with the power indices
-        * on PCDAC/PDADC table */
-       for (i = 0; i < 16; i++) {
--              rates[i] += ah->ah_txpower.txp_offset;
-+              rate_idx_scaled = rates[i] + ah->ah_txpower.txp_offset;
-               /* Don't get out of bounds */
--              if (rates[i] > 63)
--                      rates[i] = 63;
-+              if (rate_idx_scaled > 63)
-+                      rate_idx_scaled = 63;
-+              if (rate_idx_scaled < 0)
-+                      rate_idx_scaled = 0;
-+              rates[i] = rate_idx_scaled;
-       }
--
--      /* Min/max in 0.25dB units */
--      ah->ah_txpower.txp_min_pwr = 2 * rates[7];
--      ah->ah_txpower.txp_cur_pwr = 2 * rates[0];
--      ah->ah_txpower.txp_ofdm = rates[7];
- }
-@@ -3641,10 +3654,17 @@ ath5k_hw_txpower(struct ath5k_hw *ah, st
-       if (!ah->ah_txpower.txp_setup ||
-           (channel->hw_value != curr_channel->hw_value) ||
-           (channel->center_freq != curr_channel->center_freq)) {
--              /* Reset TX power values */
-+              /* Reset TX power values but preserve requested
-+               * tx power from above */
-+              int requested_txpower = ah->ah_txpower.txp_requested;
-+
-               memset(&ah->ah_txpower, 0, sizeof(ah->ah_txpower));
-+
-+              /* Restore TPC setting and requested tx power */
-               ah->ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER;
-+              ah->ah_txpower.txp_requested = requested_txpower;
-+
-               /* Calculate the powertable */
-               ret = ath5k_setup_channel_powertable(ah, channel,
-                                                       ee_mode, type);
-@@ -3791,8 +3811,9 @@ ath5k_hw_phy_init(struct ath5k_hw *ah, s
-        * RF buffer settings on 5211/5212+ so that we
-        * properly set curve indices.
-        */
--      ret = ath5k_hw_txpower(ah, channel, ah->ah_txpower.txp_cur_pwr ?
--                      ah->ah_txpower.txp_cur_pwr / 2 : AR5K_TUNE_MAX_TXPOWER);
-+      ret = ath5k_hw_txpower(ah, channel, ah->ah_txpower.txp_requested ?
-+                                      ah->ah_txpower.txp_requested * 2 :
-+                                      AR5K_TUNE_MAX_TXPOWER);
-       if (ret)
-               return ret;
---- a/drivers/net/wireless/ath/ath5k/eeprom.c
-+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
-@@ -1484,7 +1484,7 @@ ath5k_eeprom_read_target_rate_pwr_info(s
-       case AR5K_EEPROM_MODE_11A:
-               offset += AR5K_EEPROM_TARGET_PWR_OFF_11A(ee->ee_version);
-               rate_pcal_info = ee->ee_rate_tpwr_a;
--              ee->ee_rate_target_pwr_num[mode] = AR5K_EEPROM_N_5GHZ_CHAN;
-+              ee->ee_rate_target_pwr_num[mode] = AR5K_EEPROM_N_5GHZ_RATE_CHAN;
-               break;
-       case AR5K_EEPROM_MODE_11B:
-               offset += AR5K_EEPROM_TARGET_PWR_OFF_11B(ee->ee_version);
---- a/drivers/net/wireless/ath/ath5k/eeprom.h
-+++ b/drivers/net/wireless/ath/ath5k/eeprom.h
-@@ -182,6 +182,7 @@
- #define AR5K_EEPROM_EEP_DELTA         10
- #define AR5K_EEPROM_N_MODES           3
- #define AR5K_EEPROM_N_5GHZ_CHAN               10
-+#define AR5K_EEPROM_N_5GHZ_RATE_CHAN  8
- #define AR5K_EEPROM_N_2GHZ_CHAN               3
- #define AR5K_EEPROM_N_2GHZ_CHAN_2413  4
- #define       AR5K_EEPROM_N_2GHZ_CHAN_MAX     4
---- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -142,6 +142,7 @@ static int ar9003_paprd_setup_single_tab
-       };
-       int training_power;
-       int i, val;
-+      u32 am2pm_mask = ah->paprd_ratemask;
-       if (IS_CHAN_2GHZ(ah->curchan))
-               training_power = ar9003_get_training_power_2g(ah);
-@@ -158,10 +159,13 @@ static int ar9003_paprd_setup_single_tab
-       }
-       ah->paprd_training_power = training_power;
-+      if (AR_SREV_9330(ah))
-+              am2pm_mask = 0;
-+
-       REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK,
-                     ah->paprd_ratemask);
-       REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK,
--                    ah->paprd_ratemask);
-+                    am2pm_mask);
-       REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK,
-                     ah->paprd_ratemask_ht40);
-@@ -782,6 +786,102 @@ int ar9003_paprd_setup_gain_table(struct
- }
- EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);
-+static bool ar9003_paprd_retrain_pa_in(struct ath_hw *ah,
-+                                     struct ath9k_hw_cal_data *caldata,
-+                                     int chain)
-+{
-+      u32 *pa_in = caldata->pa_table[chain];
-+      int capdiv_offset, quick_drop_offset;
-+      int capdiv2g, quick_drop;
-+      int count = 0;
-+      int i;
-+
-+      if (!AR_SREV_9485(ah) && !AR_SREV_9330(ah))
-+              return false;
-+
-+      capdiv2g = REG_READ_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,
-+                                AR_PHY_65NM_CH0_TXRF3_CAPDIV2G);
-+
-+      quick_drop = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                                  AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP);
-+
-+      if (quick_drop)
-+              quick_drop -= 0x40;
-+
-+      for (i = 0; i < NUM_BIN + 1; i++) {
-+              if (pa_in[i] == 1400)
-+                      count++;
-+      }
-+
-+      if (AR_SREV_9485(ah)) {
-+              if (pa_in[23] < 800) {
-+                      capdiv_offset = (int)((1000 - pa_in[23] + 75) / 150);
-+                      capdiv2g += capdiv_offset;
-+                      if (capdiv2g > 7) {
-+                              capdiv2g = 7;
-+                              if (pa_in[23] < 600) {
-+                                      quick_drop++;
-+                                      if (quick_drop > 0)
-+                                              quick_drop = 0;
-+                              }
-+                      }
-+              } else if (pa_in[23] == 1400) {
-+                      quick_drop_offset = min_t(int, count / 3, 2);
-+                      quick_drop += quick_drop_offset;
-+                      capdiv2g += quick_drop_offset / 2;
+-                      struct ieee80211_sub_if_data *p2p_sdata;
++              rcu_read_lock();
+-                      rcu_read_lock();
++              list_for_each_entry_rcu(sdata, &local->interfaces, list) {
++                      if (!sdata->dev)
++                              continue;
+-                      p2p_sdata = rcu_dereference(local->p2p_sdata);
+-                      if (p2p_sdata) {
+-                              cfg80211_mgmt_tx_status(
+-                                      &p2p_sdata->wdev, cookie, skb->data,
+-                                      skb->len, acked, GFP_ATOMIC);
+-                      }
+-                      rcu_read_unlock();
++                      if (skb->dev != sdata->dev)
++                              continue;
 +
-+                      if (capdiv2g > 7)
-+                              capdiv2g = 7;
++                      found = true;
++                      break;
+               }
 +
-+                      if (quick_drop > 0) {
-+                              quick_drop = 0;
-+                              capdiv2g -= quick_drop_offset;
-+                              if (capdiv2g < 0)
-+                                      capdiv2g = 0;
-+                      }
-+              } else {
-+                      return false;
++              if (!skb->dev) {
++                      sdata = rcu_dereference(local->p2p_sdata);
++                      if (sdata)
++                              found = true;
 +              }
-+      } else if (AR_SREV_9330(ah)) {
-+              if (pa_in[23] < 1000) {
-+                      capdiv_offset = (1000 - pa_in[23]) / 100;
-+                      capdiv2g += capdiv_offset;
-+                      if (capdiv_offset > 3) {
-+                              capdiv_offset = 1;
-+                              quick_drop--;
-+                      }
-+
-+                      capdiv2g += capdiv_offset;
-+                      if (capdiv2g > 6)
-+                              capdiv2g = 6;
-+                      if (quick_drop < -4)
-+                              quick_drop = -4;
-+              } else if (pa_in[23] == 1400) {
-+                      if (count > 3) {
-+                              quick_drop++;
-+                              capdiv2g -= count / 4;
-+                              if (quick_drop > -2)
-+                                      quick_drop = -2;
-+                      } else {
-+                              capdiv2g--;
-+                      }
 +
-+                      if (capdiv2g < 0)
-+                              capdiv2g = 0;
++              if (!found)
++                      skb->dev = NULL;
++              else if (ieee80211_is_nullfunc(hdr->frame_control) ||
++                       ieee80211_is_qos_nullfunc(hdr->frame_control)) {
++                      cfg80211_probe_status(sdata->dev, hdr->addr1,
++                                            cookie, acked, GFP_ATOMIC);
 +              } else {
-+                      return false;
++                      cfg80211_mgmt_tx_status(&sdata->wdev, cookie, skb->data,
++                                              skb->len, acked, GFP_ATOMIC);
 +              }
-+      }
-+
-+      REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,
-+                    AR_PHY_65NM_CH0_TXRF3_CAPDIV2G, capdiv2g);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP,
-+                    quick_drop);
 +
-+      return true;
-+}
-+
- int ar9003_paprd_create_curve(struct ath_hw *ah,
-                             struct ath9k_hw_cal_data *caldata, int chain)
- {
-@@ -817,6 +917,9 @@ int ar9003_paprd_create_curve(struct ath
-       if (!create_pa_curve(data_L, data_U, pa_table, small_signal_gain))
-               status = -2;
-+      if (ar9003_paprd_retrain_pa_in(ah, caldata, chain))
-+              status = -EINPROGRESS;
-+
-       REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
-                   AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
---- a/drivers/net/wireless/ath/ath9k/mac.c
-+++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -773,15 +773,10 @@ bool ath9k_hw_intrpend(struct ath_hw *ah
- }
- EXPORT_SYMBOL(ath9k_hw_intrpend);
--void ath9k_hw_disable_interrupts(struct ath_hw *ah)
-+void ath9k_hw_kill_interrupts(struct ath_hw *ah)
- {
-       struct ath_common *common = ath9k_hw_common(ah);
--      if (!(ah->imask & ATH9K_INT_GLOBAL))
--              atomic_set(&ah->intr_ref_cnt, -1);
--      else
--              atomic_dec(&ah->intr_ref_cnt);
--
-       ath_dbg(common, INTERRUPT, "disable IER\n");
-       REG_WRITE(ah, AR_IER, AR_IER_DISABLE);
-       (void) REG_READ(ah, AR_IER);
-@@ -793,6 +788,17 @@ void ath9k_hw_disable_interrupts(struct 
-               (void) REG_READ(ah, AR_INTR_SYNC_ENABLE);
++              rcu_read_unlock();
        }
- }
-+EXPORT_SYMBOL(ath9k_hw_kill_interrupts);
-+
-+void ath9k_hw_disable_interrupts(struct ath_hw *ah)
-+{
-+      if (!(ah->imask & ATH9K_INT_GLOBAL))
-+              atomic_set(&ah->intr_ref_cnt, -1);
-+      else
-+              atomic_dec(&ah->intr_ref_cnt);
-+
-+      ath9k_hw_kill_interrupts(ah);
-+}
- EXPORT_SYMBOL(ath9k_hw_disable_interrupts);
- void ath9k_hw_enable_interrupts(struct ath_hw *ah)
---- a/drivers/net/wireless/ath/ath9k/mac.h
-+++ b/drivers/net/wireless/ath/ath9k/mac.h
-@@ -738,6 +738,7 @@ bool ath9k_hw_intrpend(struct ath_hw *ah
- void ath9k_hw_set_interrupts(struct ath_hw *ah);
- void ath9k_hw_enable_interrupts(struct ath_hw *ah);
- void ath9k_hw_disable_interrupts(struct ath_hw *ah);
-+void ath9k_hw_kill_interrupts(struct ath_hw *ah);
  
- void ar9002_hw_attach_mac_ops(struct ath_hw *ah);
---- a/drivers/net/wireless/ath/ath9k/pci.c
-+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -331,6 +331,9 @@ static int ath_pci_suspend(struct device
static int ath_pci_resume(struct device *device)
+       if (unlikely(info->ack_frame_id)) {
+--- a/drivers/net/wireless/p54/main.c
++++ b/drivers/net/wireless/p54/main.c
+@@ -139,6 +139,7 @@ static int p54_beacon_format_ie_tim(stru
+ static int p54_beacon_update(struct p54_common *priv,
                      struct ieee80211_vif *vif)
  {
-       struct pci_dev *pdev = to_pci_dev(device);
-+      struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-+      struct ath_softc *sc = hw->priv;
-+      struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       u32 val;
-       /*
-@@ -342,6 +345,8 @@ static int ath_pci_resume(struct device 
-       if ((val & 0x0000ff00) != 0)
-               pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
++      struct ieee80211_tx_control control = { };
+       struct sk_buff *beacon;
+       int ret;
  
-+      ath_pci_aspm_init(common);
-+
-       return 0;
- }
+@@ -158,7 +159,7 @@ static int p54_beacon_update(struct p54_
+        * to cancel the old beacon template by hand, instead the firmware
+        * will release the previous one through the feedback mechanism.
+        */
+-      p54_tx_80211(priv->hw, NULL, beacon);
++      p54_tx_80211(priv->hw, &control, beacon);
+       priv->tsf_high32 = 0;
+       priv->tsf_low32 = 0;
  
index f58f805..2e2ba93 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c
-@@ -1702,6 +1702,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1790,6 +1790,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))
-@@ -1937,6 +1939,8 @@ static void restore_regulatory_settings(
+@@ -2024,6 +2026,8 @@ static void restore_regulatory_settings(
  
  void regulatory_hint_disconnect(void)
  {
index 39c95d2..8e02950 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -88,13 +88,8 @@ ath5k_add_interface(struct ieee80211_hw 
+@@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw 
                goto end;
        }
  
@@ -36,7 +36,7 @@
                intval /= ATH_BCBUF;    /* staggered multi-bss beacons */
                if (intval < 15)
                        ATH5K_WARN(ah, "intval %u is too low, min 15\n",
-@@ -2429,6 +2429,7 @@ static const struct ieee80211_iface_limi
+@@ -2427,6 +2427,7 @@ static const struct ieee80211_iface_limi
  #ifdef CONFIG_MAC80211_MESH
                                 BIT(NL80211_IFTYPE_MESH_POINT) |
  #endif
index 829d2bb..beb3d1f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -787,17 +787,11 @@ int ieee80211_register_hw(struct ieee802
+@@ -794,17 +794,11 @@ int ieee80211_register_hw(struct ieee802
         */
        for (i = 0; i < hw->wiphy->n_iface_combinations; i++) {
                const struct ieee80211_iface_combination *c;
index ec33376..a2141ab 100644 (file)
@@ -11,7 +11,7 @@ drivers/net/wireless/ath/ath5k/debug.c |   86 ++++++++++++++++++++++++++++++++
 
 --- a/drivers/net/wireless/ath/ath5k/debug.c
 +++ b/drivers/net/wireless/ath/ath5k/debug.c
-@@ -812,6 +812,89 @@ static const struct file_operations fops
+@@ -813,6 +813,89 @@ static const struct file_operations fops
        .llseek = default_llseek,
  };
  
@@ -101,7 +101,7 @@ drivers/net/wireless/ath/ath5k/debug.c |   86 ++++++++++++++++++++++++++++++++
  
  /* debugfs: queues etc */
  
-@@ -903,6 +986,9 @@ ath5k_debug_init_device(struct ath5k_hw 
+@@ -904,6 +987,9 @@ ath5k_debug_init_device(struct ath5k_hw 
        debugfs_create_file("beacon", S_IWUSR | S_IRUSR, phydir, ah,
                            &fops_beacon);
  
index 48338db..52ae70f 100644 (file)
@@ -1,15 +1,15 @@
 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
 +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
-@@ -267,7 +267,7 @@ static int ath9k_hw_def_check_eeprom(str
-       struct ar5416_eeprom_def *eep =
-               (struct ar5416_eeprom_def *) &ah->eeprom.def;
+@@ -266,7 +266,7 @@ static int ath9k_hw_def_check_eeprom(str
+ {
+       struct ar5416_eeprom_def *eep = &ah->eeprom.def;
        struct ath_common *common = ath9k_hw_common(ah);
 -      u16 *eepdata, temp, magic, magic2;
 +      u16 *eepdata, temp, magic;
        u32 sum = 0, el;
        bool need_swap = false;
        int i, addr, size;
-@@ -277,27 +277,16 @@ static int ath9k_hw_def_check_eeprom(str
+@@ -276,27 +276,16 @@ static int ath9k_hw_def_check_eeprom(str
                return false;
        }
  
@@ -49,7 +49,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
 +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
-@@ -196,7 +196,7 @@ static int ath9k_hw_4k_check_eeprom(stru
+@@ -195,7 +195,7 @@ static int ath9k_hw_4k_check_eeprom(stru
        int i, addr;
  
  
@@ -71,7 +71,7 @@
                        ath_err(common, "Reading Magic # failed\n");
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -704,6 +704,7 @@ enum ath_cal_list {
+@@ -705,6 +705,7 @@ enum ath_cal_list {
  #define AH_USE_EEPROM   0x1
  #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
  #define AH_FASTCC       0x4
index b6591b0..3b78afa 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1951,8 +1951,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1949,8 +1949,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
                REG_WRITE(ah, AR_OBS, 8);
  
        if (ah->config.rx_intr_mitigation) {
index d7a7206..d4087a0 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -658,6 +658,7 @@ struct ath_softc {
+@@ -659,6 +659,7 @@ struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
  
@@ -8,7 +8,7 @@
        struct survey_info *cur_survey;
        struct survey_info survey[ATH9K_NUM_CHANNELS];
  
-@@ -733,6 +734,7 @@ struct ath_softc {
+@@ -734,6 +735,7 @@ struct ath_softc {
  #endif
  };
  
@@ -80,7 +80,7 @@
  }
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1097,7 +1097,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1127,7 +1127,7 @@ static void ath9k_disable_ps(struct ath_
        ath_dbg(common, PS, "PowerSave disabled\n");
  }
  
@@ -89,7 +89,7 @@
  {
        struct ath_softc *sc = hw->priv;
        struct ath_hw *ah = sc->sc_ah;
-@@ -1151,9 +1151,11 @@ static int ath9k_config(struct ieee80211
+@@ -1181,9 +1181,11 @@ static int ath9k_config(struct ieee80211
  
        if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
                struct ieee80211_channel *curchan = hw->conf.channel;
  
                if (ah->curchan)
                        old_pos = ah->curchan - &ah->channels[0];
-@@ -1196,7 +1198,23 @@ static int ath9k_config(struct ieee80211
+@@ -1226,7 +1228,23 @@ static int ath9k_config(struct ieee80211
                        memset(&sc->survey[pos], 0, sizeof(struct survey_info));
                }
  
index 5988cef..25f4fdd 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -938,6 +938,7 @@ static const struct net_device_ops ieee8
+@@ -964,6 +964,7 @@ static const struct net_device_ops ieee8
  static void ieee80211_if_setup(struct net_device *dev)
  {
        ether_setup(dev);
index fefa111..bef6f29 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -835,7 +835,7 @@ enum ieee80211_smps_mode {
+@@ -863,7 +863,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
-@@ -1957,7 +1957,7 @@ static int ieee80211_get_tx_power(struct
+@@ -1969,7 +1969,7 @@ static int ieee80211_get_tx_power(struct
  {
        struct ieee80211_local *local = wiphy_priv(wiphy);
  
index f188c84..1cc4da2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1221,6 +1221,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1251,6 +1251,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
-@@ -1235,6 +1237,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1265,6 +1267,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);
index 0648e0d..8b26a50 100644 (file)
@@ -1,6 +1,6 @@
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -706,6 +706,9 @@ enum mac80211_rx_flags {
+@@ -729,6 +729,9 @@ enum mac80211_rx_flags {
   * @signal: signal strength when receiving this frame, either in dBm, in dB or
   *    unspecified depending on the hardware capabilities flags
   *    @IEEE80211_HW_SIGNAL_*
   * @antenna: antenna used
   * @rate_idx: index of data rate into band's supported rates or MCS index if
   *    HT rates are use (RX_FLAG_HT)
-@@ -722,6 +725,9 @@ struct ieee80211_rx_status {
+@@ -749,6 +752,8 @@ struct ieee80211_rx_status {
        u8 band;
        u8 antenna;
        s8 signal;
-+
 +      u8 chains;
 +      s8 chain_signal[4];
+       u8 ampdu_delimiter_crc;
  };
  
- /**
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h
 @@ -325,6 +325,11 @@ struct sta_info {
@@ -36,7 +35,7 @@
  
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -1231,6 +1231,7 @@ ieee80211_rx_h_sta_process(struct ieee80
+@@ -1271,6 +1271,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;
@@ -44,7 +43,7 @@
  
        if (!sta)
                return RX_CONTINUE;
-@@ -1275,6 +1276,19 @@ ieee80211_rx_h_sta_process(struct ieee80
+@@ -1315,6 +1316,19 @@ ieee80211_rx_h_sta_process(struct ieee80
                ewma_add(&sta->avg_signal, -status->signal);
        }
  
@@ -77,7 +76,7 @@
                kfree(sta);
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -546,6 +546,8 @@ struct station_parameters {
+@@ -549,6 +549,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
@@ -86,7 +85,7 @@
   */
  enum station_info_flags {
        STATION_INFO_INACTIVE_TIME      = 1<<0,
-@@ -569,6 +571,8 @@ enum station_info_flags {
+@@ -572,6 +574,8 @@ enum station_info_flags {
        STATION_INFO_STA_FLAGS          = 1<<18,
        STATION_INFO_BEACON_LOSS_COUNT  = 1<<19,
        STATION_INFO_T_OFFSET           = 1<<20,
@@ -95,7 +94,7 @@
  };
  
  /**
-@@ -652,6 +656,9 @@ struct sta_bss_parameters {
+@@ -655,6 +659,9 @@ struct sta_bss_parameters {
   *    For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
   * @signal_avg: Average signal strength, type depends on the wiphy's signal_type.
   *    For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
   * @txrate: current unicast bitrate from this station
   * @rxrate: current unicast bitrate to this station
   * @rx_packets: packets received from this station
-@@ -684,6 +691,11 @@ struct station_info {
+@@ -687,6 +694,11 @@ struct station_info {
        u8 plink_state;
        s8 signal;
        s8 signal_avg;
        RX_SAMP_DBG(rate) = rs->rs_rate;
 --- a/include/linux/nl80211.h
 +++ b/include/linux/nl80211.h
-@@ -1734,6 +1734,8 @@ enum nl80211_sta_bss_param {
+@@ -1760,6 +1760,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_AFTER_LAST: internal
   * @NL80211_STA_INFO_MAX: highest possible station info attribute
   */
-@@ -1758,6 +1760,8 @@ enum nl80211_sta_info {
+@@ -1784,6 +1786,8 @@ enum nl80211_sta_info {
        NL80211_STA_INFO_STA_FLAGS,
        NL80211_STA_INFO_BEACON_LOSS,
        NL80211_STA_INFO_T_OFFSET,
        __NL80211_STA_INFO_AFTER_LAST,
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -2745,6 +2745,32 @@ nla_put_failure:
+@@ -2769,6 +2769,32 @@ nla_put_failure:
        return false;
  }
  
  static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
                                int flags,
                                struct cfg80211_registered_device *rdev,
-@@ -2806,6 +2832,18 @@ static int nl80211_send_station(struct s
+@@ -2830,6 +2856,18 @@ static int nl80211_send_station(struct s
        default:
                break;
        }
                                          NL80211_STA_INFO_TX_BITRATE))
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -355,6 +355,7 @@ static void sta_set_sinfo(struct sta_inf
+@@ -367,6 +367,7 @@ static void sta_set_sinfo(struct sta_inf
        struct ieee80211_sub_if_data *sdata = sta->sdata;
        struct ieee80211_local *local = sdata->local;
        struct timespec uptime;
  
        sinfo->generation = sdata->local->sta_generation;
  
-@@ -394,6 +395,17 @@ static void sta_set_sinfo(struct sta_inf
+@@ -406,6 +407,17 @@ static void sta_set_sinfo(struct sta_inf
                        sinfo->signal = (s8)sta->last_signal;
                sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
        }
index ff49613..86dc518 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -537,6 +537,9 @@ struct ath9k_wow_pattern {
+@@ -538,6 +538,9 @@ struct ath9k_wow_pattern {
  #ifdef CONFIG_MAC80211_LEDS
  void ath_init_leds(struct ath_softc *sc);
  void ath_deinit_leds(struct ath_softc *sc);
@@ -10,7 +10,7 @@
  #else
  static inline void ath_init_leds(struct ath_softc *sc)
  {
-@@ -654,6 +657,13 @@ struct ath9k_vif_iter_data {
+@@ -655,6 +658,13 @@ struct ath9k_vif_iter_data {
        int nadhocs;   /* number of adhoc vifs */
  };
  
@@ -24,7 +24,7 @@
  struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
-@@ -695,9 +705,8 @@ struct ath_softc {
+@@ -696,9 +706,8 @@ struct ath_softc {
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  
  #ifdef CONFIG_MAC80211_LEDS
index d1f4599..a966fef 100644 (file)
@@ -1,6 +1,6 @@
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -710,6 +710,8 @@ struct ieee80211_sub_if_data {
+@@ -715,6 +715,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
-@@ -2136,9 +2136,20 @@ static int ieee80211_set_bitrate_mask(st
+@@ -2149,9 +2149,20 @@ static int ieee80211_set_bitrate_mask(st
        }
  
        for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
@@ -34,7 +34,7 @@
        return 0;
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -3670,7 +3670,7 @@ void ieee80211_send_bar(struct ieee80211
+@@ -3718,7 +3718,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 (legacy) rate mask
@@ -43,7 +43,7 @@
   * @bss: whether this frame is sent out in AP or IBSS mode
   */
  struct ieee80211_tx_rate_control {
-@@ -3682,7 +3682,7 @@ struct ieee80211_tx_rate_control {
+@@ -3730,7 +3730,7 @@ struct ieee80211_tx_rate_control {
        bool rts, short_preamble;
        u8 max_rate_idx;
        u32 rate_idx_mask;
        else
                txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
 -      memcpy(txrc.rate_idx_mcs_mask,
--             tx->sdata->rc_rateidx_mcs_mask[tx->channel->band],
+-             tx->sdata->rc_rateidx_mcs_mask[info->band],
 -             sizeof(txrc.rate_idx_mcs_mask));
 +
-+      if (tx->sdata->rc_has_mcs_mask[tx->channel->band])
++      if (tx->sdata->rc_has_mcs_mask[info->band])
 +              txrc.rate_idx_mcs_mask =
-+                      tx->sdata->rc_rateidx_mcs_mask[tx->channel->band];
++                      tx->sdata->rc_rateidx_mcs_mask[info->band];
 +
        txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP ||
                    tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
                    tx->sdata->vif.type == NL80211_IFTYPE_ADHOC);
-@@ -2464,8 +2466,6 @@ struct sk_buff *ieee80211_beacon_get_tim
+@@ -2447,8 +2449,6 @@ struct sk_buff *ieee80211_beacon_get_tim
                txrc.max_rate_idx = -1;
        else
                txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
index f2e2999..10fac17 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1057,6 +1057,7 @@ static void ath9k_remove_interface(struc
+@@ -1087,6 +1087,7 @@ static void ath9k_remove_interface(struc
        ath9k_calculate_summary_state(hw, NULL);
  
        mutex_unlock(&sc->mutex);
@@ -8,7 +8,7 @@
        ath9k_ps_restore(sc);
  }
  
-@@ -1109,7 +1110,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1139,7 +1140,8 @@ int ath9k_config(struct ieee80211_hw *hw
        mutex_lock(&sc->mutex);
  
        if (changed & IEEE80211_CONF_CHANGE_IDLE) {
diff --git a/package/mac80211/patches/564-ath9k_debugfs_diag.patch b/package/mac80211/patches/564-ath9k_debugfs_diag.patch
new file mode 100644 (file)
index 0000000..2cf2a73
--- /dev/null
@@ -0,0 +1,139 @@
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1678,6 +1678,50 @@ static const struct file_operations fops
+ };
++static ssize_t read_file_diag(struct file *file, char __user *user_buf,
++                           size_t count, loff_t *ppos)
++{
++      struct ath_softc *sc = file->private_data;
++      struct ath_hw *ah = sc->sc_ah;
++      char buf[32];
++      unsigned int len;
++
++      len = sprintf(buf, "0x%08lx\n", ah->diag);
++      return simple_read_from_buffer(user_buf, count, ppos, buf, len);
++}
++
++static ssize_t write_file_diag(struct file *file, const char __user *user_buf,
++                           size_t count, loff_t *ppos)
++{
++      struct ath_softc *sc = file->private_data;
++      struct ath_hw *ah = sc->sc_ah;
++      unsigned long diag;
++      char buf[32];
++      ssize_t len;
++
++      len = min(count, sizeof(buf) - 1);
++      if (copy_from_user(buf, user_buf, len))
++              return -EFAULT;
++
++      buf[len] = '\0';
++      if (strict_strtoul(buf, 0, &diag))
++              return -EINVAL;
++
++      ah->diag = diag;
++      ath9k_hw_update_diag(ah);
++
++      return count;
++}
++
++static const struct file_operations fops_diag = {
++      .read = read_file_diag,
++      .write = write_file_diag,
++      .open = simple_open,
++      .owner = THIS_MODULE,
++      .llseek = default_llseek,
++};
++
++
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+       struct ath_common *common = ath9k_hw_common(ah);
+@@ -1760,5 +1804,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+       debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+                           sc, &fops_chanbw);
++      debugfs_create_file("diag", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
++                          sc, &fops_diag);
++
+       return 0;
+ }
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -498,6 +498,12 @@ enum {
+       ATH9K_RESET_COLD,
+ };
++enum {
++      ATH_DIAG_DISABLE_RX,
++      ATH_DIAG_DISABLE_TX,
++      ATH_DIAG_TRIGGER_ERROR,
++};
++
+ struct ath9k_hw_version {
+       u32 magic;
+       u16 devid;
+@@ -741,6 +747,8 @@ struct ath_hw {
+       u32 rfkill_polarity;
+       u32 ah_flags;
++      unsigned long diag;
++
+       bool htc_reset_init;
+       enum nl80211_iftype opmode;
+@@ -1007,6 +1015,7 @@ void ath9k_hw_set_sta_beacon_timers(stru
+ bool ath9k_hw_check_alive(struct ath_hw *ah);
+ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
++void ath9k_hw_update_diag(struct ath_hw *ah);
+ #ifdef CONFIG_ATH9K_DEBUGFS
+ void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause);
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1749,6 +1749,20 @@ fail:
+       return -EINVAL;
+ }
++void ath9k_hw_update_diag(struct ath_hw *ah)
++{
++      if (test_bit(ATH_DIAG_DISABLE_RX, &ah->diag))
++              REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
++      else
++              REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
++
++      if (test_bit(ATH_DIAG_DISABLE_TX, &ah->diag))
++              REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_LOOP_BACK);
++      else
++              REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_LOOP_BACK);
++}
++EXPORT_SYMBOL(ath9k_hw_update_diag);
++
+ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
+                  struct ath9k_hw_cal_data *caldata, bool fastcc)
+ {
+@@ -2026,6 +2040,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+       }
+       ath9k_hw_apply_gpio_override(ah);
++      ath9k_hw_update_diag(ah);
+       return 0;
+ }
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -476,6 +476,11 @@ irqreturn_t ath_isr(int irq, void *dev)
+       ath9k_hw_getisr(ah, &status);   /* NB: clears ISR too */
+       status &= ah->imask;    /* discard unasked-for bits */
++      if (test_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag)) {
++              status |= ATH9K_INT_FATAL;
++              clear_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag);
++      }
++
+       /*
+        * If there are no status bits set, then this interrupt was not
+        * for me (should have been caught above).
diff --git a/package/mac80211/patches/564-ath9k_remove_imr_mib.patch b/package/mac80211/patches/564-ath9k_remove_imr_mib.patch
deleted file mode 100644 (file)
index e444117..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -983,9 +983,6 @@ static void ath9k_hw_init_interrupt_mask
-       else
-               imr_reg |= AR_IMR_TXOK;
--      if (opmode == NL80211_IFTYPE_AP)
--              imr_reg |= AR_IMR_MIB;
--
-       ENABLE_REGWRITE_BUFFER(ah);
-       REG_WRITE(ah, AR_IMR, imr_reg);
diff --git a/package/mac80211/patches/570-mac80211_tx_status_crash.patch b/package/mac80211/patches/570-mac80211_tx_status_crash.patch
deleted file mode 100644 (file)
index abcf56e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/net/mac80211/status.c
-+++ b/net/mac80211/status.c
-@@ -517,6 +517,8 @@ void ieee80211_tx_status(struct ieee8021
-       if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
-               u64 cookie = (unsigned long)skb;
-+              bool found = false;
-+
-               acked = info->flags & IEEE80211_TX_STAT_ACK;
-               /*
-@@ -524,8 +526,18 @@ void ieee80211_tx_status(struct ieee8021
-                * we cannot use skb->dev->ieee80211_ptr
-                */
--              if (ieee80211_is_nullfunc(hdr->frame_control) ||
--                  ieee80211_is_qos_nullfunc(hdr->frame_control))
-+              list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-+                      if (skb->dev != sdata->dev)
-+                              continue;
-+
-+                      found = true;
-+                      break;
-+              }
-+
-+              if (!found)
-+                      skb->dev = NULL;
-+              else if (ieee80211_is_nullfunc(hdr->frame_control) ||
-+                       ieee80211_is_qos_nullfunc(hdr->frame_control))
-                       cfg80211_probe_status(skb->dev, hdr->addr1,
-                                             cookie, acked, GFP_ATOMIC);
-               else
index 0c979ec..4f35ae8 100644 (file)
  obj-$(CONFIG_RT2X00_LIB_PCI)          += rt2x00pci.o
 --- a/drivers/net/wireless/rt2x00/rt2800pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -84,20 +84,10 @@ static void rt2800pci_mcu_status(struct 
+@@ -89,20 +89,10 @@ static void rt2800pci_mcu_status(struct 
        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
  }
  
  
  #ifdef CONFIG_PCI
  static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
-@@ -317,6 +307,20 @@ static int rt2800pci_write_firmware(stru
+@@ -322,6 +312,20 @@ static int rt2800pci_write_firmware(stru
  }
  
  /*
   * Initialization functions.
   */
  static bool rt2800pci_get_entry_state(struct queue_entry *entry)
-@@ -1159,6 +1163,7 @@ static const struct rt2x00lib_ops rt2800
+@@ -1033,6 +1037,7 @@ static const struct rt2x00lib_ops rt2800
        .get_firmware_name      = rt2800pci_get_firmware_name,
        .check_firmware         = rt2800_check_firmware,
        .load_firmware          = rt2800_load_firmware,
index c2b46fd..fbc8619 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2800pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -84,7 +84,7 @@ static void rt2800pci_mcu_status(struct 
+@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct 
        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
  }
  
@@ -9,14 +9,14 @@
  {
        memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
  }
-@@ -974,8 +974,9 @@ static int rt2800pci_validate_eeprom(str
-       /*
-        * Read EEPROM into buffer
-        */
+@@ -976,8 +976,9 @@ static irqreturn_t rt2800pci_interrupt(i
+  */
+ static void rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev)
+ {
 -      if (rt2x00_is_soc(rt2x00dev))
 -              rt2800pci_read_eeprom_soc(rt2x00dev);
 +      if (rt2x00_is_soc(rt2x00dev) ||
-+                      test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
++          test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
 +              rt2800pci_read_eeprom_file(rt2x00dev);
        else if (rt2800pci_efuse_detect(rt2x00dev))
                rt2800pci_read_eeprom_efuse(rt2x00dev);
index 5008180..c1b22e7 100644 (file)
@@ -41,7 +41,7 @@
   * Interrupt context handlers.
 --- a/drivers/net/wireless/rt2x00/rt61pci.c
 +++ b/drivers/net/wireless/rt2x00/rt61pci.c
-@@ -2393,6 +2393,7 @@ static int rt61pci_validate_eeprom(struc
+@@ -2392,6 +2392,7 @@ static int rt61pci_validate_eeprom(struc
        u32 reg;
        u16 word;
        u8 *mac;
@@ -49,7 +49,7 @@
        s8 value;
  
        rt2x00pci_register_read(rt2x00dev, E2PROM_CSR, &reg);
-@@ -2413,7 +2414,11 @@ static int rt61pci_validate_eeprom(struc
+@@ -2412,7 +2413,11 @@ static int rt61pci_validate_eeprom(struc
        /*
         * Start validation of the data that has been read.
         */
@@ -59,5 +59,5 @@
 +              memcpy(mac, pdata_mac, 6);
 +
        if (!is_valid_ether_addr(mac)) {
-               random_ether_addr(mac);
+               eth_random_addr(mac);
                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
index 282fea8..27473ec 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -1547,6 +1547,7 @@ void rt2800_config_ant(struct rt2x00_dev
+@@ -1615,6 +1615,7 @@ void rt2800_config_ant(struct rt2x00_dev
        case 1:
                if (rt2x00_rt(rt2x00dev, RT3070) ||
                    rt2x00_rt(rt2x00dev, RT3090) ||
@@ -8,7 +8,7 @@
                    rt2x00_rt(rt2x00dev, RT3390)) {
                        rt2x00_eeprom_read(rt2x00dev,
                                           EEPROM_NIC_CONF1, &eeprom);
-@@ -1985,6 +1986,58 @@ static void rt2800_config_channel_rf3290
+@@ -2053,6 +2054,58 @@ static void rt2800_config_channel_rf3290
        }
  }
  
@@ -67,7 +67,7 @@
  static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                                         struct ieee80211_conf *conf,
                                         struct rf_channel *rf,
-@@ -2114,6 +2167,9 @@ static void rt2800_config_channel(struct
+@@ -2182,6 +2235,9 @@ static void rt2800_config_channel(struct
        case RF3290:
                rt2800_config_channel_rf3290(rt2x00dev, conf, rf, info);
                break;
@@ -77,7 +77,7 @@
        case RF5360:
        case RF5370:
        case RF5372:
-@@ -2126,6 +2182,7 @@ static void rt2800_config_channel(struct
+@@ -2194,6 +2250,7 @@ static void rt2800_config_channel(struct
        }
  
        if (rt2x00_rf(rt2x00dev, RF3290) ||
@@ -85,7 +85,7 @@
            rt2x00_rf(rt2x00dev, RF5360) ||
            rt2x00_rf(rt2x00dev, RF5370) ||
            rt2x00_rf(rt2x00dev, RF5372) ||
-@@ -2144,10 +2201,20 @@ static void rt2800_config_channel(struct
+@@ -2212,10 +2269,20 @@ static void rt2800_config_channel(struct
        /*
         * Change BBP settings
         */
  
        if (rf->channel <= 14) {
                if (!rt2x00_rt(rt2x00dev, RT5390) &&
-@@ -2242,6 +2309,16 @@ static void rt2800_config_channel(struct
+@@ -2310,6 +2377,16 @@ static void rt2800_config_channel(struct
        rt2800_register_read(rt2x00dev, CH_IDLE_STA, &reg);
        rt2800_register_read(rt2x00dev, CH_BUSY_STA, &reg);
        rt2800_register_read(rt2x00dev, CH_BUSY_STA_SEC, &reg);
  }
  
  static int rt2800_get_gain_calibration_delta(struct rt2x00_dev *rt2x00dev)
-@@ -2893,11 +2970,15 @@ static int rt2800_init_registers(struct
+@@ -2961,11 +3038,15 @@ static int rt2800_init_registers(struct 
        if (rt2x00_rt(rt2x00dev, RT3071) ||
            rt2x00_rt(rt2x00dev, RT3090) ||
            rt2x00_rt(rt2x00dev, RT3290) ||
                else
                        rt2800_register_write(rt2x00dev, TX_SW_CFG0,
                                              0x00000400);
-@@ -3310,6 +3391,11 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3378,6 +3459,11 @@ static int rt2800_init_bbp(struct rt2x00
                     rt2800_wait_bbp_ready(rt2x00dev)))
                return -EACCES;
  
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392)) {
-@@ -3320,15 +3406,20 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3388,15 +3474,20 @@ static int rt2800_init_bbp(struct rt2x00
  
        if (rt2800_is_305x_soc(rt2x00dev) ||
            rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 68, 0x0b);
-@@ -3337,6 +3428,7 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3405,6 +3496,7 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 69, 0x16);
                rt2800_bbp_write(rt2x00dev, 73, 0x12);
        } else if (rt2x00_rt(rt2x00dev, RT3290) ||
                   rt2x00_rt(rt2x00dev, RT5390) ||
                   rt2x00_rt(rt2x00dev, RT5392)) {
                rt2800_bbp_write(rt2x00dev, 69, 0x12);
-@@ -3368,6 +3460,10 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3436,6 +3528,10 @@ static int rt2800_init_bbp(struct rt2x00
        } else if (rt2800_is_305x_soc(rt2x00dev)) {
                rt2800_bbp_write(rt2x00dev, 78, 0x0e);
                rt2800_bbp_write(rt2x00dev, 80, 0x08);
        } else {
                rt2800_bbp_write(rt2x00dev, 81, 0x37);
        }
-@@ -3397,18 +3493,21 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3465,18 +3561,21 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 84, 0x99);
  
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 92, 0x02);
-@@ -3425,6 +3524,7 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3493,6 +3592,7 @@ static int rt2800_init_bbp(struct rt2x00
            rt2x00_rt_rev_gte(rt2x00dev, RT3090, REV_RT3090E) ||
            rt2x00_rt_rev_gte(rt2x00dev, RT3390, REV_RT3390E) ||
            rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT3572) ||
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392) ||
-@@ -3434,6 +3534,7 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3502,6 +3602,7 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 103, 0x00);
  
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 104, 0x92);
-@@ -3442,6 +3543,8 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3510,6 +3611,8 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 105, 0x01);
        else if (rt2x00_rt(rt2x00dev, RT3290))
                rt2800_bbp_write(rt2x00dev, 105, 0x1c);
        else if (rt2x00_rt(rt2x00dev, RT5390) ||
                         rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 105, 0x3c);
-@@ -3451,11 +3554,16 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3519,11 +3622,16 @@ static int rt2800_init_bbp(struct rt2x00
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT5390))
                rt2800_bbp_write(rt2x00dev, 106, 0x03);
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
-@@ -3466,6 +3574,9 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3534,6 +3642,9 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 135, 0xf6);
        }
  
        if (rt2x00_rt(rt2x00dev, RT3071) ||
            rt2x00_rt(rt2x00dev, RT3090) ||
            rt2x00_rt(rt2x00dev, RT3390) ||
-@@ -3506,6 +3617,28 @@ static int rt2800_init_bbp(struct rt2x00
+@@ -3574,6 +3685,28 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 3, value);
        }
  
        if (rt2x00_rt(rt2x00dev, RT5390) ||
                rt2x00_rt(rt2x00dev, RT5392)) {
                int ant, div_mode;
-@@ -3639,6 +3772,7 @@ static int rt2800_init_rfcsr(struct rt2x
+@@ -3707,6 +3840,7 @@ static int rt2800_init_rfcsr(struct rt2x
            !rt2x00_rt(rt2x00dev, RT3071) &&
            !rt2x00_rt(rt2x00dev, RT3090) &&
            !rt2x00_rt(rt2x00dev, RT3290) &&
            !rt2x00_rt(rt2x00dev, RT3390) &&
            !rt2x00_rt(rt2x00dev, RT3572) &&
            !rt2x00_rt(rt2x00dev, RT5390) &&
-@@ -3835,6 +3969,70 @@ static int rt2800_init_rfcsr(struct rt2x
+@@ -3903,6 +4037,70 @@ static int rt2800_init_rfcsr(struct rt2x
                rt2800_rfcsr_write(rt2x00dev, 30, 0x00);
                rt2800_rfcsr_write(rt2x00dev, 31, 0x00);
                return 0;
        } else if (rt2x00_rt(rt2x00dev, RT5390)) {
                rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
                rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
-@@ -4035,6 +4233,7 @@ static int rt2800_init_rfcsr(struct rt2x
+@@ -4104,6 +4302,7 @@ static int rt2800_init_rfcsr(struct rt2x
                        rt2800_init_rx_filter(rt2x00dev, true, 0x27, 0x19);
        } else if (rt2x00_rt(rt2x00dev, RT3071) ||
                   rt2x00_rt(rt2x00dev, RT3090) ||
                   rt2x00_rt(rt2x00dev, RT3390) ||
                   rt2x00_rt(rt2x00dev, RT3572)) {
                drv_data->calibration_bw20 =
-@@ -4493,6 +4692,7 @@ int rt2800_init_eeprom(struct rt2x00_dev
+@@ -4566,6 +4765,7 @@ static int rt2800_init_eeprom(struct rt2
        case RT3071:
        case RT3090:
        case RT3290:
        case RT3390:
        case RT3572:
        case RT5390:
-@@ -4515,6 +4715,7 @@ int rt2800_init_eeprom(struct rt2x00_dev
+@@ -4588,6 +4788,7 @@ static int rt2800_init_eeprom(struct rt2
        case RF3052:
        case RF3290:
        case RF3320:
        case RF5360:
        case RF5370:
        case RF5372:
-@@ -4539,6 +4740,7 @@ int rt2800_init_eeprom(struct rt2x00_dev
+@@ -4612,6 +4813,7 @@ static int rt2800_init_eeprom(struct rt2
  
        if (rt2x00_rt(rt2x00dev, RT3070) ||
            rt2x00_rt(rt2x00dev, RT3090) ||
            rt2x00_rt(rt2x00dev, RT3390)) {
                value = rt2x00_get_field16(eeprom,
                                EEPROM_NIC_CONF1_ANT_DIVERSITY);
-@@ -4832,6 +5034,7 @@ int rt2800_probe_hw_mode(struct rt2x00_d
+@@ -4904,6 +5106,7 @@ static int rt2800_probe_hw_mode(struct r
                   rt2x00_rf(rt2x00dev, RF3022) ||
                   rt2x00_rf(rt2x00dev, RF3290) ||
                   rt2x00_rf(rt2x00dev, RF3320) ||
  #define RT3593                0x3593
 --- a/drivers/net/wireless/rt2x00/rt2800.h
 +++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -1936,6 +1936,11 @@ struct mac_iveiv_entry {
+@@ -1943,6 +1943,11 @@ struct mac_iveiv_entry {
  #define BBP47_TSSI_ADC6                       FIELD8(0x80)
  
  /*
index 4763c9f..7ebc4f1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwl8k.c
 +++ b/drivers/net/wireless/mwl8k.c
-@@ -5299,6 +5299,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw")
+@@ -5302,6 +5302,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) = {
index 01f270f..55ab0aa 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -803,6 +803,7 @@ struct b43_wldev {
+@@ -807,6 +807,7 @@ struct b43_wldev {
        bool qos_enabled;               /* TRUE, if QoS is used. */
        bool hwcrypto_enabled;          /* TRUE, if HW crypto acceleration is enabled. */
        bool use_pio;                   /* TRUE if next init should use PIO */
@@ -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,
-@@ -2690,10 +2695,10 @@ static int b43_gpio_init(struct b43_wlde
+@@ -2688,10 +2693,10 @@ static int b43_gpio_init(struct b43_wlde
        u32 mask, set;
  
        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
index 2827517..f511795 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/b43/Makefile
 +++ b/drivers/net/wireless/b43/Makefile
-@@ -19,7 +19,7 @@ b43-y                                += xmit.o
+@@ -20,7 +20,7 @@ b43-y                                += xmit.o
  b43-y                         += lo.o
  b43-y                         += wa.o
  b43-y                         += dma.o
index 1cd2171..551213d 100644 (file)
@@ -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. */
-@@ -3046,8 +3046,8 @@ static int b43_chip_init(struct b43_wlde
+@@ -3049,8 +3049,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);
-@@ -3790,7 +3790,6 @@ static int b43_op_config(struct ieee8021
+@@ -3794,7 +3794,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;
  
-@@ -3844,11 +3843,9 @@ static int b43_op_config(struct ieee8021
+@@ -3848,11 +3847,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) {
-@@ -4941,6 +4938,47 @@ static int b43_op_get_survey(struct ieee
+@@ -4974,6 +4971,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,
-@@ -4962,6 +5000,8 @@ static const struct ieee80211_ops b43_hw
+@@ -4995,6 +5033,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.
-@@ -5208,6 +5248,8 @@ static int b43_one_core_attach(struct b4
+@@ -5241,6 +5281,8 @@ static int b43_one_core_attach(struct b4
        if (!wldev)
                goto out;
  
        wldev->use_pio = b43_modparam_pio;
        wldev->dev = dev;
        wldev->wl = wl;
-@@ -5298,6 +5340,9 @@ static struct b43_wl *b43_wireless_init(
+@@ -5331,6 +5373,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;
 +
-       hw->queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;
-       wl->mac80211_initially_registered_queues = hw->queues;
        wl->hw_registred = false;
+       hw->max_rates = 2;
+       SET_IEEE80211_DEV(hw, dev->dev);
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -804,6 +804,8 @@ struct b43_wldev {
+@@ -808,6 +808,8 @@ struct b43_wldev {
        bool hwcrypto_enabled;          /* TRUE, if HW crypto acceleration is enabled. */
        bool use_pio;                   /* TRUE if next init should use PIO */
        int gpiomask;                   /* GPIO LED mask as a module parameter */
index 98153f0..ce9ad7d 100644 (file)
@@ -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
-@@ -1051,6 +1051,32 @@ static inline bool b43_using_pio_transfe
+@@ -1048,6 +1048,32 @@ static inline bool b43_using_pio_transfe
        return dev->__using_pio_transfers;
  }
  
@@ -73,7 +73,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev);
 --- a/drivers/net/wireless/b43/phy_common.c
 +++ b/drivers/net/wireless/b43/phy_common.c
-@@ -251,6 +251,12 @@ void b43_phy_write(struct b43_wldev *dev
+@@ -266,6 +266,12 @@ void b43_phy_write(struct b43_wldev *dev
  {
        assert_mac_suspended(dev);
        dev->phy.ops->phy_write(dev, reg, value);
@@ -88,7 +88,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                dev->phy.writes_counter = 0;
 --- a/drivers/net/wireless/b43/phy_n.c
 +++ b/drivers/net/wireless/b43/phy_n.c
-@@ -4838,14 +4838,14 @@ static inline void check_phyreg(struct b
+@@ -5423,14 +5423,14 @@ static inline void check_phyreg(struct b
  static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)
  {
        check_phyreg(dev, reg);
@@ -105,7 +105,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        b43_write16(dev, B43_MMIO_PHY_DATA, value);
  }
  
-@@ -4853,7 +4853,7 @@ static void b43_nphy_op_maskset(struct b
+@@ -5438,7 +5438,7 @@ static void b43_nphy_op_maskset(struct b
                                 u16 set)
  {
        check_phyreg(dev, reg);
@@ -114,7 +114,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
  }
  
-@@ -4864,7 +4864,7 @@ static u16 b43_nphy_op_radio_read(struct
+@@ -5449,7 +5449,7 @@ static u16 b43_nphy_op_radio_read(struct
        /* N-PHY needs 0x100 for read access */
        reg |= 0x100;
  
@@ -123,7 +123,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
  }
  
-@@ -4873,7 +4873,7 @@ static void b43_nphy_op_radio_write(stru
+@@ -5458,7 +5458,7 @@ static void b43_nphy_op_radio_write(stru
        /* Register 1 is a 32-bit register. */
        B43_WARN_ON(reg == 1);
  
index 000f5db..f70a261 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-@@ -92,6 +92,7 @@ MODULE_LICENSE("Dual BSD/GPL");
+@@ -94,6 +94,7 @@ MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw")
  
  /* recognized BCMA Core IDs */
  static struct bcma_device_id brcms_coreid_table[] = {
index 9315b41..198af61 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-@@ -95,6 +95,7 @@ static struct bcma_device_id brcms_corei
+@@ -97,6 +97,7 @@ static struct bcma_device_id brcms_corei
  //    BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 17, BCMA_ANY_CLASS),
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, BCMA_ANY_CLASS),
        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS),