mac80211: update to 2010-06-10, add pending work with stability and throughput fixes...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21756 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index d0d5224..bf73710 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2010-05-24
+PKG_VERSION:=2010-06-10
 PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 #      http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \
 #      http://wireless.kernel.org/download/compat-wireless-2.6
-PKG_MD5SUM:=3d465dc6e0213964d0349f61c485817f
+PKG_MD5SUM:=4074469689f7a5a0d2e038f2b5dad0bb
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)

diff --git a/package/mac80211/patches/001-disable_b44.patch b/package/mac80211/patches/001-disable_b44.patch
index 1869a59..3182261 100644 (file)
--- a/package/mac80211/patches/001-disable_b44.patch
+++ b/package/mac80211/patches/001-disable_b44.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -256,8 +256,8 @@ endif
+@@ -257,8 +257,8 @@ endif
  
  CONFIG_P54_PCI=m
  

diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index 0a11c61..c8183ba 100644 (file)
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -9,7 +9,7 @@
  
  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")
-@@ -483,8 +483,8 @@ endif
+@@ -488,8 +488,8 @@ endif
  # 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_31

diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch
index 69f29f6..4b01fa3 100644 (file)
--- a/package/mac80211/patches/005-disable_ssb_build.patch
+++ b/package/mac80211/patches/005-disable_ssb_build.patch
@@ -19,7 +19,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -239,21 +238,6 @@ CONFIG_IPW2200_QOS=y
+@@ -240,21 +239,6 @@ CONFIG_IPW2200_QOS=y
  #
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  
@@ -41,7 +41,7 @@
  CONFIG_P54_PCI=m
  
  # CONFIG_B44=m
-@@ -413,7 +397,6 @@ endif # end of SPI driver list
+@@ -418,7 +402,6 @@ endif # end of SPI driver list
  
  ifneq ($(CONFIG_MMC),)
  

diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index afd7161..4087e74 100644 (file)
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,21 +1,25 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -270,10 +270,10 @@ endif
+@@ -271,13 +271,13 @@ endif
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
 -CONFIG_ATL1=m
 -CONFIG_ATL2=m
 -CONFIG_ATL1E=m
--CONFIG_ATL1C=m
 +# CONFIG_ATL1=m
 +# CONFIG_ATL2=m
 +# CONFIG_ATL1E=m
+ ifdef CONFIG_COMPAT_KERNEL_27
+-CONFIG_ATL1C=n
++# CONFIG_ATL1C=n
+ else
+-CONFIG_ATL1C=m
 +# CONFIG_ATL1C=m
+ endif
  
  CONFIG_HERMES=m
- CONFIG_HERMES_CACHE_FW_ON_INIT=y
-@@ -326,10 +326,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+@@ -331,10 +331,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
  CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
  CONFIG_USB_NET_COMPAT_CDCETHER=n
  else

diff --git a/package/mac80211/patches/010-no_pcmcia.patch b/package/mac80211/patches/010-no_pcmcia.patch
index 8d5e5e9..078b803 100644 (file)
--- a/package/mac80211/patches/010-no_pcmcia.patch
+++ b/package/mac80211/patches/010-no_pcmcia.patch
@@ -9,7 +9,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -180,7 +180,7 @@ CONFIG_B43=m
+@@ -181,7 +181,7 @@ CONFIG_B43=m
  CONFIG_B43_HWRNG=y
  CONFIG_B43_PCI_AUTOSELECT=y
  ifneq ($(CONFIG_PCMCIA),)

diff --git a/package/mac80211/patches/011-no_sdio.patch b/package/mac80211/patches/011-no_sdio.patch
index 82d8c1b..d0916e4 100644 (file)
--- a/package/mac80211/patches/011-no_sdio.patch
+++ b/package/mac80211/patches/011-no_sdio.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -382,7 +382,7 @@ endif # end of SPI driver list
+@@ -387,7 +387,7 @@ endif # end of SPI driver list
  
  ifneq ($(CONFIG_MMC),)
  

diff --git a/package/mac80211/patches/013-disable_b43_nphy.patch b/package/mac80211/patches/013-disable_b43_nphy.patch
index e75bb9b..efdfb14 100644 (file)
--- a/package/mac80211/patches/013-disable_b43_nphy.patch
+++ b/package/mac80211/patches/013-disable_b43_nphy.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -184,7 +184,7 @@ ifneq ($(CONFIG_PCMCIA),)
+@@ -185,7 +185,7 @@ ifneq ($(CONFIG_PCMCIA),)
  endif
  CONFIG_B43_LEDS=y
  CONFIG_B43_PHY_LP=y

diff --git a/package/mac80211/patches/015-remove-rt2x00-options.patch b/package/mac80211/patches/015-remove-rt2x00-options.patch
index dd0bcdb..a9176ec 100644 (file)
--- a/package/mac80211/patches/015-remove-rt2x00-options.patch
+++ b/package/mac80211/patches/015-remove-rt2x00-options.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -232,12 +232,12 @@ CONFIG_RTL8180=m
+@@ -233,12 +233,12 @@ CONFIG_RTL8180=m
  
  CONFIG_ADM8211=m
  
@@ -15,9 +15,9 @@
  # CONFIG_RT2800PCI_RT30XX=y
  # CONFIG_RT2800PCI_RT35XX=y
  # CONFIG_RT2800PCI_SOC=y
-@@ -339,7 +339,7 @@ CONFIG_RT2800USB=m
- # CONFIG_RT2800USB_RT35XX=y
- # CONFIG_RT2800USB_UNKNOWN=y
+@@ -344,7 +344,7 @@ CONFIG_RT2800USB_RT30XX=y
+ CONFIG_RT2800USB_RT35XX=y
+ CONFIG_RT2800USB_UNKNOWN=y
  endif
 -CONFIG_RT2X00_LIB_USB=m
 +# CONFIG_RT2X00_LIB_USB=m

diff --git a/package/mac80211/patches/016-remove_pid_algo.patch b/package/mac80211/patches/016-remove_pid_algo.patch
index fade3bf..33b19cc 100644 (file)
--- a/package/mac80211/patches/016-remove_pid_algo.patch
+++ b/package/mac80211/patches/016-remove_pid_algo.patch
@@ -7,5 +7,5 @@
 -CONFIG_MAC80211_RC_PID=y
 +# CONFIG_MAC80211_RC_PID=y
  CONFIG_MAC80211_RC_MINSTREL=y
+ CONFIG_MAC80211_RC_MINSTREL_HT=y
  CONFIG_MAC80211_LEDS=y
- 

diff --git a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
index b4538a6..38f56ed 100644 (file)
--- a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
+++ b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/reset.c
 +++ b/drivers/net/wireless/ath/ath5k/reset.c
-@@ -1374,10 +1374,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
+@@ -1334,10 +1334,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
         * guess we can tweak it and see how it goes ;-)
         */
        if (ah->ah_version != AR5K_AR5210) {

diff --git a/package/mac80211/patches/300-mac80211_debugfs_debloat.patch b/package/mac80211/patches/300-mac80211_debugfs_debloat.patch
deleted file mode 100644 (file)
index ed75466..0000000
--- a/package/mac80211/patches/300-mac80211_debugfs_debloat.patch
+++ /dev/null
@@ -1,262 +0,0 @@
---- a/net/mac80211/debugfs.c
-+++ b/net/mac80211/debugfs.c
-@@ -307,9 +307,6 @@ static const struct file_operations queu
- 
- /* statistics stuff */
- 
--#define DEBUGFS_STATS_FILE(name, buflen, fmt, value...)                       \
--      DEBUGFS_READONLY_FILE(stats_ ##name, buflen, fmt, ##value)
--
- static ssize_t format_devstat_counter(struct ieee80211_local *local,
-       char __user *userbuf,
-       size_t count, loff_t *ppos,
-@@ -351,75 +348,16 @@ static const struct file_operations stat
-       .open = mac80211_open_file_generic,                             \
- };
- 
--#define DEBUGFS_STATS_ADD(name)                                               \
-+#define DEBUGFS_STATS_ADD(name, field)                                        \
-+      debugfs_create_u32(#name, 0400, statsd, (u32 *) &field);
-+#define DEBUGFS_DEVSTATS_ADD(name)                                    \
-       debugfs_create_file(#name, 0400, statsd, local, &stats_ ##name## _ops);
- 
--DEBUGFS_STATS_FILE(transmitted_fragment_count, 20, "%u",
--                 local->dot11TransmittedFragmentCount);
--DEBUGFS_STATS_FILE(multicast_transmitted_frame_count, 20, "%u",
--                 local->dot11MulticastTransmittedFrameCount);
--DEBUGFS_STATS_FILE(failed_count, 20, "%u",
--                 local->dot11FailedCount);
--DEBUGFS_STATS_FILE(retry_count, 20, "%u",
--                 local->dot11RetryCount);
--DEBUGFS_STATS_FILE(multiple_retry_count, 20, "%u",
--                 local->dot11MultipleRetryCount);
--DEBUGFS_STATS_FILE(frame_duplicate_count, 20, "%u",
--                 local->dot11FrameDuplicateCount);
--DEBUGFS_STATS_FILE(received_fragment_count, 20, "%u",
--                 local->dot11ReceivedFragmentCount);
--DEBUGFS_STATS_FILE(multicast_received_frame_count, 20, "%u",
--                 local->dot11MulticastReceivedFrameCount);
--DEBUGFS_STATS_FILE(transmitted_frame_count, 20, "%u",
--                 local->dot11TransmittedFrameCount);
--#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
--DEBUGFS_STATS_FILE(tx_handlers_drop, 20, "%u",
--                 local->tx_handlers_drop);
--DEBUGFS_STATS_FILE(tx_handlers_queued, 20, "%u",
--                 local->tx_handlers_queued);
--DEBUGFS_STATS_FILE(tx_handlers_drop_unencrypted, 20, "%u",
--                 local->tx_handlers_drop_unencrypted);
--DEBUGFS_STATS_FILE(tx_handlers_drop_fragment, 20, "%u",
--                 local->tx_handlers_drop_fragment);
--DEBUGFS_STATS_FILE(tx_handlers_drop_wep, 20, "%u",
--                 local->tx_handlers_drop_wep);
--DEBUGFS_STATS_FILE(tx_handlers_drop_not_assoc, 20, "%u",
--                 local->tx_handlers_drop_not_assoc);
--DEBUGFS_STATS_FILE(tx_handlers_drop_unauth_port, 20, "%u",
--                 local->tx_handlers_drop_unauth_port);
--DEBUGFS_STATS_FILE(rx_handlers_drop, 20, "%u",
--                 local->rx_handlers_drop);
--DEBUGFS_STATS_FILE(rx_handlers_queued, 20, "%u",
--                 local->rx_handlers_queued);
--DEBUGFS_STATS_FILE(rx_handlers_drop_nullfunc, 20, "%u",
--                 local->rx_handlers_drop_nullfunc);
--DEBUGFS_STATS_FILE(rx_handlers_drop_defrag, 20, "%u",
--                 local->rx_handlers_drop_defrag);
--DEBUGFS_STATS_FILE(rx_handlers_drop_short, 20, "%u",
--                 local->rx_handlers_drop_short);
--DEBUGFS_STATS_FILE(rx_handlers_drop_passive_scan, 20, "%u",
--                 local->rx_handlers_drop_passive_scan);
--DEBUGFS_STATS_FILE(tx_expand_skb_head, 20, "%u",
--                 local->tx_expand_skb_head);
--DEBUGFS_STATS_FILE(tx_expand_skb_head_cloned, 20, "%u",
--                 local->tx_expand_skb_head_cloned);
--DEBUGFS_STATS_FILE(rx_expand_skb_head, 20, "%u",
--                 local->rx_expand_skb_head);
--DEBUGFS_STATS_FILE(rx_expand_skb_head2, 20, "%u",
--                 local->rx_expand_skb_head2);
--DEBUGFS_STATS_FILE(rx_handlers_fragments, 20, "%u",
--                 local->rx_handlers_fragments);
--DEBUGFS_STATS_FILE(tx_status_drop, 20, "%u",
--                 local->tx_status_drop);
--
--#endif
--
- DEBUGFS_DEVSTATS_FILE(dot11ACKFailureCount);
- DEBUGFS_DEVSTATS_FILE(dot11RTSFailureCount);
- DEBUGFS_DEVSTATS_FILE(dot11FCSErrorCount);
- DEBUGFS_DEVSTATS_FILE(dot11RTSSuccessCount);
- 
--
- void debugfs_hw_add(struct ieee80211_local *local)
- {
-       struct dentry *phyd = local->hw.wiphy->debugfsdir;
-@@ -448,38 +386,60 @@ void debugfs_hw_add(struct ieee80211_loc
-       if (!statsd)
-               return;
- 
--      DEBUGFS_STATS_ADD(transmitted_fragment_count);
--      DEBUGFS_STATS_ADD(multicast_transmitted_frame_count);
--      DEBUGFS_STATS_ADD(failed_count);
--      DEBUGFS_STATS_ADD(retry_count);
--      DEBUGFS_STATS_ADD(multiple_retry_count);
--      DEBUGFS_STATS_ADD(frame_duplicate_count);
--      DEBUGFS_STATS_ADD(received_fragment_count);
--      DEBUGFS_STATS_ADD(multicast_received_frame_count);
--      DEBUGFS_STATS_ADD(transmitted_frame_count);
-+      DEBUGFS_STATS_ADD(transmitted_fragment_count,
-+              local->dot11TransmittedFragmentCount);
-+      DEBUGFS_STATS_ADD(multicast_transmitted_frame_count,
-+              local->dot11MulticastTransmittedFrameCount);
-+      DEBUGFS_STATS_ADD(failed_count, local->dot11FailedCount);
-+      DEBUGFS_STATS_ADD(retry_count, local->dot11RetryCount);
-+      DEBUGFS_STATS_ADD(multiple_retry_count,
-+              local->dot11MultipleRetryCount);
-+      DEBUGFS_STATS_ADD(frame_duplicate_count,
-+              local->dot11FrameDuplicateCount);
-+      DEBUGFS_STATS_ADD(received_fragment_count,
-+              local->dot11ReceivedFragmentCount);
-+      DEBUGFS_STATS_ADD(multicast_received_frame_count,
-+              local->dot11MulticastReceivedFrameCount);
-+      DEBUGFS_STATS_ADD(transmitted_frame_count,
-+              local->dot11TransmittedFrameCount);
- #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
--      DEBUGFS_STATS_ADD(tx_handlers_drop);
--      DEBUGFS_STATS_ADD(tx_handlers_queued);
--      DEBUGFS_STATS_ADD(tx_handlers_drop_unencrypted);
--      DEBUGFS_STATS_ADD(tx_handlers_drop_fragment);
--      DEBUGFS_STATS_ADD(tx_handlers_drop_wep);
--      DEBUGFS_STATS_ADD(tx_handlers_drop_not_assoc);
--      DEBUGFS_STATS_ADD(tx_handlers_drop_unauth_port);
--      DEBUGFS_STATS_ADD(rx_handlers_drop);
--      DEBUGFS_STATS_ADD(rx_handlers_queued);
--      DEBUGFS_STATS_ADD(rx_handlers_drop_nullfunc);
--      DEBUGFS_STATS_ADD(rx_handlers_drop_defrag);
--      DEBUGFS_STATS_ADD(rx_handlers_drop_short);
--      DEBUGFS_STATS_ADD(rx_handlers_drop_passive_scan);
--      DEBUGFS_STATS_ADD(tx_expand_skb_head);
--      DEBUGFS_STATS_ADD(tx_expand_skb_head_cloned);
--      DEBUGFS_STATS_ADD(rx_expand_skb_head);
--      DEBUGFS_STATS_ADD(rx_expand_skb_head2);
--      DEBUGFS_STATS_ADD(rx_handlers_fragments);
--      DEBUGFS_STATS_ADD(tx_status_drop);
-+      DEBUGFS_STATS_ADD(tx_handlers_drop, local->tx_handlers_drop);
-+      DEBUGFS_STATS_ADD(tx_handlers_queued, local->tx_handlers_queued);
-+      DEBUGFS_STATS_ADD(tx_handlers_drop_unencrypted,
-+              local->tx_handlers_drop_unencrypted);
-+      DEBUGFS_STATS_ADD(tx_handlers_drop_fragment,
-+              local->tx_handlers_drop_fragment);
-+      DEBUGFS_STATS_ADD(tx_handlers_drop_wep,
-+              local->tx_handlers_drop_wep);
-+      DEBUGFS_STATS_ADD(tx_handlers_drop_not_assoc,
-+              local->tx_handlers_drop_not_assoc);
-+      DEBUGFS_STATS_ADD(tx_handlers_drop_unauth_port,
-+              local->tx_handlers_drop_unauth_port);
-+      DEBUGFS_STATS_ADD(rx_handlers_drop, local->rx_handlers_drop);
-+      DEBUGFS_STATS_ADD(rx_handlers_queued, local->rx_handlers_queued);
-+      DEBUGFS_STATS_ADD(rx_handlers_drop_nullfunc,
-+              local->rx_handlers_drop_nullfunc);
-+      DEBUGFS_STATS_ADD(rx_handlers_drop_defrag,
-+              local->rx_handlers_drop_defrag);
-+      DEBUGFS_STATS_ADD(rx_handlers_drop_short,
-+              local->rx_handlers_drop_short);
-+      DEBUGFS_STATS_ADD(rx_handlers_drop_passive_scan,
-+              local->rx_handlers_drop_passive_scan);
-+      DEBUGFS_STATS_ADD(tx_expand_skb_head,
-+              local->tx_expand_skb_head);
-+      DEBUGFS_STATS_ADD(tx_expand_skb_head_cloned,
-+              local->tx_expand_skb_head_cloned);
-+      DEBUGFS_STATS_ADD(rx_expand_skb_head,
-+              local->rx_expand_skb_head);
-+      DEBUGFS_STATS_ADD(rx_expand_skb_head2,
-+              local->rx_expand_skb_head2);
-+      DEBUGFS_STATS_ADD(rx_handlers_fragments,
-+              local->rx_handlers_fragments);
-+      DEBUGFS_STATS_ADD(tx_status_drop,
-+              local->tx_status_drop);
- #endif
--      DEBUGFS_STATS_ADD(dot11ACKFailureCount);
--      DEBUGFS_STATS_ADD(dot11RTSFailureCount);
--      DEBUGFS_STATS_ADD(dot11FCSErrorCount);
--      DEBUGFS_STATS_ADD(dot11RTSSuccessCount);
-+      DEBUGFS_DEVSTATS_ADD(dot11ACKFailureCount);
-+      DEBUGFS_DEVSTATS_ADD(dot11RTSFailureCount);
-+      DEBUGFS_DEVSTATS_ADD(dot11FCSErrorCount);
-+      DEBUGFS_DEVSTATS_ADD(dot11RTSSuccessCount);
- }
---- a/net/mac80211/debugfs_sta.c
-+++ b/net/mac80211/debugfs_sta.c
-@@ -30,7 +30,6 @@ static ssize_t sta_ ##name## _read(struc
- }
- #define STA_READ_D(name, field) STA_READ(name, 20, field, "%d\n")
- #define STA_READ_U(name, field) STA_READ(name, 20, field, "%u\n")
--#define STA_READ_LU(name, field) STA_READ(name, 20, field, "%lu\n")
- #define STA_READ_S(name, field) STA_READ(name, 20, field, "%s\n")
- 
- #define STA_OPS(name)                                                 \
-@@ -52,19 +51,7 @@ static const struct file_operations sta_
- 
- STA_FILE(aid, sta.aid, D);
- STA_FILE(dev, sdata->name, S);
--STA_FILE(rx_packets, rx_packets, LU);
--STA_FILE(tx_packets, tx_packets, LU);
--STA_FILE(rx_bytes, rx_bytes, LU);
--STA_FILE(tx_bytes, tx_bytes, LU);
--STA_FILE(rx_duplicates, num_duplicates, LU);
--STA_FILE(rx_fragments, rx_fragments, LU);
--STA_FILE(rx_dropped, rx_dropped, LU);
--STA_FILE(tx_fragments, tx_fragments, LU);
--STA_FILE(tx_filtered, tx_filtered_count, LU);
--STA_FILE(tx_retry_failed, tx_retry_failed, LU);
--STA_FILE(tx_retry_count, tx_retry_count, LU);
- STA_FILE(last_signal, last_signal, D);
--STA_FILE(wep_weak_iv_count, wep_weak_iv_count, LU);
- 
- static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
-                             size_t count, loff_t *ppos)
-@@ -307,6 +294,13 @@ STA_OPS(ht_capa);
-       debugfs_create_file(#name, 0400, \
-               sta->debugfs.dir, sta, &sta_ ##name## _ops);
- 
-+#define DEBUGFS_ADD_COUNTER(name, field)                              \
-+      if (sizeof(sta->field) == sizeof(u32))                          \
-+              debugfs_create_u32(#name, 0400, sta->debugfs.dir,       \
-+                      (u32 *) &sta->field);                           \
-+      else                                                            \
-+              debugfs_create_u64(#name, 0400, sta->debugfs.dir,       \
-+                      (u64 *) &sta->field);
- 
- void ieee80211_sta_debugfs_add(struct sta_info *sta)
- {
-@@ -339,20 +333,21 @@ void ieee80211_sta_debugfs_add(struct st
-       DEBUGFS_ADD(last_seq_ctrl);
-       DEBUGFS_ADD(agg_status);
-       DEBUGFS_ADD(dev);
--      DEBUGFS_ADD(rx_packets);
--      DEBUGFS_ADD(tx_packets);
--      DEBUGFS_ADD(rx_bytes);
--      DEBUGFS_ADD(tx_bytes);
--      DEBUGFS_ADD(rx_duplicates);
--      DEBUGFS_ADD(rx_fragments);
--      DEBUGFS_ADD(rx_dropped);
--      DEBUGFS_ADD(tx_fragments);
--      DEBUGFS_ADD(tx_filtered);
--      DEBUGFS_ADD(tx_retry_failed);
--      DEBUGFS_ADD(tx_retry_count);
-       DEBUGFS_ADD(last_signal);
--      DEBUGFS_ADD(wep_weak_iv_count);
-       DEBUGFS_ADD(ht_capa);
-+
-+      DEBUGFS_ADD_COUNTER(rx_packets, rx_packets);
-+      DEBUGFS_ADD_COUNTER(tx_packets, tx_packets);
-+      DEBUGFS_ADD_COUNTER(rx_bytes, rx_bytes);
-+      DEBUGFS_ADD_COUNTER(tx_bytes, tx_bytes);
-+      DEBUGFS_ADD_COUNTER(rx_duplicates, num_duplicates);
-+      DEBUGFS_ADD_COUNTER(rx_fragments, rx_fragments);
-+      DEBUGFS_ADD_COUNTER(rx_dropped, rx_dropped);
-+      DEBUGFS_ADD_COUNTER(tx_fragments, tx_fragments);
-+      DEBUGFS_ADD_COUNTER(tx_filtered, tx_filtered_count);
-+      DEBUGFS_ADD_COUNTER(tx_retry_failed, tx_retry_failed);
-+      DEBUGFS_ADD_COUNTER(tx_retry_count, tx_retry_count);
-+      DEBUGFS_ADD_COUNTER(wep_weak_iv_count, wep_weak_iv_count);
- }
- 
- void ieee80211_sta_debugfs_remove(struct sta_info *sta)

diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
index 946dda5..2c6a567 100644 (file)
--- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,7 +8,7 @@
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -456,8 +457,16 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -450,8 +451,16 @@ static int ath9k_hw_init_macaddr(struct 
                common->macaddr[2 * i] = eeval >> 8;
                common->macaddr[2 * i + 1] = eeval & 0xff;
        }

diff --git a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
index 58728c5..72d3701 100644 (file)
--- a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
+++ b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
@@ -10,7 +10,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -565,6 +565,7 @@ static int ath9k_init_softc(u16 devid, s
+@@ -556,6 +556,7 @@ static int ath9k_init_softc(u16 devid, s
  {
        struct ath_hw *ah = NULL;
        struct ath_common *common;
@@ -18,7 +18,7 @@
        int ret = 0, i;
        int csz = 0;
  
-@@ -576,6 +577,10 @@ static int ath9k_init_softc(u16 devid, s
+@@ -567,6 +568,10 @@ static int ath9k_init_softc(u16 devid, s
        ah->hw_version.subsysid = subsysid;
        sc->sc_ah = ah;
  
@@ -31,7 +31,7 @@
        common->bus_ops = bus_ops;
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -429,10 +429,6 @@ static void ath9k_hw_init_defaults(struc
+@@ -423,10 +423,6 @@ static void ath9k_hw_init_defaults(struc
        ah->hw_version.magic = AR5416_MAGIC;
        ah->hw_version.subvendorid = 0;
  

diff --git a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
index 20a33bb..7a3e717 100644 (file)
--- a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
+++ b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
@@ -11,7 +11,7 @@
  #include "hw.h"
  #include "hw-ops.h"
  #include "rc.h"
-@@ -441,18 +443,23 @@ static void ath9k_hw_init_defaults(struc
+@@ -435,18 +437,23 @@ static void ath9k_hw_init_defaults(struc
  static int ath9k_hw_init_macaddr(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);

diff --git a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
index 6396e25..180368a 100644 (file)
--- a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
+++ b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1400,7 +1400,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1398,7 +1398,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  
        if (ah->config.rx_intr_mitigation) {
                REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);

diff --git a/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch b/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch
index 57a5678..1cdd45e 100644 (file)
--- a/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch
+++ b/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch
@@ -8,7 +8,7 @@
  #include "ath9k.h"
  
  static char *dev_info = "ath9k";
-@@ -580,6 +581,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -571,6 +572,8 @@ static int ath9k_init_softc(u16 devid, s
        pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
        if (!pdata)
                ah->ah_flags |= AH_USE_EEPROM;
@@ -17,7 +17,7 @@
  
        common = ath9k_hw_common(ah);
        common->ops = &ath9k_common_ops;
-@@ -702,6 +705,24 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -693,6 +696,24 @@ void ath9k_set_hw_capab(struct ath_softc
        SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
  }
  
@@ -42,7 +42,7 @@
  int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
                    const struct ath_bus_ops *bus_ops)
  {
-@@ -720,6 +741,9 @@ int ath9k_init_device(u16 devid, struct 
+@@ -711,6 +732,9 @@ int ath9k_init_device(u16 devid, struct 
        common = ath9k_hw_common(ah);
        ath9k_set_hw_capab(sc, hw);
  
@@ -54,7 +54,7 @@
                              ath9k_reg_notifier);
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -517,6 +517,8 @@ struct ath_softc {
+@@ -583,6 +583,8 @@ struct ath_softc {
  
        int beacon_interval;
  

diff --git a/package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch b/package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch
index c0e1e7f..eb1d316 100644 (file)
--- a/package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch
+++ b/package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch
@@ -13,7 +13,7 @@
                sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -392,6 +392,7 @@ void ath9k_btcoex_timer_pause(struct ath
+@@ -458,6 +458,7 @@ void ath9k_btcoex_timer_pause(struct ath
  
  #define ATH_LED_PIN_DEF               1
  #define ATH_LED_PIN_9287              8

diff --git a/package/mac80211/patches/500-ath9k_use_minstrel.patch b/package/mac80211/patches/500-ath9k_use_minstrel.patch
new file mode 100644 (file)
index 0000000..8669c8c
--- /dev/null
+++ b/package/mac80211/patches/500-ath9k_use_minstrel.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -677,7 +677,11 @@ void ath9k_set_hw_capab(struct ath_softc
+       hw->sta_data_size = sizeof(struct ath_node);
+       hw->vif_data_size = sizeof(struct ath_vif);
+ 
++#ifdef ATH9K_USE_MINSTREL
++      hw->rate_control_algorithm = "minstrel_ht";
++#else
+       hw->rate_control_algorithm = "ath9k_rate_control";
++#endif
+ 
+       if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes))
+               hw->wiphy->bands[IEEE80211_BAND_2GHZ] =

diff --git a/package/mac80211/patches/500-pending_work.patch b/package/mac80211/patches/500-pending_work.patch
deleted file mode 100644 (file)
index 16ba6f5..0000000
--- a/package/mac80211/patches/500-pending_work.patch
+++ /dev/null
@@ -1,9874 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/Kconfig
-+++ b/drivers/net/wireless/ath/ath9k/Kconfig
-@@ -32,6 +32,13 @@ config ATH9K_DEBUGFS
- 
-         Also required for changing debug message flags at run time.
- 
-+config ATH9K_PKTLOG
-+      bool "ath9k packet logging support"
-+      depends on ATH9K_DEBUGFS
-+      ---help---
-+      Say Y to dump frame information during tx/rx, rate information
-+      and ani state.
-+
- config ATH9K_HTC
-        tristate "Atheros HTC based wireless cards support"
-        depends on USB && MAC80211
-@@ -53,3 +60,4 @@ config ATH9K_HTC_DEBUGFS
-       depends on ATH9K_HTC && DEBUG_FS
-       ---help---
-         Say Y, if you need access to ath9k_htc's statistics.
-+
---- a/drivers/net/wireless/ath/ath9k/Makefile
-+++ b/drivers/net/wireless/ath/ath9k/Makefile
-@@ -10,6 +10,7 @@ ath9k-y +=   beacon.o \
- ath9k-$(CONFIG_PCI) += pci.o
- ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o
- ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
-+ath9k-$(CONFIG_ATH9K_PKTLOG) += pktlog.o
- 
- obj-$(CONFIG_ATH9K) += ath9k.o
- 
---- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
-@@ -215,7 +215,8 @@ static void ar9002_hw_fill_txdesc(struct
- }
- 
- static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
--                               struct ath_tx_status *ts)
-+                               struct ath_tx_status *ts,
-+                               void *txs_desc)
- {
-       struct ar5416_desc *ads = AR5416DESC(ds);
- 
---- /dev/null
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h
-@@ -0,0 +1,1784 @@
-+/*
-+ * Copyright (c) 2010 Atheros Communications Inc.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef INITVALS_9003_2P0_H
-+#define INITVALS_9003_2P0_H
-+
-+/* AR9003 2.0 */
-+
-+static const u32 ar9300_2p0_radio_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0001609c, 0x0dd08f29, 0x0dd08f29, 0x0b283f31, 0x0b283f31},
-+      {0x000160ac, 0xa4653c00, 0xa4653c00, 0x24652800, 0x24652800},
-+      {0x000160b0, 0x03284f3e, 0x03284f3e, 0x05d08f20, 0x05d08f20},
-+      {0x0001610c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
-+      {0x0001650c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
-+      {0x0001690c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00016940, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
-+};
-+
-+static const u32 ar9300Modes_lowest_ob_db_tx_gain_table_2p0[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-+      {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
-+      {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
-+      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
-+      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
-+      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
-+      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
-+      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
-+      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
-+      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
-+      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
-+      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
-+      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-+      {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
-+      {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
-+      {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
-+      {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
-+      {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
-+      {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
-+      {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
-+      {0x0000a598, 0x21820220, 0x21820220, 0x16800402, 0x16800402},
-+      {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
-+      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
-+      {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
-+      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
-+      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
-+      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
-+      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
-+      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
-+      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
-+      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
-+      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
-+      {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x47801a83, 0x47801a83},
-+      {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4a801c84, 0x4a801c84},
-+      {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4e801ce3, 0x4e801ce3},
-+      {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x52801ce5, 0x52801ce5},
-+      {0x0000a5dc, 0x7086308c, 0x7086308c, 0x56801ce9, 0x56801ce9},
-+      {0x0000a5e0, 0x738a308a, 0x738a308a, 0x5a801ceb, 0x5a801ceb},
-+      {0x0000a5e4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5e8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5ec, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f0, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5fc, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016048, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
-+      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016448, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
-+      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016848, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
-+      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
-+static const u32 ar9300Modes_fast_clock_2p0[][3] = {
-+      /* Addr      5G_HT20     5G_HT40   */
-+      {0x00001030, 0x00000268, 0x000004d0},
-+      {0x00001070, 0x0000018c, 0x00000318},
-+      {0x000010b0, 0x00000fd0, 0x00001fa0},
-+      {0x00008014, 0x044c044c, 0x08980898},
-+      {0x0000801c, 0x148ec02b, 0x148ec057},
-+      {0x00008318, 0x000044c0, 0x00008980},
-+      {0x00009e00, 0x03721821, 0x03721821},
-+      {0x0000a230, 0x0000000b, 0x00000016},
-+      {0x0000a254, 0x00000898, 0x00001130},
-+};
-+
-+static const u32 ar9300_2p0_radio_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00016000, 0x36db6db6},
-+      {0x00016004, 0x6db6db40},
-+      {0x00016008, 0x73f00000},
-+      {0x0001600c, 0x00000000},
-+      {0x00016040, 0x7f80fff8},
-+      {0x0001604c, 0x76d005b5},
-+      {0x00016050, 0x556cf031},
-+      {0x00016054, 0x13449440},
-+      {0x00016058, 0x0c51c92c},
-+      {0x0001605c, 0x3db7fffc},
-+      {0x00016060, 0xfffffffc},
-+      {0x00016064, 0x000f0278},
-+      {0x0001606c, 0x6db60000},
-+      {0x00016080, 0x00000000},
-+      {0x00016084, 0x0e48048c},
-+      {0x00016088, 0x54214514},
-+      {0x0001608c, 0x119f481e},
-+      {0x00016090, 0x24926490},
-+      {0x00016098, 0xd2888888},
-+      {0x000160a0, 0x0a108ffe},
-+      {0x000160a4, 0x812fc370},
-+      {0x000160a8, 0x423c8000},
-+      {0x000160b4, 0x92480080},
-+      {0x000160c0, 0x00adb6d0},
-+      {0x000160c4, 0x6db6db60},
-+      {0x000160c8, 0x6db6db6c},
-+      {0x000160cc, 0x01e6c000},
-+      {0x00016100, 0x3fffbe01},
-+      {0x00016104, 0xfff80000},
-+      {0x00016108, 0x00080010},
-+      {0x00016144, 0x02084080},
-+      {0x00016148, 0x00000000},
-+      {0x00016280, 0x058a0001},
-+      {0x00016284, 0x3d840208},
-+      {0x00016288, 0x05a20408},
-+      {0x0001628c, 0x00038c07},
-+      {0x00016290, 0x40000004},
-+      {0x00016294, 0x458aa14f},
-+      {0x00016380, 0x00000000},
-+      {0x00016384, 0x00000000},
-+      {0x00016388, 0x00800700},
-+      {0x0001638c, 0x00800700},
-+      {0x00016390, 0x00800700},
-+      {0x00016394, 0x00000000},
-+      {0x00016398, 0x00000000},
-+      {0x0001639c, 0x00000000},
-+      {0x000163a0, 0x00000001},
-+      {0x000163a4, 0x00000001},
-+      {0x000163a8, 0x00000000},
-+      {0x000163ac, 0x00000000},
-+      {0x000163b0, 0x00000000},
-+      {0x000163b4, 0x00000000},
-+      {0x000163b8, 0x00000000},
-+      {0x000163bc, 0x00000000},
-+      {0x000163c0, 0x000000a0},
-+      {0x000163c4, 0x000c0000},
-+      {0x000163c8, 0x14021402},
-+      {0x000163cc, 0x00001402},
-+      {0x000163d0, 0x00000000},
-+      {0x000163d4, 0x00000000},
-+      {0x00016400, 0x36db6db6},
-+      {0x00016404, 0x6db6db40},
-+      {0x00016408, 0x73f00000},
-+      {0x0001640c, 0x00000000},
-+      {0x00016440, 0x7f80fff8},
-+      {0x0001644c, 0x76d005b5},
-+      {0x00016450, 0x556cf031},
-+      {0x00016454, 0x13449440},
-+      {0x00016458, 0x0c51c92c},
-+      {0x0001645c, 0x3db7fffc},
-+      {0x00016460, 0xfffffffc},
-+      {0x00016464, 0x000f0278},
-+      {0x0001646c, 0x6db60000},
-+      {0x00016500, 0x3fffbe01},
-+      {0x00016504, 0xfff80000},
-+      {0x00016508, 0x00080010},
-+      {0x00016544, 0x02084080},
-+      {0x00016548, 0x00000000},
-+      {0x00016780, 0x00000000},
-+      {0x00016784, 0x00000000},
-+      {0x00016788, 0x00800700},
-+      {0x0001678c, 0x00800700},
-+      {0x00016790, 0x00800700},
-+      {0x00016794, 0x00000000},
-+      {0x00016798, 0x00000000},
-+      {0x0001679c, 0x00000000},
-+      {0x000167a0, 0x00000001},
-+      {0x000167a4, 0x00000001},
-+      {0x000167a8, 0x00000000},
-+      {0x000167ac, 0x00000000},
-+      {0x000167b0, 0x00000000},
-+      {0x000167b4, 0x00000000},
-+      {0x000167b8, 0x00000000},
-+      {0x000167bc, 0x00000000},
-+      {0x000167c0, 0x000000a0},
-+      {0x000167c4, 0x000c0000},
-+      {0x000167c8, 0x14021402},
-+      {0x000167cc, 0x00001402},
-+      {0x000167d0, 0x00000000},
-+      {0x000167d4, 0x00000000},
-+      {0x00016800, 0x36db6db6},
-+      {0x00016804, 0x6db6db40},
-+      {0x00016808, 0x73f00000},
-+      {0x0001680c, 0x00000000},
-+      {0x00016840, 0x7f80fff8},
-+      {0x0001684c, 0x76d005b5},
-+      {0x00016850, 0x556cf031},
-+      {0x00016854, 0x13449440},
-+      {0x00016858, 0x0c51c92c},
-+      {0x0001685c, 0x3db7fffc},
-+      {0x00016860, 0xfffffffc},
-+      {0x00016864, 0x000f0278},
-+      {0x0001686c, 0x6db60000},
-+      {0x00016900, 0x3fffbe01},
-+      {0x00016904, 0xfff80000},
-+      {0x00016908, 0x00080010},
-+      {0x00016944, 0x02084080},
-+      {0x00016948, 0x00000000},
-+      {0x00016b80, 0x00000000},
-+      {0x00016b84, 0x00000000},
-+      {0x00016b88, 0x00800700},
-+      {0x00016b8c, 0x00800700},
-+      {0x00016b90, 0x00800700},
-+      {0x00016b94, 0x00000000},
-+      {0x00016b98, 0x00000000},
-+      {0x00016b9c, 0x00000000},
-+      {0x00016ba0, 0x00000001},
-+      {0x00016ba4, 0x00000001},
-+      {0x00016ba8, 0x00000000},
-+      {0x00016bac, 0x00000000},
-+      {0x00016bb0, 0x00000000},
-+      {0x00016bb4, 0x00000000},
-+      {0x00016bb8, 0x00000000},
-+      {0x00016bbc, 0x00000000},
-+      {0x00016bc0, 0x000000a0},
-+      {0x00016bc4, 0x000c0000},
-+      {0x00016bc8, 0x14021402},
-+      {0x00016bcc, 0x00001402},
-+      {0x00016bd0, 0x00000000},
-+      {0x00016bd4, 0x00000000},
-+};
-+
-+static const u32 ar9300Common_rx_gain_table_merlin_2p0[][2] = {
-+      /* Addr      allmodes  */
-+      {0x0000a000, 0x02000101},
-+      {0x0000a004, 0x02000102},
-+      {0x0000a008, 0x02000103},
-+      {0x0000a00c, 0x02000104},
-+      {0x0000a010, 0x02000200},
-+      {0x0000a014, 0x02000201},
-+      {0x0000a018, 0x02000202},
-+      {0x0000a01c, 0x02000203},
-+      {0x0000a020, 0x02000204},
-+      {0x0000a024, 0x02000205},
-+      {0x0000a028, 0x02000208},
-+      {0x0000a02c, 0x02000302},
-+      {0x0000a030, 0x02000303},
-+      {0x0000a034, 0x02000304},
-+      {0x0000a038, 0x02000400},
-+      {0x0000a03c, 0x02010300},
-+      {0x0000a040, 0x02010301},
-+      {0x0000a044, 0x02010302},
-+      {0x0000a048, 0x02000500},
-+      {0x0000a04c, 0x02010400},
-+      {0x0000a050, 0x02020300},
-+      {0x0000a054, 0x02020301},
-+      {0x0000a058, 0x02020302},
-+      {0x0000a05c, 0x02020303},
-+      {0x0000a060, 0x02020400},
-+      {0x0000a064, 0x02030300},
-+      {0x0000a068, 0x02030301},
-+      {0x0000a06c, 0x02030302},
-+      {0x0000a070, 0x02030303},
-+      {0x0000a074, 0x02030400},
-+      {0x0000a078, 0x02040300},
-+      {0x0000a07c, 0x02040301},
-+      {0x0000a080, 0x02040302},
-+      {0x0000a084, 0x02040303},
-+      {0x0000a088, 0x02030500},
-+      {0x0000a08c, 0x02040400},
-+      {0x0000a090, 0x02050203},
-+      {0x0000a094, 0x02050204},
-+      {0x0000a098, 0x02050205},
-+      {0x0000a09c, 0x02040500},
-+      {0x0000a0a0, 0x02050301},
-+      {0x0000a0a4, 0x02050302},
-+      {0x0000a0a8, 0x02050303},
-+      {0x0000a0ac, 0x02050400},
-+      {0x0000a0b0, 0x02050401},
-+      {0x0000a0b4, 0x02050402},
-+      {0x0000a0b8, 0x02050403},
-+      {0x0000a0bc, 0x02050500},
-+      {0x0000a0c0, 0x02050501},
-+      {0x0000a0c4, 0x02050502},
-+      {0x0000a0c8, 0x02050503},
-+      {0x0000a0cc, 0x02050504},
-+      {0x0000a0d0, 0x02050600},
-+      {0x0000a0d4, 0x02050601},
-+      {0x0000a0d8, 0x02050602},
-+      {0x0000a0dc, 0x02050603},
-+      {0x0000a0e0, 0x02050604},
-+      {0x0000a0e4, 0x02050700},
-+      {0x0000a0e8, 0x02050701},
-+      {0x0000a0ec, 0x02050702},
-+      {0x0000a0f0, 0x02050703},
-+      {0x0000a0f4, 0x02050704},
-+      {0x0000a0f8, 0x02050705},
-+      {0x0000a0fc, 0x02050708},
-+      {0x0000a100, 0x02050709},
-+      {0x0000a104, 0x0205070a},
-+      {0x0000a108, 0x0205070b},
-+      {0x0000a10c, 0x0205070c},
-+      {0x0000a110, 0x0205070d},
-+      {0x0000a114, 0x02050710},
-+      {0x0000a118, 0x02050711},
-+      {0x0000a11c, 0x02050712},
-+      {0x0000a120, 0x02050713},
-+      {0x0000a124, 0x02050714},
-+      {0x0000a128, 0x02050715},
-+      {0x0000a12c, 0x02050730},
-+      {0x0000a130, 0x02050731},
-+      {0x0000a134, 0x02050732},
-+      {0x0000a138, 0x02050733},
-+      {0x0000a13c, 0x02050734},
-+      {0x0000a140, 0x02050735},
-+      {0x0000a144, 0x02050750},
-+      {0x0000a148, 0x02050751},
-+      {0x0000a14c, 0x02050752},
-+      {0x0000a150, 0x02050753},
-+      {0x0000a154, 0x02050754},
-+      {0x0000a158, 0x02050755},
-+      {0x0000a15c, 0x02050770},
-+      {0x0000a160, 0x02050771},
-+      {0x0000a164, 0x02050772},
-+      {0x0000a168, 0x02050773},
-+      {0x0000a16c, 0x02050774},
-+      {0x0000a170, 0x02050775},
-+      {0x0000a174, 0x00000776},
-+      {0x0000a178, 0x00000776},
-+      {0x0000a17c, 0x00000776},
-+      {0x0000a180, 0x00000776},
-+      {0x0000a184, 0x00000776},
-+      {0x0000a188, 0x00000776},
-+      {0x0000a18c, 0x00000776},
-+      {0x0000a190, 0x00000776},
-+      {0x0000a194, 0x00000776},
-+      {0x0000a198, 0x00000776},
-+      {0x0000a19c, 0x00000776},
-+      {0x0000a1a0, 0x00000776},
-+      {0x0000a1a4, 0x00000776},
-+      {0x0000a1a8, 0x00000776},
-+      {0x0000a1ac, 0x00000776},
-+      {0x0000a1b0, 0x00000776},
-+      {0x0000a1b4, 0x00000776},
-+      {0x0000a1b8, 0x00000776},
-+      {0x0000a1bc, 0x00000776},
-+      {0x0000a1c0, 0x00000776},
-+      {0x0000a1c4, 0x00000776},
-+      {0x0000a1c8, 0x00000776},
-+      {0x0000a1cc, 0x00000776},
-+      {0x0000a1d0, 0x00000776},
-+      {0x0000a1d4, 0x00000776},
-+      {0x0000a1d8, 0x00000776},
-+      {0x0000a1dc, 0x00000776},
-+      {0x0000a1e0, 0x00000776},
-+      {0x0000a1e4, 0x00000776},
-+      {0x0000a1e8, 0x00000776},
-+      {0x0000a1ec, 0x00000776},
-+      {0x0000a1f0, 0x00000776},
-+      {0x0000a1f4, 0x00000776},
-+      {0x0000a1f8, 0x00000776},
-+      {0x0000a1fc, 0x00000776},
-+      {0x0000b000, 0x02000101},
-+      {0x0000b004, 0x02000102},
-+      {0x0000b008, 0x02000103},
-+      {0x0000b00c, 0x02000104},
-+      {0x0000b010, 0x02000200},
-+      {0x0000b014, 0x02000201},
-+      {0x0000b018, 0x02000202},
-+      {0x0000b01c, 0x02000203},
-+      {0x0000b020, 0x02000204},
-+      {0x0000b024, 0x02000205},
-+      {0x0000b028, 0x02000208},
-+      {0x0000b02c, 0x02000302},
-+      {0x0000b030, 0x02000303},
-+      {0x0000b034, 0x02000304},
-+      {0x0000b038, 0x02000400},
-+      {0x0000b03c, 0x02010300},
-+      {0x0000b040, 0x02010301},
-+      {0x0000b044, 0x02010302},
-+      {0x0000b048, 0x02000500},
-+      {0x0000b04c, 0x02010400},
-+      {0x0000b050, 0x02020300},
-+      {0x0000b054, 0x02020301},
-+      {0x0000b058, 0x02020302},
-+      {0x0000b05c, 0x02020303},
-+      {0x0000b060, 0x02020400},
-+      {0x0000b064, 0x02030300},
-+      {0x0000b068, 0x02030301},
-+      {0x0000b06c, 0x02030302},
-+      {0x0000b070, 0x02030303},
-+      {0x0000b074, 0x02030400},
-+      {0x0000b078, 0x02040300},
-+      {0x0000b07c, 0x02040301},
-+      {0x0000b080, 0x02040302},
-+      {0x0000b084, 0x02040303},
-+      {0x0000b088, 0x02030500},
-+      {0x0000b08c, 0x02040400},
-+      {0x0000b090, 0x02050203},
-+      {0x0000b094, 0x02050204},
-+      {0x0000b098, 0x02050205},
-+      {0x0000b09c, 0x02040500},
-+      {0x0000b0a0, 0x02050301},
-+      {0x0000b0a4, 0x02050302},
-+      {0x0000b0a8, 0x02050303},
-+      {0x0000b0ac, 0x02050400},
-+      {0x0000b0b0, 0x02050401},
-+      {0x0000b0b4, 0x02050402},
-+      {0x0000b0b8, 0x02050403},
-+      {0x0000b0bc, 0x02050500},
-+      {0x0000b0c0, 0x02050501},
-+      {0x0000b0c4, 0x02050502},
-+      {0x0000b0c8, 0x02050503},
-+      {0x0000b0cc, 0x02050504},
-+      {0x0000b0d0, 0x02050600},
-+      {0x0000b0d4, 0x02050601},
-+      {0x0000b0d8, 0x02050602},
-+      {0x0000b0dc, 0x02050603},
-+      {0x0000b0e0, 0x02050604},
-+      {0x0000b0e4, 0x02050700},
-+      {0x0000b0e8, 0x02050701},
-+      {0x0000b0ec, 0x02050702},
-+      {0x0000b0f0, 0x02050703},
-+      {0x0000b0f4, 0x02050704},
-+      {0x0000b0f8, 0x02050705},
-+      {0x0000b0fc, 0x02050708},
-+      {0x0000b100, 0x02050709},
-+      {0x0000b104, 0x0205070a},
-+      {0x0000b108, 0x0205070b},
-+      {0x0000b10c, 0x0205070c},
-+      {0x0000b110, 0x0205070d},
-+      {0x0000b114, 0x02050710},
-+      {0x0000b118, 0x02050711},
-+      {0x0000b11c, 0x02050712},
-+      {0x0000b120, 0x02050713},
-+      {0x0000b124, 0x02050714},
-+      {0x0000b128, 0x02050715},
-+      {0x0000b12c, 0x02050730},
-+      {0x0000b130, 0x02050731},
-+      {0x0000b134, 0x02050732},
-+      {0x0000b138, 0x02050733},
-+      {0x0000b13c, 0x02050734},
-+      {0x0000b140, 0x02050735},
-+      {0x0000b144, 0x02050750},
-+      {0x0000b148, 0x02050751},
-+      {0x0000b14c, 0x02050752},
-+      {0x0000b150, 0x02050753},
-+      {0x0000b154, 0x02050754},
-+      {0x0000b158, 0x02050755},
-+      {0x0000b15c, 0x02050770},
-+      {0x0000b160, 0x02050771},
-+      {0x0000b164, 0x02050772},
-+      {0x0000b168, 0x02050773},
-+      {0x0000b16c, 0x02050774},
-+      {0x0000b170, 0x02050775},
-+      {0x0000b174, 0x00000776},
-+      {0x0000b178, 0x00000776},
-+      {0x0000b17c, 0x00000776},
-+      {0x0000b180, 0x00000776},
-+      {0x0000b184, 0x00000776},
-+      {0x0000b188, 0x00000776},
-+      {0x0000b18c, 0x00000776},
-+      {0x0000b190, 0x00000776},
-+      {0x0000b194, 0x00000776},
-+      {0x0000b198, 0x00000776},
-+      {0x0000b19c, 0x00000776},
-+      {0x0000b1a0, 0x00000776},
-+      {0x0000b1a4, 0x00000776},
-+      {0x0000b1a8, 0x00000776},
-+      {0x0000b1ac, 0x00000776},
-+      {0x0000b1b0, 0x00000776},
-+      {0x0000b1b4, 0x00000776},
-+      {0x0000b1b8, 0x00000776},
-+      {0x0000b1bc, 0x00000776},
-+      {0x0000b1c0, 0x00000776},
-+      {0x0000b1c4, 0x00000776},
-+      {0x0000b1c8, 0x00000776},
-+      {0x0000b1cc, 0x00000776},
-+      {0x0000b1d0, 0x00000776},
-+      {0x0000b1d4, 0x00000776},
-+      {0x0000b1d8, 0x00000776},
-+      {0x0000b1dc, 0x00000776},
-+      {0x0000b1e0, 0x00000776},
-+      {0x0000b1e4, 0x00000776},
-+      {0x0000b1e8, 0x00000776},
-+      {0x0000b1ec, 0x00000776},
-+      {0x0000b1f0, 0x00000776},
-+      {0x0000b1f4, 0x00000776},
-+      {0x0000b1f8, 0x00000776},
-+      {0x0000b1fc, 0x00000776},
-+};
-+
-+static const u32 ar9300_2p0_mac_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-+      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-+      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-+      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-+      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-+      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-+      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-+      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-+};
-+
-+static const u32 ar9300_2p0_soc_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
-+};
-+
-+static const u32 ar9200_merlin_2p0_radio_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00007800, 0x00040000},
-+      {0x00007804, 0xdb005012},
-+      {0x00007808, 0x04924914},
-+      {0x0000780c, 0x21084210},
-+      {0x00007810, 0x6d801300},
-+      {0x00007814, 0x0019beff},
-+      {0x00007818, 0x07e41000},
-+      {0x0000781c, 0x00392000},
-+      {0x00007820, 0x92592480},
-+      {0x00007824, 0x00040000},
-+      {0x00007828, 0xdb005012},
-+      {0x0000782c, 0x04924914},
-+      {0x00007830, 0x21084210},
-+      {0x00007834, 0x6d801300},
-+      {0x00007838, 0x0019beff},
-+      {0x0000783c, 0x07e40000},
-+      {0x00007840, 0x00392000},
-+      {0x00007844, 0x92592480},
-+      {0x00007848, 0x00100000},
-+      {0x0000784c, 0x773f0567},
-+      {0x00007850, 0x54214514},
-+      {0x00007854, 0x12035828},
-+      {0x00007858, 0x92592692},
-+      {0x0000785c, 0x00000000},
-+      {0x00007860, 0x56400000},
-+      {0x00007864, 0x0a8e370e},
-+      {0x00007868, 0xc0102850},
-+      {0x0000786c, 0x812d4000},
-+      {0x00007870, 0x807ec400},
-+      {0x00007874, 0x001b6db0},
-+      {0x00007878, 0x00376b63},
-+      {0x0000787c, 0x06db6db6},
-+      {0x00007880, 0x006d8000},
-+      {0x00007884, 0xffeffffe},
-+      {0x00007888, 0xffeffffe},
-+      {0x0000788c, 0x00010000},
-+      {0x00007890, 0x02060aeb},
-+      {0x00007894, 0x5a108000},
-+};
-+
-+static const u32 ar9300_2p0_baseband_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
-+      {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
-+      {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
-+      {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
-+      {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
-+      {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
-+      {0x00009c00, 0x00000044, 0x000000c4, 0x000000c4, 0x00000044},
-+      {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
-+      {0x00009e04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
-+      {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
-+      {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e},
-+      {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
-+      {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
-+      {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
-+      {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
-+      {0x00009e44, 0x02321e27, 0x02321e27, 0x02291e27, 0x02291e27},
-+      {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
-+      {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-+      {0x0000a204, 0x000037c0, 0x000037c4, 0x000037c4, 0x000037c0},
-+      {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
-+      {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
-+      {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
-+      {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
-+      {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
-+      {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
-+      {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
-+      {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
-+      {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
-+      {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
-+      {0x0000a284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
-+      {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
-+      {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
-+      {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-+      {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
-+      {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
-+      {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000ae04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
-+      {0x0000b284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
-+      {0x0000b830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000be04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000be1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000be20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
-+      {0x0000c284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
-+};
-+
-+static const u32 ar9300_2p0_baseband_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00009800, 0xafe68e30},
-+      {0x00009804, 0xfd14e000},
-+      {0x00009808, 0x9c0a9f6b},
-+      {0x0000980c, 0x04900000},
-+      {0x00009814, 0x9280c00a},
-+      {0x00009818, 0x00000000},
-+      {0x0000981c, 0x00020028},
-+      {0x00009834, 0x5f3ca3de},
-+      {0x00009838, 0x0108ecff},
-+      {0x0000983c, 0x14750600},
-+      {0x00009880, 0x201fff00},
-+      {0x00009884, 0x00001042},
-+      {0x000098a4, 0x00200400},
-+      {0x000098b0, 0x52440bbe},
-+      {0x000098d0, 0x004b6a8e},
-+      {0x000098d4, 0x00000820},
-+      {0x000098dc, 0x00000000},
-+      {0x000098f0, 0x00000000},
-+      {0x000098f4, 0x00000000},
-+      {0x00009c04, 0xff55ff55},
-+      {0x00009c08, 0x0320ff55},
-+      {0x00009c0c, 0x00000000},
-+      {0x00009c10, 0x00000000},
-+      {0x00009c14, 0x00046384},
-+      {0x00009c18, 0x05b6b440},
-+      {0x00009c1c, 0x00b6b440},
-+      {0x00009d00, 0xc080a333},
-+      {0x00009d04, 0x40206c10},
-+      {0x00009d08, 0x009c4060},
-+      {0x00009d0c, 0x9883800a},
-+      {0x00009d10, 0x01834061},
-+      {0x00009d14, 0x00c0040b},
-+      {0x00009d18, 0x00000000},
-+      {0x00009e08, 0x0038230c},
-+      {0x00009e24, 0x990bb515},
-+      {0x00009e28, 0x0c6f0000},
-+      {0x00009e30, 0x06336f77},
-+      {0x00009e34, 0x6af6532f},
-+      {0x00009e38, 0x0cc80c00},
-+      {0x00009e3c, 0xcf946222},
-+      {0x00009e40, 0x0d261820},
-+      {0x00009e4c, 0x00001004},
-+      {0x00009e50, 0x00ff03f1},
-+      {0x00009e54, 0x00000000},
-+      {0x00009fc0, 0x803e4788},
-+      {0x00009fc4, 0x0001efb5},
-+      {0x00009fcc, 0x40000014},
-+      {0x00009fd0, 0x01193b93},
-+      {0x0000a20c, 0x00000000},
-+      {0x0000a220, 0x00000000},
-+      {0x0000a224, 0x00000000},
-+      {0x0000a228, 0x10002310},
-+      {0x0000a22c, 0x01036a1e},
-+      {0x0000a234, 0x10000fff},
-+      {0x0000a23c, 0x00000000},
-+      {0x0000a244, 0x0c000000},
-+      {0x0000a2a0, 0x00000001},
-+      {0x0000a2c0, 0x00000001},
-+      {0x0000a2c8, 0x00000000},
-+      {0x0000a2cc, 0x18c43433},
-+      {0x0000a2d4, 0x00000000},
-+      {0x0000a2dc, 0x00000000},
-+      {0x0000a2e0, 0x00000000},
-+      {0x0000a2e4, 0x00000000},
-+      {0x0000a2e8, 0x00000000},
-+      {0x0000a2ec, 0x00000000},
-+      {0x0000a2f0, 0x00000000},
-+      {0x0000a2f4, 0x00000000},
-+      {0x0000a2f8, 0x00000000},
-+      {0x0000a344, 0x00000000},
-+      {0x0000a34c, 0x00000000},
-+      {0x0000a350, 0x0000a000},
-+      {0x0000a364, 0x00000000},
-+      {0x0000a370, 0x00000000},
-+      {0x0000a390, 0x00000001},
-+      {0x0000a394, 0x00000444},
-+      {0x0000a398, 0x001f0e0f},
-+      {0x0000a39c, 0x0075393f},
-+      {0x0000a3a0, 0xb79f6427},
-+      {0x0000a3a4, 0x00000000},
-+      {0x0000a3a8, 0xaaaaaaaa},
-+      {0x0000a3ac, 0x3c466478},
-+      {0x0000a3c0, 0x20202020},
-+      {0x0000a3c4, 0x22222220},
-+      {0x0000a3c8, 0x20200020},
-+      {0x0000a3cc, 0x20202020},
-+      {0x0000a3d0, 0x20202020},
-+      {0x0000a3d4, 0x20202020},
-+      {0x0000a3d8, 0x20202020},
-+      {0x0000a3dc, 0x20202020},
-+      {0x0000a3e0, 0x20202020},
-+      {0x0000a3e4, 0x20202020},
-+      {0x0000a3e8, 0x20202020},
-+      {0x0000a3ec, 0x20202020},
-+      {0x0000a3f0, 0x00000000},
-+      {0x0000a3f4, 0x00000246},
-+      {0x0000a3f8, 0x0cdbd380},
-+      {0x0000a3fc, 0x000f0f01},
-+      {0x0000a400, 0x8fa91f01},
-+      {0x0000a404, 0x00000000},
-+      {0x0000a408, 0x0e79e5c6},
-+      {0x0000a40c, 0x00820820},
-+      {0x0000a414, 0x1ce739ce},
-+      {0x0000a418, 0x2d001dce},
-+      {0x0000a41c, 0x1ce739ce},
-+      {0x0000a420, 0x000001ce},
-+      {0x0000a424, 0x1ce739ce},
-+      {0x0000a428, 0x000001ce},
-+      {0x0000a42c, 0x1ce739ce},
-+      {0x0000a430, 0x1ce739ce},
-+      {0x0000a434, 0x00000000},
-+      {0x0000a438, 0x00001801},
-+      {0x0000a43c, 0x00000000},
-+      {0x0000a440, 0x00000000},
-+      {0x0000a444, 0x00000000},
-+      {0x0000a448, 0x04000080},
-+      {0x0000a44c, 0x00000001},
-+      {0x0000a450, 0x00010000},
-+      {0x0000a458, 0x00000000},
-+      {0x0000a600, 0x00000000},
-+      {0x0000a604, 0x00000000},
-+      {0x0000a608, 0x00000000},
-+      {0x0000a60c, 0x00000000},
-+      {0x0000a610, 0x00000000},
-+      {0x0000a614, 0x00000000},
-+      {0x0000a618, 0x00000000},
-+      {0x0000a61c, 0x00000000},
-+      {0x0000a620, 0x00000000},
-+      {0x0000a624, 0x00000000},
-+      {0x0000a628, 0x00000000},
-+      {0x0000a62c, 0x00000000},
-+      {0x0000a630, 0x00000000},
-+      {0x0000a634, 0x00000000},
-+      {0x0000a638, 0x00000000},
-+      {0x0000a63c, 0x00000000},
-+      {0x0000a640, 0x00000000},
-+      {0x0000a644, 0x3fad9d74},
-+      {0x0000a648, 0x0048060a},
-+      {0x0000a64c, 0x00000637},
-+      {0x0000a670, 0x03020100},
-+      {0x0000a674, 0x09080504},
-+      {0x0000a678, 0x0d0c0b0a},
-+      {0x0000a67c, 0x13121110},
-+      {0x0000a680, 0x31301514},
-+      {0x0000a684, 0x35343332},
-+      {0x0000a688, 0x00000036},
-+      {0x0000a690, 0x00000838},
-+      {0x0000a7c0, 0x00000000},
-+      {0x0000a7c4, 0xfffffffc},
-+      {0x0000a7c8, 0x00000000},
-+      {0x0000a7cc, 0x00000000},
-+      {0x0000a7d0, 0x00000000},
-+      {0x0000a7d4, 0x00000004},
-+      {0x0000a7dc, 0x00000001},
-+      {0x0000a8d0, 0x004b6a8e},
-+      {0x0000a8d4, 0x00000820},
-+      {0x0000a8dc, 0x00000000},
-+      {0x0000a8f0, 0x00000000},
-+      {0x0000a8f4, 0x00000000},
-+      {0x0000b2d0, 0x00000080},
-+      {0x0000b2d4, 0x00000000},
-+      {0x0000b2dc, 0x00000000},
-+      {0x0000b2e0, 0x00000000},
-+      {0x0000b2e4, 0x00000000},
-+      {0x0000b2e8, 0x00000000},
-+      {0x0000b2ec, 0x00000000},
-+      {0x0000b2f0, 0x00000000},
-+      {0x0000b2f4, 0x00000000},
-+      {0x0000b2f8, 0x00000000},
-+      {0x0000b408, 0x0e79e5c0},
-+      {0x0000b40c, 0x00820820},
-+      {0x0000b420, 0x00000000},
-+      {0x0000b8d0, 0x004b6a8e},
-+      {0x0000b8d4, 0x00000820},
-+      {0x0000b8dc, 0x00000000},
-+      {0x0000b8f0, 0x00000000},
-+      {0x0000b8f4, 0x00000000},
-+      {0x0000c2d0, 0x00000080},
-+      {0x0000c2d4, 0x00000000},
-+      {0x0000c2dc, 0x00000000},
-+      {0x0000c2e0, 0x00000000},
-+      {0x0000c2e4, 0x00000000},
-+      {0x0000c2e8, 0x00000000},
-+      {0x0000c2ec, 0x00000000},
-+      {0x0000c2f0, 0x00000000},
-+      {0x0000c2f4, 0x00000000},
-+      {0x0000c2f8, 0x00000000},
-+      {0x0000c408, 0x0e79e5c0},
-+      {0x0000c40c, 0x00820820},
-+      {0x0000c420, 0x00000000},
-+};
-+
-+static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-+      {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-+      {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-+      {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-+      {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-+      {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-+      {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-+      {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-+      {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-+      {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-+      {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-+      {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-+      {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
-+      {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-+      {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-+      {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-+      {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-+      {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-+      {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-+      {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-+      {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-+      {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-+      {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-+      {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-+      {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-+      {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-+      {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-+      {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-+      {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-+      {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-+      {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-+      {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-+      {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-+      {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-+      {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-+      {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-+      {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-+      {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-+      {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
-+      {0x00016048, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
-+      {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
-+      {0x00016444, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
-+      {0x00016448, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
-+      {0x00016468, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
-+      {0x00016844, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
-+      {0x00016848, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
-+      {0x00016868, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
-+};
-+
-+static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p0[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-+      {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-+      {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-+      {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-+      {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-+      {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-+      {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-+      {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-+      {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-+      {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-+      {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-+      {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-+      {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
-+      {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-+      {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-+      {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-+      {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-+      {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-+      {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-+      {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-+      {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-+      {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-+      {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-+      {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-+      {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-+      {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-+      {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-+      {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-+      {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-+      {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-+      {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-+      {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-+      {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-+      {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-+      {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-+      {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-+      {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-+      {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-+      {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-+      {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-+      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016444, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-+      {0x00016448, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-+      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016844, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-+      {0x00016848, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-+      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
-+static const u32 ar9300Common_rx_gain_table_2p0[][2] = {
-+      /* Addr      allmodes  */
-+      {0x0000a000, 0x00010000},
-+      {0x0000a004, 0x00030002},
-+      {0x0000a008, 0x00050004},
-+      {0x0000a00c, 0x00810080},
-+      {0x0000a010, 0x00830082},
-+      {0x0000a014, 0x01810180},
-+      {0x0000a018, 0x01830182},
-+      {0x0000a01c, 0x01850184},
-+      {0x0000a020, 0x01890188},
-+      {0x0000a024, 0x018b018a},
-+      {0x0000a028, 0x018d018c},
-+      {0x0000a02c, 0x01910190},
-+      {0x0000a030, 0x01930192},
-+      {0x0000a034, 0x01950194},
-+      {0x0000a038, 0x038a0196},
-+      {0x0000a03c, 0x038c038b},
-+      {0x0000a040, 0x0390038d},
-+      {0x0000a044, 0x03920391},
-+      {0x0000a048, 0x03940393},
-+      {0x0000a04c, 0x03960395},
-+      {0x0000a050, 0x00000000},
-+      {0x0000a054, 0x00000000},
-+      {0x0000a058, 0x00000000},
-+      {0x0000a05c, 0x00000000},
-+      {0x0000a060, 0x00000000},
-+      {0x0000a064, 0x00000000},
-+      {0x0000a068, 0x00000000},
-+      {0x0000a06c, 0x00000000},
-+      {0x0000a070, 0x00000000},
-+      {0x0000a074, 0x00000000},
-+      {0x0000a078, 0x00000000},
-+      {0x0000a07c, 0x00000000},
-+      {0x0000a080, 0x22222229},
-+      {0x0000a084, 0x1d1d1d1d},
-+      {0x0000a088, 0x1d1d1d1d},
-+      {0x0000a08c, 0x1d1d1d1d},
-+      {0x0000a090, 0x171d1d1d},
-+      {0x0000a094, 0x11111717},
-+      {0x0000a098, 0x00030311},
-+      {0x0000a09c, 0x00000000},
-+      {0x0000a0a0, 0x00000000},
-+      {0x0000a0a4, 0x00000000},
-+      {0x0000a0a8, 0x00000000},
-+      {0x0000a0ac, 0x00000000},
-+      {0x0000a0b0, 0x00000000},
-+      {0x0000a0b4, 0x00000000},
-+      {0x0000a0b8, 0x00000000},
-+      {0x0000a0bc, 0x00000000},
-+      {0x0000a0c0, 0x001f0000},
-+      {0x0000a0c4, 0x01000101},
-+      {0x0000a0c8, 0x011e011f},
-+      {0x0000a0cc, 0x011c011d},
-+      {0x0000a0d0, 0x02030204},
-+      {0x0000a0d4, 0x02010202},
-+      {0x0000a0d8, 0x021f0200},
-+      {0x0000a0dc, 0x0302021e},
-+      {0x0000a0e0, 0x03000301},
-+      {0x0000a0e4, 0x031e031f},
-+      {0x0000a0e8, 0x0402031d},
-+      {0x0000a0ec, 0x04000401},
-+      {0x0000a0f0, 0x041e041f},
-+      {0x0000a0f4, 0x0502041d},
-+      {0x0000a0f8, 0x05000501},
-+      {0x0000a0fc, 0x051e051f},
-+      {0x0000a100, 0x06010602},
-+      {0x0000a104, 0x061f0600},
-+      {0x0000a108, 0x061d061e},
-+      {0x0000a10c, 0x07020703},
-+      {0x0000a110, 0x07000701},
-+      {0x0000a114, 0x00000000},
-+      {0x0000a118, 0x00000000},
-+      {0x0000a11c, 0x00000000},
-+      {0x0000a120, 0x00000000},
-+      {0x0000a124, 0x00000000},
-+      {0x0000a128, 0x00000000},
-+      {0x0000a12c, 0x00000000},
-+      {0x0000a130, 0x00000000},
-+      {0x0000a134, 0x00000000},
-+      {0x0000a138, 0x00000000},
-+      {0x0000a13c, 0x00000000},
-+      {0x0000a140, 0x001f0000},
-+      {0x0000a144, 0x01000101},
-+      {0x0000a148, 0x011e011f},
-+      {0x0000a14c, 0x011c011d},
-+      {0x0000a150, 0x02030204},
-+      {0x0000a154, 0x02010202},
-+      {0x0000a158, 0x021f0200},
-+      {0x0000a15c, 0x0302021e},
-+      {0x0000a160, 0x03000301},
-+      {0x0000a164, 0x031e031f},
-+      {0x0000a168, 0x0402031d},
-+      {0x0000a16c, 0x04000401},
-+      {0x0000a170, 0x041e041f},
-+      {0x0000a174, 0x0502041d},
-+      {0x0000a178, 0x05000501},
-+      {0x0000a17c, 0x051e051f},
-+      {0x0000a180, 0x06010602},
-+      {0x0000a184, 0x061f0600},
-+      {0x0000a188, 0x061d061e},
-+      {0x0000a18c, 0x07020703},
-+      {0x0000a190, 0x07000701},
-+      {0x0000a194, 0x00000000},
-+      {0x0000a198, 0x00000000},
-+      {0x0000a19c, 0x00000000},
-+      {0x0000a1a0, 0x00000000},
-+      {0x0000a1a4, 0x00000000},
-+      {0x0000a1a8, 0x00000000},
-+      {0x0000a1ac, 0x00000000},
-+      {0x0000a1b0, 0x00000000},
-+      {0x0000a1b4, 0x00000000},
-+      {0x0000a1b8, 0x00000000},
-+      {0x0000a1bc, 0x00000000},
-+      {0x0000a1c0, 0x00000000},
-+      {0x0000a1c4, 0x00000000},
-+      {0x0000a1c8, 0x00000000},
-+      {0x0000a1cc, 0x00000000},
-+      {0x0000a1d0, 0x00000000},
-+      {0x0000a1d4, 0x00000000},
-+      {0x0000a1d8, 0x00000000},
-+      {0x0000a1dc, 0x00000000},
-+      {0x0000a1e0, 0x00000000},
-+      {0x0000a1e4, 0x00000000},
-+      {0x0000a1e8, 0x00000000},
-+      {0x0000a1ec, 0x00000000},
-+      {0x0000a1f0, 0x00000396},
-+      {0x0000a1f4, 0x00000396},
-+      {0x0000a1f8, 0x00000396},
-+      {0x0000a1fc, 0x00000196},
-+      {0x0000b000, 0x00010000},
-+      {0x0000b004, 0x00030002},
-+      {0x0000b008, 0x00050004},
-+      {0x0000b00c, 0x00810080},
-+      {0x0000b010, 0x00830082},
-+      {0x0000b014, 0x01810180},
-+      {0x0000b018, 0x01830182},
-+      {0x0000b01c, 0x01850184},
-+      {0x0000b020, 0x02810280},
-+      {0x0000b024, 0x02830282},
-+      {0x0000b028, 0x02850284},
-+      {0x0000b02c, 0x02890288},
-+      {0x0000b030, 0x028b028a},
-+      {0x0000b034, 0x0388028c},
-+      {0x0000b038, 0x038a0389},
-+      {0x0000b03c, 0x038c038b},
-+      {0x0000b040, 0x0390038d},
-+      {0x0000b044, 0x03920391},
-+      {0x0000b048, 0x03940393},
-+      {0x0000b04c, 0x03960395},
-+      {0x0000b050, 0x00000000},
-+      {0x0000b054, 0x00000000},
-+      {0x0000b058, 0x00000000},
-+      {0x0000b05c, 0x00000000},
-+      {0x0000b060, 0x00000000},
-+      {0x0000b064, 0x00000000},
-+      {0x0000b068, 0x00000000},
-+      {0x0000b06c, 0x00000000},
-+      {0x0000b070, 0x00000000},
-+      {0x0000b074, 0x00000000},
-+      {0x0000b078, 0x00000000},
-+      {0x0000b07c, 0x00000000},
-+      {0x0000b080, 0x32323232},
-+      {0x0000b084, 0x2f2f3232},
-+      {0x0000b088, 0x23282a2d},
-+      {0x0000b08c, 0x1c1e2123},
-+      {0x0000b090, 0x14171919},
-+      {0x0000b094, 0x0e0e1214},
-+      {0x0000b098, 0x03050707},
-+      {0x0000b09c, 0x00030303},
-+      {0x0000b0a0, 0x00000000},
-+      {0x0000b0a4, 0x00000000},
-+      {0x0000b0a8, 0x00000000},
-+      {0x0000b0ac, 0x00000000},
-+      {0x0000b0b0, 0x00000000},
-+      {0x0000b0b4, 0x00000000},
-+      {0x0000b0b8, 0x00000000},
-+      {0x0000b0bc, 0x00000000},
-+      {0x0000b0c0, 0x003f0020},
-+      {0x0000b0c4, 0x00400041},
-+      {0x0000b0c8, 0x0140005f},
-+      {0x0000b0cc, 0x0160015f},
-+      {0x0000b0d0, 0x017e017f},
-+      {0x0000b0d4, 0x02410242},
-+      {0x0000b0d8, 0x025f0240},
-+      {0x0000b0dc, 0x027f0260},
-+      {0x0000b0e0, 0x0341027e},
-+      {0x0000b0e4, 0x035f0340},
-+      {0x0000b0e8, 0x037f0360},
-+      {0x0000b0ec, 0x04400441},
-+      {0x0000b0f0, 0x0460045f},
-+      {0x0000b0f4, 0x0541047f},
-+      {0x0000b0f8, 0x055f0540},
-+      {0x0000b0fc, 0x057f0560},
-+      {0x0000b100, 0x06400641},
-+      {0x0000b104, 0x0660065f},
-+      {0x0000b108, 0x067e067f},
-+      {0x0000b10c, 0x07410742},
-+      {0x0000b110, 0x075f0740},
-+      {0x0000b114, 0x077f0760},
-+      {0x0000b118, 0x07800781},
-+      {0x0000b11c, 0x07a0079f},
-+      {0x0000b120, 0x07c107bf},
-+      {0x0000b124, 0x000007c0},
-+      {0x0000b128, 0x00000000},
-+      {0x0000b12c, 0x00000000},
-+      {0x0000b130, 0x00000000},
-+      {0x0000b134, 0x00000000},
-+      {0x0000b138, 0x00000000},
-+      {0x0000b13c, 0x00000000},
-+      {0x0000b140, 0x003f0020},
-+      {0x0000b144, 0x00400041},
-+      {0x0000b148, 0x0140005f},
-+      {0x0000b14c, 0x0160015f},
-+      {0x0000b150, 0x017e017f},
-+      {0x0000b154, 0x02410242},
-+      {0x0000b158, 0x025f0240},
-+      {0x0000b15c, 0x027f0260},
-+      {0x0000b160, 0x0341027e},
-+      {0x0000b164, 0x035f0340},
-+      {0x0000b168, 0x037f0360},
-+      {0x0000b16c, 0x04400441},
-+      {0x0000b170, 0x0460045f},
-+      {0x0000b174, 0x0541047f},
-+      {0x0000b178, 0x055f0540},
-+      {0x0000b17c, 0x057f0560},
-+      {0x0000b180, 0x06400641},
-+      {0x0000b184, 0x0660065f},
-+      {0x0000b188, 0x067e067f},
-+      {0x0000b18c, 0x07410742},
-+      {0x0000b190, 0x075f0740},
-+      {0x0000b194, 0x077f0760},
-+      {0x0000b198, 0x07800781},
-+      {0x0000b19c, 0x07a0079f},
-+      {0x0000b1a0, 0x07c107bf},
-+      {0x0000b1a4, 0x000007c0},
-+      {0x0000b1a8, 0x00000000},
-+      {0x0000b1ac, 0x00000000},
-+      {0x0000b1b0, 0x00000000},
-+      {0x0000b1b4, 0x00000000},
-+      {0x0000b1b8, 0x00000000},
-+      {0x0000b1bc, 0x00000000},
-+      {0x0000b1c0, 0x00000000},
-+      {0x0000b1c4, 0x00000000},
-+      {0x0000b1c8, 0x00000000},
-+      {0x0000b1cc, 0x00000000},
-+      {0x0000b1d0, 0x00000000},
-+      {0x0000b1d4, 0x00000000},
-+      {0x0000b1d8, 0x00000000},
-+      {0x0000b1dc, 0x00000000},
-+      {0x0000b1e0, 0x00000000},
-+      {0x0000b1e4, 0x00000000},
-+      {0x0000b1e8, 0x00000000},
-+      {0x0000b1ec, 0x00000000},
-+      {0x0000b1f0, 0x00000396},
-+      {0x0000b1f4, 0x00000396},
-+      {0x0000b1f8, 0x00000396},
-+      {0x0000b1fc, 0x00000196},
-+};
-+
-+static const u32 ar9300Modes_low_ob_db_tx_gain_table_2p0[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-+      {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
-+      {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
-+      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
-+      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
-+      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
-+      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
-+      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
-+      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
-+      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
-+      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
-+      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
-+      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-+      {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
-+      {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
-+      {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
-+      {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
-+      {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
-+      {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
-+      {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
-+      {0x0000a598, 0x21820220, 0x21820220, 0x16800402, 0x16800402},
-+      {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
-+      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
-+      {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
-+      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
-+      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
-+      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
-+      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
-+      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
-+      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
-+      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
-+      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
-+      {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x47801a83, 0x47801a83},
-+      {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4a801c84, 0x4a801c84},
-+      {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4e801ce3, 0x4e801ce3},
-+      {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x52801ce5, 0x52801ce5},
-+      {0x0000a5dc, 0x7086308c, 0x7086308c, 0x56801ce9, 0x56801ce9},
-+      {0x0000a5e0, 0x738a308a, 0x738a308a, 0x5a801ceb, 0x5a801ceb},
-+      {0x0000a5e4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5e8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5ec, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f0, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5fc, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
-+      {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016048, 0x64000001, 0x64000001, 0x64000001, 0x64000001},
-+      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016448, 0x64000001, 0x64000001, 0x64000001, 0x64000001},
-+      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016848, 0x64000001, 0x64000001, 0x64000001, 0x64000001},
-+      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
-+static const u32 ar9300_2p0_mac_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00000008, 0x00000000},
-+      {0x00000030, 0x00020085},
-+      {0x00000034, 0x00000005},
-+      {0x00000040, 0x00000000},
-+      {0x00000044, 0x00000000},
-+      {0x00000048, 0x00000008},
-+      {0x0000004c, 0x00000010},
-+      {0x00000050, 0x00000000},
-+      {0x00001040, 0x002ffc0f},
-+      {0x00001044, 0x002ffc0f},
-+      {0x00001048, 0x002ffc0f},
-+      {0x0000104c, 0x002ffc0f},
-+      {0x00001050, 0x002ffc0f},
-+      {0x00001054, 0x002ffc0f},
-+      {0x00001058, 0x002ffc0f},
-+      {0x0000105c, 0x002ffc0f},
-+      {0x00001060, 0x002ffc0f},
-+      {0x00001064, 0x002ffc0f},
-+      {0x000010f0, 0x00000100},
-+      {0x00001270, 0x00000000},
-+      {0x000012b0, 0x00000000},
-+      {0x000012f0, 0x00000000},
-+      {0x0000143c, 0x00000000},
-+      {0x0000147c, 0x00000000},
-+      {0x00008000, 0x00000000},
-+      {0x00008004, 0x00000000},
-+      {0x00008008, 0x00000000},
-+      {0x0000800c, 0x00000000},
-+      {0x00008018, 0x00000000},
-+      {0x00008020, 0x00000000},
-+      {0x00008038, 0x00000000},
-+      {0x0000803c, 0x00000000},
-+      {0x00008040, 0x00000000},
-+      {0x00008044, 0x00000000},
-+      {0x00008048, 0x00000000},
-+      {0x0000804c, 0xffffffff},
-+      {0x00008054, 0x00000000},
-+      {0x00008058, 0x00000000},
-+      {0x0000805c, 0x000fc78f},
-+      {0x00008060, 0x0000000f},
-+      {0x00008064, 0x00000000},
-+      {0x00008070, 0x00000310},
-+      {0x00008074, 0x00000020},
-+      {0x00008078, 0x00000000},
-+      {0x0000809c, 0x0000000f},
-+      {0x000080a0, 0x00000000},
-+      {0x000080a4, 0x02ff0000},
-+      {0x000080a8, 0x0e070605},
-+      {0x000080ac, 0x0000000d},
-+      {0x000080b0, 0x00000000},
-+      {0x000080b4, 0x00000000},
-+      {0x000080b8, 0x00000000},
-+      {0x000080bc, 0x00000000},
-+      {0x000080c0, 0x2a800000},
-+      {0x000080c4, 0x06900168},
-+      {0x000080c8, 0x13881c20},
-+      {0x000080cc, 0x01f40000},
-+      {0x000080d0, 0x00252500},
-+      {0x000080d4, 0x00a00000},
-+      {0x000080d8, 0x00400000},
-+      {0x000080dc, 0x00000000},
-+      {0x000080e0, 0xffffffff},
-+      {0x000080e4, 0x0000ffff},
-+      {0x000080e8, 0x3f3f3f3f},
-+      {0x000080ec, 0x00000000},
-+      {0x000080f0, 0x00000000},
-+      {0x000080f4, 0x00000000},
-+      {0x000080fc, 0x00020000},
-+      {0x00008100, 0x00000000},
-+      {0x00008108, 0x00000052},
-+      {0x0000810c, 0x00000000},
-+      {0x00008110, 0x00000000},
-+      {0x00008114, 0x000007ff},
-+      {0x00008118, 0x000000aa},
-+      {0x0000811c, 0x00003210},
-+      {0x00008124, 0x00000000},
-+      {0x00008128, 0x00000000},
-+      {0x0000812c, 0x00000000},
-+      {0x00008130, 0x00000000},
-+      {0x00008134, 0x00000000},
-+      {0x00008138, 0x00000000},
-+      {0x0000813c, 0x0000ffff},
-+      {0x00008144, 0xffffffff},
-+      {0x00008168, 0x00000000},
-+      {0x0000816c, 0x00000000},
-+      {0x00008170, 0x18486200},
-+      {0x00008174, 0x33332210},
-+      {0x00008178, 0x00000000},
-+      {0x0000817c, 0x00020000},
-+      {0x000081c0, 0x00000000},
-+      {0x000081c4, 0x33332210},
-+      {0x000081c8, 0x00000000},
-+      {0x000081cc, 0x00000000},
-+      {0x000081d4, 0x00000000},
-+      {0x000081ec, 0x00000000},
-+      {0x000081f0, 0x00000000},
-+      {0x000081f4, 0x00000000},
-+      {0x000081f8, 0x00000000},
-+      {0x000081fc, 0x00000000},
-+      {0x00008240, 0x00100000},
-+      {0x00008244, 0x0010f424},
-+      {0x00008248, 0x00000800},
-+      {0x0000824c, 0x0001e848},
-+      {0x00008250, 0x00000000},
-+      {0x00008254, 0x00000000},
-+      {0x00008258, 0x00000000},
-+      {0x0000825c, 0x40000000},
-+      {0x00008260, 0x00080922},
-+      {0x00008264, 0x98a00010},
-+      {0x00008268, 0xffffffff},
-+      {0x0000826c, 0x0000ffff},
-+      {0x00008270, 0x00000000},
-+      {0x00008274, 0x40000000},
-+      {0x00008278, 0x003e4180},
-+      {0x0000827c, 0x00000004},
-+      {0x00008284, 0x0000002c},
-+      {0x00008288, 0x0000002c},
-+      {0x0000828c, 0x000000ff},
-+      {0x00008294, 0x00000000},
-+      {0x00008298, 0x00000000},
-+      {0x0000829c, 0x00000000},
-+      {0x00008300, 0x00000140},
-+      {0x00008314, 0x00000000},
-+      {0x0000831c, 0x0000010d},
-+      {0x00008328, 0x00000000},
-+      {0x0000832c, 0x00000007},
-+      {0x00008330, 0x00000302},
-+      {0x00008334, 0x00000700},
-+      {0x00008338, 0x00ff0000},
-+      {0x0000833c, 0x02400000},
-+      {0x00008340, 0x000107ff},
-+      {0x00008344, 0xaa48105b},
-+      {0x00008348, 0x008f0000},
-+      {0x0000835c, 0x00000000},
-+      {0x00008360, 0xffffffff},
-+      {0x00008364, 0xffffffff},
-+      {0x00008368, 0x00000000},
-+      {0x00008370, 0x00000000},
-+      {0x00008374, 0x000000ff},
-+      {0x00008378, 0x00000000},
-+      {0x0000837c, 0x00000000},
-+      {0x00008380, 0xffffffff},
-+      {0x00008384, 0xffffffff},
-+      {0x00008390, 0xffffffff},
-+      {0x00008394, 0xffffffff},
-+      {0x00008398, 0x00000000},
-+      {0x0000839c, 0x00000000},
-+      {0x000083a0, 0x00000000},
-+      {0x000083a4, 0x0000fa14},
-+      {0x000083a8, 0x000f0c00},
-+      {0x000083ac, 0x33332210},
-+      {0x000083b0, 0x33332210},
-+      {0x000083b4, 0x33332210},
-+      {0x000083b8, 0x33332210},
-+      {0x000083bc, 0x00000000},
-+      {0x000083c0, 0x00000000},
-+      {0x000083c4, 0x00000000},
-+      {0x000083c8, 0x00000000},
-+      {0x000083cc, 0x00000200},
-+      {0x000083d0, 0x000301ff},
-+};
-+
-+static const u32 ar9300Common_wo_xlna_rx_gain_table_2p0[][2] = {
-+      /* Addr      allmodes  */
-+      {0x0000a000, 0x00010000},
-+      {0x0000a004, 0x00030002},
-+      {0x0000a008, 0x00050004},
-+      {0x0000a00c, 0x00810080},
-+      {0x0000a010, 0x00830082},
-+      {0x0000a014, 0x01810180},
-+      {0x0000a018, 0x01830182},
-+      {0x0000a01c, 0x01850184},
-+      {0x0000a020, 0x01890188},
-+      {0x0000a024, 0x018b018a},
-+      {0x0000a028, 0x018d018c},
-+      {0x0000a02c, 0x03820190},
-+      {0x0000a030, 0x03840383},
-+      {0x0000a034, 0x03880385},
-+      {0x0000a038, 0x038a0389},
-+      {0x0000a03c, 0x038c038b},
-+      {0x0000a040, 0x0390038d},
-+      {0x0000a044, 0x03920391},
-+      {0x0000a048, 0x03940393},
-+      {0x0000a04c, 0x03960395},
-+      {0x0000a050, 0x00000000},
-+      {0x0000a054, 0x00000000},
-+      {0x0000a058, 0x00000000},
-+      {0x0000a05c, 0x00000000},
-+      {0x0000a060, 0x00000000},
-+      {0x0000a064, 0x00000000},
-+      {0x0000a068, 0x00000000},
-+      {0x0000a06c, 0x00000000},
-+      {0x0000a070, 0x00000000},
-+      {0x0000a074, 0x00000000},
-+      {0x0000a078, 0x00000000},
-+      {0x0000a07c, 0x00000000},
-+      {0x0000a080, 0x29292929},
-+      {0x0000a084, 0x29292929},
-+      {0x0000a088, 0x29292929},
-+      {0x0000a08c, 0x29292929},
-+      {0x0000a090, 0x22292929},
-+      {0x0000a094, 0x1d1d2222},
-+      {0x0000a098, 0x0c111117},
-+      {0x0000a09c, 0x00030303},
-+      {0x0000a0a0, 0x00000000},
-+      {0x0000a0a4, 0x00000000},
-+      {0x0000a0a8, 0x00000000},
-+      {0x0000a0ac, 0x00000000},
-+      {0x0000a0b0, 0x00000000},
-+      {0x0000a0b4, 0x00000000},
-+      {0x0000a0b8, 0x00000000},
-+      {0x0000a0bc, 0x00000000},
-+      {0x0000a0c0, 0x001f0000},
-+      {0x0000a0c4, 0x01000101},
-+      {0x0000a0c8, 0x011e011f},
-+      {0x0000a0cc, 0x011c011d},
-+      {0x0000a0d0, 0x02030204},
-+      {0x0000a0d4, 0x02010202},
-+      {0x0000a0d8, 0x021f0200},
-+      {0x0000a0dc, 0x0302021e},
-+      {0x0000a0e0, 0x03000301},
-+      {0x0000a0e4, 0x031e031f},
-+      {0x0000a0e8, 0x0402031d},
-+      {0x0000a0ec, 0x04000401},
-+      {0x0000a0f0, 0x041e041f},
-+      {0x0000a0f4, 0x0502041d},
-+      {0x0000a0f8, 0x05000501},
-+      {0x0000a0fc, 0x051e051f},
-+      {0x0000a100, 0x06010602},
-+      {0x0000a104, 0x061f0600},
-+      {0x0000a108, 0x061d061e},
-+      {0x0000a10c, 0x07020703},
-+      {0x0000a110, 0x07000701},
-+      {0x0000a114, 0x00000000},
-+      {0x0000a118, 0x00000000},
-+      {0x0000a11c, 0x00000000},
-+      {0x0000a120, 0x00000000},
-+      {0x0000a124, 0x00000000},
-+      {0x0000a128, 0x00000000},
-+      {0x0000a12c, 0x00000000},
-+      {0x0000a130, 0x00000000},
-+      {0x0000a134, 0x00000000},
-+      {0x0000a138, 0x00000000},
-+      {0x0000a13c, 0x00000000},
-+      {0x0000a140, 0x001f0000},
-+      {0x0000a144, 0x01000101},
-+      {0x0000a148, 0x011e011f},
-+      {0x0000a14c, 0x011c011d},
-+      {0x0000a150, 0x02030204},
-+      {0x0000a154, 0x02010202},
-+      {0x0000a158, 0x021f0200},
-+      {0x0000a15c, 0x0302021e},
-+      {0x0000a160, 0x03000301},
-+      {0x0000a164, 0x031e031f},
-+      {0x0000a168, 0x0402031d},
-+      {0x0000a16c, 0x04000401},
-+      {0x0000a170, 0x041e041f},
-+      {0x0000a174, 0x0502041d},
-+      {0x0000a178, 0x05000501},
-+      {0x0000a17c, 0x051e051f},
-+      {0x0000a180, 0x06010602},
-+      {0x0000a184, 0x061f0600},
-+      {0x0000a188, 0x061d061e},
-+      {0x0000a18c, 0x07020703},
-+      {0x0000a190, 0x07000701},
-+      {0x0000a194, 0x00000000},
-+      {0x0000a198, 0x00000000},
-+      {0x0000a19c, 0x00000000},
-+      {0x0000a1a0, 0x00000000},
-+      {0x0000a1a4, 0x00000000},
-+      {0x0000a1a8, 0x00000000},
-+      {0x0000a1ac, 0x00000000},
-+      {0x0000a1b0, 0x00000000},
-+      {0x0000a1b4, 0x00000000},
-+      {0x0000a1b8, 0x00000000},
-+      {0x0000a1bc, 0x00000000},
-+      {0x0000a1c0, 0x00000000},
-+      {0x0000a1c4, 0x00000000},
-+      {0x0000a1c8, 0x00000000},
-+      {0x0000a1cc, 0x00000000},
-+      {0x0000a1d0, 0x00000000},
-+      {0x0000a1d4, 0x00000000},
-+      {0x0000a1d8, 0x00000000},
-+      {0x0000a1dc, 0x00000000},
-+      {0x0000a1e0, 0x00000000},
-+      {0x0000a1e4, 0x00000000},
-+      {0x0000a1e8, 0x00000000},
-+      {0x0000a1ec, 0x00000000},
-+      {0x0000a1f0, 0x00000396},
-+      {0x0000a1f4, 0x00000396},
-+      {0x0000a1f8, 0x00000396},
-+      {0x0000a1fc, 0x00000196},
-+      {0x0000b000, 0x00010000},
-+      {0x0000b004, 0x00030002},
-+      {0x0000b008, 0x00050004},
-+      {0x0000b00c, 0x00810080},
-+      {0x0000b010, 0x00830082},
-+      {0x0000b014, 0x01810180},
-+      {0x0000b018, 0x01830182},
-+      {0x0000b01c, 0x01850184},
-+      {0x0000b020, 0x02810280},
-+      {0x0000b024, 0x02830282},
-+      {0x0000b028, 0x02850284},
-+      {0x0000b02c, 0x02890288},
-+      {0x0000b030, 0x028b028a},
-+      {0x0000b034, 0x0388028c},
-+      {0x0000b038, 0x038a0389},
-+      {0x0000b03c, 0x038c038b},
-+      {0x0000b040, 0x0390038d},
-+      {0x0000b044, 0x03920391},
-+      {0x0000b048, 0x03940393},
-+      {0x0000b04c, 0x03960395},
-+      {0x0000b050, 0x00000000},
-+      {0x0000b054, 0x00000000},
-+      {0x0000b058, 0x00000000},
-+      {0x0000b05c, 0x00000000},
-+      {0x0000b060, 0x00000000},
-+      {0x0000b064, 0x00000000},
-+      {0x0000b068, 0x00000000},
-+      {0x0000b06c, 0x00000000},
-+      {0x0000b070, 0x00000000},
-+      {0x0000b074, 0x00000000},
-+      {0x0000b078, 0x00000000},
-+      {0x0000b07c, 0x00000000},
-+      {0x0000b080, 0x32323232},
-+      {0x0000b084, 0x2f2f3232},
-+      {0x0000b088, 0x23282a2d},
-+      {0x0000b08c, 0x1c1e2123},
-+      {0x0000b090, 0x14171919},
-+      {0x0000b094, 0x0e0e1214},
-+      {0x0000b098, 0x03050707},
-+      {0x0000b09c, 0x00030303},
-+      {0x0000b0a0, 0x00000000},
-+      {0x0000b0a4, 0x00000000},
-+      {0x0000b0a8, 0x00000000},
-+      {0x0000b0ac, 0x00000000},
-+      {0x0000b0b0, 0x00000000},
-+      {0x0000b0b4, 0x00000000},
-+      {0x0000b0b8, 0x00000000},
-+      {0x0000b0bc, 0x00000000},
-+      {0x0000b0c0, 0x003f0020},
-+      {0x0000b0c4, 0x00400041},
-+      {0x0000b0c8, 0x0140005f},
-+      {0x0000b0cc, 0x0160015f},
-+      {0x0000b0d0, 0x017e017f},
-+      {0x0000b0d4, 0x02410242},
-+      {0x0000b0d8, 0x025f0240},
-+      {0x0000b0dc, 0x027f0260},
-+      {0x0000b0e0, 0x0341027e},
-+      {0x0000b0e4, 0x035f0340},
-+      {0x0000b0e8, 0x037f0360},
-+      {0x0000b0ec, 0x04400441},
-+      {0x0000b0f0, 0x0460045f},
-+      {0x0000b0f4, 0x0541047f},
-+      {0x0000b0f8, 0x055f0540},
-+      {0x0000b0fc, 0x057f0560},
-+      {0x0000b100, 0x06400641},
-+      {0x0000b104, 0x0660065f},
-+      {0x0000b108, 0x067e067f},
-+      {0x0000b10c, 0x07410742},
-+      {0x0000b110, 0x075f0740},
-+      {0x0000b114, 0x077f0760},
-+      {0x0000b118, 0x07800781},
-+      {0x0000b11c, 0x07a0079f},
-+      {0x0000b120, 0x07c107bf},
-+      {0x0000b124, 0x000007c0},
-+      {0x0000b128, 0x00000000},
-+      {0x0000b12c, 0x00000000},
-+      {0x0000b130, 0x00000000},
-+      {0x0000b134, 0x00000000},
-+      {0x0000b138, 0x00000000},
-+      {0x0000b13c, 0x00000000},
-+      {0x0000b140, 0x003f0020},
-+      {0x0000b144, 0x00400041},
-+      {0x0000b148, 0x0140005f},
-+      {0x0000b14c, 0x0160015f},
-+      {0x0000b150, 0x017e017f},
-+      {0x0000b154, 0x02410242},
-+      {0x0000b158, 0x025f0240},
-+      {0x0000b15c, 0x027f0260},
-+      {0x0000b160, 0x0341027e},
-+      {0x0000b164, 0x035f0340},
-+      {0x0000b168, 0x037f0360},
-+      {0x0000b16c, 0x04400441},
-+      {0x0000b170, 0x0460045f},
-+      {0x0000b174, 0x0541047f},
-+      {0x0000b178, 0x055f0540},
-+      {0x0000b17c, 0x057f0560},
-+      {0x0000b180, 0x06400641},
-+      {0x0000b184, 0x0660065f},
-+      {0x0000b188, 0x067e067f},
-+      {0x0000b18c, 0x07410742},
-+      {0x0000b190, 0x075f0740},
-+      {0x0000b194, 0x077f0760},
-+      {0x0000b198, 0x07800781},
-+      {0x0000b19c, 0x07a0079f},
-+      {0x0000b1a0, 0x07c107bf},
-+      {0x0000b1a4, 0x000007c0},
-+      {0x0000b1a8, 0x00000000},
-+      {0x0000b1ac, 0x00000000},
-+      {0x0000b1b0, 0x00000000},
-+      {0x0000b1b4, 0x00000000},
-+      {0x0000b1b8, 0x00000000},
-+      {0x0000b1bc, 0x00000000},
-+      {0x0000b1c0, 0x00000000},
-+      {0x0000b1c4, 0x00000000},
-+      {0x0000b1c8, 0x00000000},
-+      {0x0000b1cc, 0x00000000},
-+      {0x0000b1d0, 0x00000000},
-+      {0x0000b1d4, 0x00000000},
-+      {0x0000b1d8, 0x00000000},
-+      {0x0000b1dc, 0x00000000},
-+      {0x0000b1e0, 0x00000000},
-+      {0x0000b1e4, 0x00000000},
-+      {0x0000b1e8, 0x00000000},
-+      {0x0000b1ec, 0x00000000},
-+      {0x0000b1f0, 0x00000396},
-+      {0x0000b1f4, 0x00000396},
-+      {0x0000b1f8, 0x00000396},
-+      {0x0000b1fc, 0x00000196},
-+};
-+
-+static const u32 ar9300_2p0_soc_preamble[][2] = {
-+      /* Addr      allmodes  */
-+      {0x000040a4, 0x00a0c1c9},
-+      {0x00007008, 0x00000000},
-+      {0x00007020, 0x00000000},
-+      {0x00007034, 0x00000002},
-+      {0x00007038, 0x000004c2},
-+};
-+
-+static const u32 ar9300PciePhy_pll_on_clkreq_disable_L1_2p0[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00004040, 0x08212e5e},
-+      {0x00004040, 0x0008003b},
-+      {0x00004044, 0x00000000},
-+};
-+
-+static const u32 ar9300PciePhy_clkreq_enable_L1_2p0[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00004040, 0x08253e5e},
-+      {0x00004040, 0x0008003b},
-+      {0x00004044, 0x00000000},
-+};
-+
-+static const u32 ar9300PciePhy_clkreq_disable_L1_2p0[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00004040, 0x08213e5e},
-+      {0x00004040, 0x0008003b},
-+      {0x00004044, 0x00000000},
-+};
-+
-+#endif /* INITVALS_9003_2P0_H */
---- /dev/null
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-@@ -0,0 +1,1785 @@
-+/*
-+ * Copyright (c) 2010 Atheros Communications Inc.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef INITVALS_9003_2P2_H
-+#define INITVALS_9003_2P2_H
-+
-+/* AR9003 2.2 */
-+
-+static const u32 ar9300_2p2_radio_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0001609c, 0x0dd08f29, 0x0dd08f29, 0x0b283f31, 0x0b283f31},
-+      {0x000160ac, 0xa4653c00, 0xa4653c00, 0x24652800, 0x24652800},
-+      {0x000160b0, 0x03284f3e, 0x03284f3e, 0x05d08f20, 0x05d08f20},
-+      {0x0001610c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
-+      {0x0001650c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
-+      {0x0001690c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00016940, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
-+};
-+
-+static const u32 ar9300Modes_lowest_ob_db_tx_gain_table_2p2[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-+      {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
-+      {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
-+      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
-+      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
-+      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
-+      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
-+      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
-+      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
-+      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
-+      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
-+      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
-+      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-+      {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
-+      {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
-+      {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
-+      {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
-+      {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
-+      {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
-+      {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
-+      {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
-+      {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
-+      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
-+      {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
-+      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
-+      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
-+      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
-+      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
-+      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
-+      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
-+      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
-+      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
-+      {0x0000a5cc, 0x5c82486b, 0x5c82486b, 0x47801a83, 0x47801a83},
-+      {0x0000a5d0, 0x61824a6c, 0x61824a6c, 0x4a801c84, 0x4a801c84},
-+      {0x0000a5d4, 0x66826a6c, 0x66826a6c, 0x4e801ce3, 0x4e801ce3},
-+      {0x0000a5d8, 0x6b826e6c, 0x6b826e6c, 0x52801ce5, 0x52801ce5},
-+      {0x0000a5dc, 0x7082708c, 0x7082708c, 0x56801ce9, 0x56801ce9},
-+      {0x0000a5e0, 0x7382b08a, 0x7382b08a, 0x5a801ceb, 0x5a801ceb},
-+      {0x0000a5e4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5e8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5ec, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f0, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5fc, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016048, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
-+      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016448, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
-+      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016848, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
-+      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
-+static const u32 ar9300Modes_fast_clock_2p2[][3] = {
-+      /* Addr      5G_HT20     5G_HT40   */
-+      {0x00001030, 0x00000268, 0x000004d0},
-+      {0x00001070, 0x0000018c, 0x00000318},
-+      {0x000010b0, 0x00000fd0, 0x00001fa0},
-+      {0x00008014, 0x044c044c, 0x08980898},
-+      {0x0000801c, 0x148ec02b, 0x148ec057},
-+      {0x00008318, 0x000044c0, 0x00008980},
-+      {0x00009e00, 0x03721821, 0x03721821},
-+      {0x0000a230, 0x0000000b, 0x00000016},
-+      {0x0000a254, 0x00000898, 0x00001130},
-+};
-+
-+static const u32 ar9300_2p2_radio_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00016000, 0x36db6db6},
-+      {0x00016004, 0x6db6db40},
-+      {0x00016008, 0x73f00000},
-+      {0x0001600c, 0x00000000},
-+      {0x00016040, 0x7f80fff8},
-+      {0x0001604c, 0x76d005b5},
-+      {0x00016050, 0x556cf031},
-+      {0x00016054, 0x13449440},
-+      {0x00016058, 0x0c51c92c},
-+      {0x0001605c, 0x3db7fffc},
-+      {0x00016060, 0xfffffffc},
-+      {0x00016064, 0x000f0278},
-+      {0x0001606c, 0x6db60000},
-+      {0x00016080, 0x00000000},
-+      {0x00016084, 0x0e48048c},
-+      {0x00016088, 0x54214514},
-+      {0x0001608c, 0x119f481e},
-+      {0x00016090, 0x24926490},
-+      {0x00016098, 0xd2888888},
-+      {0x000160a0, 0x0a108ffe},
-+      {0x000160a4, 0x812fc370},
-+      {0x000160a8, 0x423c8000},
-+      {0x000160b4, 0x92480080},
-+      {0x000160c0, 0x00adb6d0},
-+      {0x000160c4, 0x6db6db60},
-+      {0x000160c8, 0x6db6db6c},
-+      {0x000160cc, 0x01e6c000},
-+      {0x00016100, 0x3fffbe01},
-+      {0x00016104, 0xfff80000},
-+      {0x00016108, 0x00080010},
-+      {0x00016144, 0x02084080},
-+      {0x00016148, 0x00000000},
-+      {0x00016280, 0x058a0001},
-+      {0x00016284, 0x3d840208},
-+      {0x00016288, 0x05a20408},
-+      {0x0001628c, 0x00038c07},
-+      {0x00016290, 0x00000004},
-+      {0x00016294, 0x458aa14f},
-+      {0x00016380, 0x00000000},
-+      {0x00016384, 0x00000000},
-+      {0x00016388, 0x00800700},
-+      {0x0001638c, 0x00800700},
-+      {0x00016390, 0x00800700},
-+      {0x00016394, 0x00000000},
-+      {0x00016398, 0x00000000},
-+      {0x0001639c, 0x00000000},
-+      {0x000163a0, 0x00000001},
-+      {0x000163a4, 0x00000001},
-+      {0x000163a8, 0x00000000},
-+      {0x000163ac, 0x00000000},
-+      {0x000163b0, 0x00000000},
-+      {0x000163b4, 0x00000000},
-+      {0x000163b8, 0x00000000},
-+      {0x000163bc, 0x00000000},
-+      {0x000163c0, 0x000000a0},
-+      {0x000163c4, 0x000c0000},
-+      {0x000163c8, 0x14021402},
-+      {0x000163cc, 0x00001402},
-+      {0x000163d0, 0x00000000},
-+      {0x000163d4, 0x00000000},
-+      {0x00016400, 0x36db6db6},
-+      {0x00016404, 0x6db6db40},
-+      {0x00016408, 0x73f00000},
-+      {0x0001640c, 0x00000000},
-+      {0x00016440, 0x7f80fff8},
-+      {0x0001644c, 0x76d005b5},
-+      {0x00016450, 0x556cf031},
-+      {0x00016454, 0x13449440},
-+      {0x00016458, 0x0c51c92c},
-+      {0x0001645c, 0x3db7fffc},
-+      {0x00016460, 0xfffffffc},
-+      {0x00016464, 0x000f0278},
-+      {0x0001646c, 0x6db60000},
-+      {0x00016500, 0x3fffbe01},
-+      {0x00016504, 0xfff80000},
-+      {0x00016508, 0x00080010},
-+      {0x00016544, 0x02084080},
-+      {0x00016548, 0x00000000},
-+      {0x00016780, 0x00000000},
-+      {0x00016784, 0x00000000},
-+      {0x00016788, 0x00800700},
-+      {0x0001678c, 0x00800700},
-+      {0x00016790, 0x00800700},
-+      {0x00016794, 0x00000000},
-+      {0x00016798, 0x00000000},
-+      {0x0001679c, 0x00000000},
-+      {0x000167a0, 0x00000001},
-+      {0x000167a4, 0x00000001},
-+      {0x000167a8, 0x00000000},
-+      {0x000167ac, 0x00000000},
-+      {0x000167b0, 0x00000000},
-+      {0x000167b4, 0x00000000},
-+      {0x000167b8, 0x00000000},
-+      {0x000167bc, 0x00000000},
-+      {0x000167c0, 0x000000a0},
-+      {0x000167c4, 0x000c0000},
-+      {0x000167c8, 0x14021402},
-+      {0x000167cc, 0x00001402},
-+      {0x000167d0, 0x00000000},
-+      {0x000167d4, 0x00000000},
-+      {0x00016800, 0x36db6db6},
-+      {0x00016804, 0x6db6db40},
-+      {0x00016808, 0x73f00000},
-+      {0x0001680c, 0x00000000},
-+      {0x00016840, 0x7f80fff8},
-+      {0x0001684c, 0x76d005b5},
-+      {0x00016850, 0x556cf031},
-+      {0x00016854, 0x13449440},
-+      {0x00016858, 0x0c51c92c},
-+      {0x0001685c, 0x3db7fffc},
-+      {0x00016860, 0xfffffffc},
-+      {0x00016864, 0x000f0278},
-+      {0x0001686c, 0x6db60000},
-+      {0x00016900, 0x3fffbe01},
-+      {0x00016904, 0xfff80000},
-+      {0x00016908, 0x00080010},
-+      {0x00016944, 0x02084080},
-+      {0x00016948, 0x00000000},
-+      {0x00016b80, 0x00000000},
-+      {0x00016b84, 0x00000000},
-+      {0x00016b88, 0x00800700},
-+      {0x00016b8c, 0x00800700},
-+      {0x00016b90, 0x00800700},
-+      {0x00016b94, 0x00000000},
-+      {0x00016b98, 0x00000000},
-+      {0x00016b9c, 0x00000000},
-+      {0x00016ba0, 0x00000001},
-+      {0x00016ba4, 0x00000001},
-+      {0x00016ba8, 0x00000000},
-+      {0x00016bac, 0x00000000},
-+      {0x00016bb0, 0x00000000},
-+      {0x00016bb4, 0x00000000},
-+      {0x00016bb8, 0x00000000},
-+      {0x00016bbc, 0x00000000},
-+      {0x00016bc0, 0x000000a0},
-+      {0x00016bc4, 0x000c0000},
-+      {0x00016bc8, 0x14021402},
-+      {0x00016bcc, 0x00001402},
-+      {0x00016bd0, 0x00000000},
-+      {0x00016bd4, 0x00000000},
-+};
-+
-+static const u32 ar9300Common_rx_gain_table_merlin_2p2[][2] = {
-+      /* Addr      allmodes  */
-+      {0x0000a000, 0x02000101},
-+      {0x0000a004, 0x02000102},
-+      {0x0000a008, 0x02000103},
-+      {0x0000a00c, 0x02000104},
-+      {0x0000a010, 0x02000200},
-+      {0x0000a014, 0x02000201},
-+      {0x0000a018, 0x02000202},
-+      {0x0000a01c, 0x02000203},
-+      {0x0000a020, 0x02000204},
-+      {0x0000a024, 0x02000205},
-+      {0x0000a028, 0x02000208},
-+      {0x0000a02c, 0x02000302},
-+      {0x0000a030, 0x02000303},
-+      {0x0000a034, 0x02000304},
-+      {0x0000a038, 0x02000400},
-+      {0x0000a03c, 0x02010300},
-+      {0x0000a040, 0x02010301},
-+      {0x0000a044, 0x02010302},
-+      {0x0000a048, 0x02000500},
-+      {0x0000a04c, 0x02010400},
-+      {0x0000a050, 0x02020300},
-+      {0x0000a054, 0x02020301},
-+      {0x0000a058, 0x02020302},
-+      {0x0000a05c, 0x02020303},
-+      {0x0000a060, 0x02020400},
-+      {0x0000a064, 0x02030300},
-+      {0x0000a068, 0x02030301},
-+      {0x0000a06c, 0x02030302},
-+      {0x0000a070, 0x02030303},
-+      {0x0000a074, 0x02030400},
-+      {0x0000a078, 0x02040300},
-+      {0x0000a07c, 0x02040301},
-+      {0x0000a080, 0x02040302},
-+      {0x0000a084, 0x02040303},
-+      {0x0000a088, 0x02030500},
-+      {0x0000a08c, 0x02040400},
-+      {0x0000a090, 0x02050203},
-+      {0x0000a094, 0x02050204},
-+      {0x0000a098, 0x02050205},
-+      {0x0000a09c, 0x02040500},
-+      {0x0000a0a0, 0x02050301},
-+      {0x0000a0a4, 0x02050302},
-+      {0x0000a0a8, 0x02050303},
-+      {0x0000a0ac, 0x02050400},
-+      {0x0000a0b0, 0x02050401},
-+      {0x0000a0b4, 0x02050402},
-+      {0x0000a0b8, 0x02050403},
-+      {0x0000a0bc, 0x02050500},
-+      {0x0000a0c0, 0x02050501},
-+      {0x0000a0c4, 0x02050502},
-+      {0x0000a0c8, 0x02050503},
-+      {0x0000a0cc, 0x02050504},
-+      {0x0000a0d0, 0x02050600},
-+      {0x0000a0d4, 0x02050601},
-+      {0x0000a0d8, 0x02050602},
-+      {0x0000a0dc, 0x02050603},
-+      {0x0000a0e0, 0x02050604},
-+      {0x0000a0e4, 0x02050700},
-+      {0x0000a0e8, 0x02050701},
-+      {0x0000a0ec, 0x02050702},
-+      {0x0000a0f0, 0x02050703},
-+      {0x0000a0f4, 0x02050704},
-+      {0x0000a0f8, 0x02050705},
-+      {0x0000a0fc, 0x02050708},
-+      {0x0000a100, 0x02050709},
-+      {0x0000a104, 0x0205070a},
-+      {0x0000a108, 0x0205070b},
-+      {0x0000a10c, 0x0205070c},
-+      {0x0000a110, 0x0205070d},
-+      {0x0000a114, 0x02050710},
-+      {0x0000a118, 0x02050711},
-+      {0x0000a11c, 0x02050712},
-+      {0x0000a120, 0x02050713},
-+      {0x0000a124, 0x02050714},
-+      {0x0000a128, 0x02050715},
-+      {0x0000a12c, 0x02050730},
-+      {0x0000a130, 0x02050731},
-+      {0x0000a134, 0x02050732},
-+      {0x0000a138, 0x02050733},
-+      {0x0000a13c, 0x02050734},
-+      {0x0000a140, 0x02050735},
-+      {0x0000a144, 0x02050750},
-+      {0x0000a148, 0x02050751},
-+      {0x0000a14c, 0x02050752},
-+      {0x0000a150, 0x02050753},
-+      {0x0000a154, 0x02050754},
-+      {0x0000a158, 0x02050755},
-+      {0x0000a15c, 0x02050770},
-+      {0x0000a160, 0x02050771},
-+      {0x0000a164, 0x02050772},
-+      {0x0000a168, 0x02050773},
-+      {0x0000a16c, 0x02050774},
-+      {0x0000a170, 0x02050775},
-+      {0x0000a174, 0x00000776},
-+      {0x0000a178, 0x00000776},
-+      {0x0000a17c, 0x00000776},
-+      {0x0000a180, 0x00000776},
-+      {0x0000a184, 0x00000776},
-+      {0x0000a188, 0x00000776},
-+      {0x0000a18c, 0x00000776},
-+      {0x0000a190, 0x00000776},
-+      {0x0000a194, 0x00000776},
-+      {0x0000a198, 0x00000776},
-+      {0x0000a19c, 0x00000776},
-+      {0x0000a1a0, 0x00000776},
-+      {0x0000a1a4, 0x00000776},
-+      {0x0000a1a8, 0x00000776},
-+      {0x0000a1ac, 0x00000776},
-+      {0x0000a1b0, 0x00000776},
-+      {0x0000a1b4, 0x00000776},
-+      {0x0000a1b8, 0x00000776},
-+      {0x0000a1bc, 0x00000776},
-+      {0x0000a1c0, 0x00000776},
-+      {0x0000a1c4, 0x00000776},
-+      {0x0000a1c8, 0x00000776},
-+      {0x0000a1cc, 0x00000776},
-+      {0x0000a1d0, 0x00000776},
-+      {0x0000a1d4, 0x00000776},
-+      {0x0000a1d8, 0x00000776},
-+      {0x0000a1dc, 0x00000776},
-+      {0x0000a1e0, 0x00000776},
-+      {0x0000a1e4, 0x00000776},
-+      {0x0000a1e8, 0x00000776},
-+      {0x0000a1ec, 0x00000776},
-+      {0x0000a1f0, 0x00000776},
-+      {0x0000a1f4, 0x00000776},
-+      {0x0000a1f8, 0x00000776},
-+      {0x0000a1fc, 0x00000776},
-+      {0x0000b000, 0x02000101},
-+      {0x0000b004, 0x02000102},
-+      {0x0000b008, 0x02000103},
-+      {0x0000b00c, 0x02000104},
-+      {0x0000b010, 0x02000200},
-+      {0x0000b014, 0x02000201},
-+      {0x0000b018, 0x02000202},
-+      {0x0000b01c, 0x02000203},
-+      {0x0000b020, 0x02000204},
-+      {0x0000b024, 0x02000205},
-+      {0x0000b028, 0x02000208},
-+      {0x0000b02c, 0x02000302},
-+      {0x0000b030, 0x02000303},
-+      {0x0000b034, 0x02000304},
-+      {0x0000b038, 0x02000400},
-+      {0x0000b03c, 0x02010300},
-+      {0x0000b040, 0x02010301},
-+      {0x0000b044, 0x02010302},
-+      {0x0000b048, 0x02000500},
-+      {0x0000b04c, 0x02010400},
-+      {0x0000b050, 0x02020300},
-+      {0x0000b054, 0x02020301},
-+      {0x0000b058, 0x02020302},
-+      {0x0000b05c, 0x02020303},
-+      {0x0000b060, 0x02020400},
-+      {0x0000b064, 0x02030300},
-+      {0x0000b068, 0x02030301},
-+      {0x0000b06c, 0x02030302},
-+      {0x0000b070, 0x02030303},
-+      {0x0000b074, 0x02030400},
-+      {0x0000b078, 0x02040300},
-+      {0x0000b07c, 0x02040301},
-+      {0x0000b080, 0x02040302},
-+      {0x0000b084, 0x02040303},
-+      {0x0000b088, 0x02030500},
-+      {0x0000b08c, 0x02040400},
-+      {0x0000b090, 0x02050203},
-+      {0x0000b094, 0x02050204},
-+      {0x0000b098, 0x02050205},
-+      {0x0000b09c, 0x02040500},
-+      {0x0000b0a0, 0x02050301},
-+      {0x0000b0a4, 0x02050302},
-+      {0x0000b0a8, 0x02050303},
-+      {0x0000b0ac, 0x02050400},
-+      {0x0000b0b0, 0x02050401},
-+      {0x0000b0b4, 0x02050402},
-+      {0x0000b0b8, 0x02050403},
-+      {0x0000b0bc, 0x02050500},
-+      {0x0000b0c0, 0x02050501},
-+      {0x0000b0c4, 0x02050502},
-+      {0x0000b0c8, 0x02050503},
-+      {0x0000b0cc, 0x02050504},
-+      {0x0000b0d0, 0x02050600},
-+      {0x0000b0d4, 0x02050601},
-+      {0x0000b0d8, 0x02050602},
-+      {0x0000b0dc, 0x02050603},
-+      {0x0000b0e0, 0x02050604},
-+      {0x0000b0e4, 0x02050700},
-+      {0x0000b0e8, 0x02050701},
-+      {0x0000b0ec, 0x02050702},
-+      {0x0000b0f0, 0x02050703},
-+      {0x0000b0f4, 0x02050704},
-+      {0x0000b0f8, 0x02050705},
-+      {0x0000b0fc, 0x02050708},
-+      {0x0000b100, 0x02050709},
-+      {0x0000b104, 0x0205070a},
-+      {0x0000b108, 0x0205070b},
-+      {0x0000b10c, 0x0205070c},
-+      {0x0000b110, 0x0205070d},
-+      {0x0000b114, 0x02050710},
-+      {0x0000b118, 0x02050711},
-+      {0x0000b11c, 0x02050712},
-+      {0x0000b120, 0x02050713},
-+      {0x0000b124, 0x02050714},
-+      {0x0000b128, 0x02050715},
-+      {0x0000b12c, 0x02050730},
-+      {0x0000b130, 0x02050731},
-+      {0x0000b134, 0x02050732},
-+      {0x0000b138, 0x02050733},
-+      {0x0000b13c, 0x02050734},
-+      {0x0000b140, 0x02050735},
-+      {0x0000b144, 0x02050750},
-+      {0x0000b148, 0x02050751},
-+      {0x0000b14c, 0x02050752},
-+      {0x0000b150, 0x02050753},
-+      {0x0000b154, 0x02050754},
-+      {0x0000b158, 0x02050755},
-+      {0x0000b15c, 0x02050770},
-+      {0x0000b160, 0x02050771},
-+      {0x0000b164, 0x02050772},
-+      {0x0000b168, 0x02050773},
-+      {0x0000b16c, 0x02050774},
-+      {0x0000b170, 0x02050775},
-+      {0x0000b174, 0x00000776},
-+      {0x0000b178, 0x00000776},
-+      {0x0000b17c, 0x00000776},
-+      {0x0000b180, 0x00000776},
-+      {0x0000b184, 0x00000776},
-+      {0x0000b188, 0x00000776},
-+      {0x0000b18c, 0x00000776},
-+      {0x0000b190, 0x00000776},
-+      {0x0000b194, 0x00000776},
-+      {0x0000b198, 0x00000776},
-+      {0x0000b19c, 0x00000776},
-+      {0x0000b1a0, 0x00000776},
-+      {0x0000b1a4, 0x00000776},
-+      {0x0000b1a8, 0x00000776},
-+      {0x0000b1ac, 0x00000776},
-+      {0x0000b1b0, 0x00000776},
-+      {0x0000b1b4, 0x00000776},
-+      {0x0000b1b8, 0x00000776},
-+      {0x0000b1bc, 0x00000776},
-+      {0x0000b1c0, 0x00000776},
-+      {0x0000b1c4, 0x00000776},
-+      {0x0000b1c8, 0x00000776},
-+      {0x0000b1cc, 0x00000776},
-+      {0x0000b1d0, 0x00000776},
-+      {0x0000b1d4, 0x00000776},
-+      {0x0000b1d8, 0x00000776},
-+      {0x0000b1dc, 0x00000776},
-+      {0x0000b1e0, 0x00000776},
-+      {0x0000b1e4, 0x00000776},
-+      {0x0000b1e8, 0x00000776},
-+      {0x0000b1ec, 0x00000776},
-+      {0x0000b1f0, 0x00000776},
-+      {0x0000b1f4, 0x00000776},
-+      {0x0000b1f8, 0x00000776},
-+      {0x0000b1fc, 0x00000776},
-+};
-+
-+static const u32 ar9300_2p2_mac_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-+      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-+      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-+      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-+      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-+      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-+      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-+      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-+};
-+
-+static const u32 ar9300_2p2_soc_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
-+};
-+
-+static const u32 ar9200_merlin_2p2_radio_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00007800, 0x00040000},
-+      {0x00007804, 0xdb005012},
-+      {0x00007808, 0x04924914},
-+      {0x0000780c, 0x21084210},
-+      {0x00007810, 0x6d801300},
-+      {0x00007814, 0x0019beff},
-+      {0x00007818, 0x07e41000},
-+      {0x0000781c, 0x00392000},
-+      {0x00007820, 0x92592480},
-+      {0x00007824, 0x00040000},
-+      {0x00007828, 0xdb005012},
-+      {0x0000782c, 0x04924914},
-+      {0x00007830, 0x21084210},
-+      {0x00007834, 0x6d801300},
-+      {0x00007838, 0x0019beff},
-+      {0x0000783c, 0x07e40000},
-+      {0x00007840, 0x00392000},
-+      {0x00007844, 0x92592480},
-+      {0x00007848, 0x00100000},
-+      {0x0000784c, 0x773f0567},
-+      {0x00007850, 0x54214514},
-+      {0x00007854, 0x12035828},
-+      {0x00007858, 0x92592692},
-+      {0x0000785c, 0x00000000},
-+      {0x00007860, 0x56400000},
-+      {0x00007864, 0x0a8e370e},
-+      {0x00007868, 0xc0102850},
-+      {0x0000786c, 0x812d4000},
-+      {0x00007870, 0x807ec400},
-+      {0x00007874, 0x001b6db0},
-+      {0x00007878, 0x00376b63},
-+      {0x0000787c, 0x06db6db6},
-+      {0x00007880, 0x006d8000},
-+      {0x00007884, 0xffeffffe},
-+      {0x00007888, 0xffeffffe},
-+      {0x0000788c, 0x00010000},
-+      {0x00007890, 0x02060aeb},
-+      {0x00007894, 0x5a108000},
-+};
-+
-+static const u32 ar9300_2p2_baseband_postamble[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
-+      {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
-+      {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
-+      {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
-+      {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
-+      {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
-+      {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
-+      {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
-+      {0x00009e04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
-+      {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
-+      {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e},
-+      {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
-+      {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
-+      {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
-+      {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
-+      {0x00009e44, 0x02321e27, 0x02321e27, 0x02291e27, 0x02291e27},
-+      {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
-+      {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-+      {0x0000a204, 0x000037c0, 0x000037c4, 0x000037c4, 0x000037c0},
-+      {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
-+      {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
-+      {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
-+      {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
-+      {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
-+      {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
-+      {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
-+      {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
-+      {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
-+      {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
-+      {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
-+      {0x0000a284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
-+      {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
-+      {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
-+      {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-+      {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
-+      {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
-+      {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000ae04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
-+      {0x0000b284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
-+      {0x0000b830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000be04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000be1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-+      {0x0000be20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
-+      {0x0000c284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
-+};
-+
-+static const u32 ar9300_2p2_baseband_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00009800, 0xafe68e30},
-+      {0x00009804, 0xfd14e000},
-+      {0x00009808, 0x9c0a9f6b},
-+      {0x0000980c, 0x04900000},
-+      {0x00009814, 0x9280c00a},
-+      {0x00009818, 0x00000000},
-+      {0x0000981c, 0x00020028},
-+      {0x00009834, 0x5f3ca3de},
-+      {0x00009838, 0x0108ecff},
-+      {0x0000983c, 0x14750600},
-+      {0x00009880, 0x201fff00},
-+      {0x00009884, 0x00001042},
-+      {0x000098a4, 0x00200400},
-+      {0x000098b0, 0x52440bbe},
-+      {0x000098d0, 0x004b6a8e},
-+      {0x000098d4, 0x00000820},
-+      {0x000098dc, 0x00000000},
-+      {0x000098f0, 0x00000000},
-+      {0x000098f4, 0x00000000},
-+      {0x00009c04, 0xff55ff55},
-+      {0x00009c08, 0x0320ff55},
-+      {0x00009c0c, 0x00000000},
-+      {0x00009c10, 0x00000000},
-+      {0x00009c14, 0x00046384},
-+      {0x00009c18, 0x05b6b440},
-+      {0x00009c1c, 0x00b6b440},
-+      {0x00009d00, 0xc080a333},
-+      {0x00009d04, 0x40206c10},
-+      {0x00009d08, 0x009c4060},
-+      {0x00009d0c, 0x9883800a},
-+      {0x00009d10, 0x01834061},
-+      {0x00009d14, 0x00c0040b},
-+      {0x00009d18, 0x00000000},
-+      {0x00009e08, 0x0038230c},
-+      {0x00009e24, 0x990bb515},
-+      {0x00009e28, 0x0c6f0000},
-+      {0x00009e30, 0x06336f77},
-+      {0x00009e34, 0x6af6532f},
-+      {0x00009e38, 0x0cc80c00},
-+      {0x00009e3c, 0xcf946222},
-+      {0x00009e40, 0x0d261820},
-+      {0x00009e4c, 0x00001004},
-+      {0x00009e50, 0x00ff03f1},
-+      {0x00009e54, 0x00000000},
-+      {0x00009fc0, 0x803e4788},
-+      {0x00009fc4, 0x0001efb5},
-+      {0x00009fcc, 0x40000014},
-+      {0x00009fd0, 0x01193b93},
-+      {0x0000a20c, 0x00000000},
-+      {0x0000a220, 0x00000000},
-+      {0x0000a224, 0x00000000},
-+      {0x0000a228, 0x10002310},
-+      {0x0000a22c, 0x01036a1e},
-+      {0x0000a23c, 0x00000000},
-+      {0x0000a244, 0x0c000000},
-+      {0x0000a2a0, 0x00000001},
-+      {0x0000a2c0, 0x00000001},
-+      {0x0000a2c8, 0x00000000},
-+      {0x0000a2cc, 0x18c43433},
-+      {0x0000a2d4, 0x00000000},
-+      {0x0000a2dc, 0x00000000},
-+      {0x0000a2e0, 0x00000000},
-+      {0x0000a2e4, 0x00000000},
-+      {0x0000a2e8, 0x00000000},
-+      {0x0000a2ec, 0x00000000},
-+      {0x0000a2f0, 0x00000000},
-+      {0x0000a2f4, 0x00000000},
-+      {0x0000a2f8, 0x00000000},
-+      {0x0000a344, 0x00000000},
-+      {0x0000a34c, 0x00000000},
-+      {0x0000a350, 0x0000a000},
-+      {0x0000a364, 0x00000000},
-+      {0x0000a370, 0x00000000},
-+      {0x0000a390, 0x00000001},
-+      {0x0000a394, 0x00000444},
-+      {0x0000a398, 0x001f0e0f},
-+      {0x0000a39c, 0x0075393f},
-+      {0x0000a3a0, 0xb79f6427},
-+      {0x0000a3a4, 0x00000000},
-+      {0x0000a3a8, 0xaaaaaaaa},
-+      {0x0000a3ac, 0x3c466478},
-+      {0x0000a3c0, 0x20202020},
-+      {0x0000a3c4, 0x22222220},
-+      {0x0000a3c8, 0x20200020},
-+      {0x0000a3cc, 0x20202020},
-+      {0x0000a3d0, 0x20202020},
-+      {0x0000a3d4, 0x20202020},
-+      {0x0000a3d8, 0x20202020},
-+      {0x0000a3dc, 0x20202020},
-+      {0x0000a3e0, 0x20202020},
-+      {0x0000a3e4, 0x20202020},
-+      {0x0000a3e8, 0x20202020},
-+      {0x0000a3ec, 0x20202020},
-+      {0x0000a3f0, 0x00000000},
-+      {0x0000a3f4, 0x00000246},
-+      {0x0000a3f8, 0x0cdbd380},
-+      {0x0000a3fc, 0x000f0f01},
-+      {0x0000a400, 0x8fa91f01},
-+      {0x0000a404, 0x00000000},
-+      {0x0000a408, 0x0e79e5c6},
-+      {0x0000a40c, 0x00820820},
-+      {0x0000a414, 0x1ce739ce},
-+      {0x0000a418, 0x2d001dce},
-+      {0x0000a41c, 0x1ce739ce},
-+      {0x0000a420, 0x000001ce},
-+      {0x0000a424, 0x1ce739ce},
-+      {0x0000a428, 0x000001ce},
-+      {0x0000a42c, 0x1ce739ce},
-+      {0x0000a430, 0x1ce739ce},
-+      {0x0000a434, 0x00000000},
-+      {0x0000a438, 0x00001801},
-+      {0x0000a43c, 0x00000000},
-+      {0x0000a440, 0x00000000},
-+      {0x0000a444, 0x00000000},
-+      {0x0000a448, 0x06000080},
-+      {0x0000a44c, 0x00000001},
-+      {0x0000a450, 0x00010000},
-+      {0x0000a458, 0x00000000},
-+      {0x0000a600, 0x00000000},
-+      {0x0000a604, 0x00000000},
-+      {0x0000a608, 0x00000000},
-+      {0x0000a60c, 0x00000000},
-+      {0x0000a610, 0x00000000},
-+      {0x0000a614, 0x00000000},
-+      {0x0000a618, 0x00000000},
-+      {0x0000a61c, 0x00000000},
-+      {0x0000a620, 0x00000000},
-+      {0x0000a624, 0x00000000},
-+      {0x0000a628, 0x00000000},
-+      {0x0000a62c, 0x00000000},
-+      {0x0000a630, 0x00000000},
-+      {0x0000a634, 0x00000000},
-+      {0x0000a638, 0x00000000},
-+      {0x0000a63c, 0x00000000},
-+      {0x0000a640, 0x00000000},
-+      {0x0000a644, 0x3fad9d74},
-+      {0x0000a648, 0x0048060a},
-+      {0x0000a64c, 0x00000637},
-+      {0x0000a670, 0x03020100},
-+      {0x0000a674, 0x09080504},
-+      {0x0000a678, 0x0d0c0b0a},
-+      {0x0000a67c, 0x13121110},
-+      {0x0000a680, 0x31301514},
-+      {0x0000a684, 0x35343332},
-+      {0x0000a688, 0x00000036},
-+      {0x0000a690, 0x00000838},
-+      {0x0000a7c0, 0x00000000},
-+      {0x0000a7c4, 0xfffffffc},
-+      {0x0000a7c8, 0x00000000},
-+      {0x0000a7cc, 0x00000000},
-+      {0x0000a7d0, 0x00000000},
-+      {0x0000a7d4, 0x00000004},
-+      {0x0000a7dc, 0x00000001},
-+      {0x0000a8d0, 0x004b6a8e},
-+      {0x0000a8d4, 0x00000820},
-+      {0x0000a8dc, 0x00000000},
-+      {0x0000a8f0, 0x00000000},
-+      {0x0000a8f4, 0x00000000},
-+      {0x0000b2d0, 0x00000080},
-+      {0x0000b2d4, 0x00000000},
-+      {0x0000b2dc, 0x00000000},
-+      {0x0000b2e0, 0x00000000},
-+      {0x0000b2e4, 0x00000000},
-+      {0x0000b2e8, 0x00000000},
-+      {0x0000b2ec, 0x00000000},
-+      {0x0000b2f0, 0x00000000},
-+      {0x0000b2f4, 0x00000000},
-+      {0x0000b2f8, 0x00000000},
-+      {0x0000b408, 0x0e79e5c0},
-+      {0x0000b40c, 0x00820820},
-+      {0x0000b420, 0x00000000},
-+      {0x0000b8d0, 0x004b6a8e},
-+      {0x0000b8d4, 0x00000820},
-+      {0x0000b8dc, 0x00000000},
-+      {0x0000b8f0, 0x00000000},
-+      {0x0000b8f4, 0x00000000},
-+      {0x0000c2d0, 0x00000080},
-+      {0x0000c2d4, 0x00000000},
-+      {0x0000c2dc, 0x00000000},
-+      {0x0000c2e0, 0x00000000},
-+      {0x0000c2e4, 0x00000000},
-+      {0x0000c2e8, 0x00000000},
-+      {0x0000c2ec, 0x00000000},
-+      {0x0000c2f0, 0x00000000},
-+      {0x0000c2f4, 0x00000000},
-+      {0x0000c2f8, 0x00000000},
-+      {0x0000c408, 0x0e79e5c0},
-+      {0x0000c40c, 0x00820820},
-+      {0x0000c420, 0x00000000},
-+};
-+
-+static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-+      {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-+      {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-+      {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-+      {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-+      {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-+      {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-+      {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-+      {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-+      {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-+      {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-+      {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-+      {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
-+      {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-+      {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-+      {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-+      {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-+      {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-+      {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-+      {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-+      {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-+      {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-+      {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-+      {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-+      {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-+      {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-+      {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-+      {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-+      {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-+      {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-+      {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-+      {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-+      {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-+      {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-+      {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-+      {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-+      {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-+      {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-+      {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
-+      {0x00016048, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
-+      {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
-+      {0x00016444, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
-+      {0x00016448, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
-+      {0x00016468, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
-+      {0x00016844, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
-+      {0x00016848, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
-+      {0x00016868, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
-+};
-+
-+static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p2[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
-+      {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
-+      {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
-+      {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
-+      {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
-+      {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
-+      {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
-+      {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
-+      {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
-+      {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
-+      {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
-+      {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
-+      {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
-+      {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-+      {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
-+      {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
-+      {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
-+      {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
-+      {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
-+      {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
-+      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
-+      {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
-+      {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
-+      {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
-+      {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
-+      {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
-+      {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
-+      {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
-+      {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
-+      {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
-+      {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
-+      {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
-+      {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
-+      {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
-+      {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
-+      {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
-+      {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
-+      {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
-+      {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
-+      {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
-+      {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-+      {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-+      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016444, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-+      {0x00016448, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-+      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016844, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-+      {0x00016848, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-+      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
-+static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
-+      /* Addr      allmodes  */
-+      {0x0000a000, 0x00010000},
-+      {0x0000a004, 0x00030002},
-+      {0x0000a008, 0x00050004},
-+      {0x0000a00c, 0x00810080},
-+      {0x0000a010, 0x00830082},
-+      {0x0000a014, 0x01810180},
-+      {0x0000a018, 0x01830182},
-+      {0x0000a01c, 0x01850184},
-+      {0x0000a020, 0x01890188},
-+      {0x0000a024, 0x018b018a},
-+      {0x0000a028, 0x018d018c},
-+      {0x0000a02c, 0x01910190},
-+      {0x0000a030, 0x01930192},
-+      {0x0000a034, 0x01950194},
-+      {0x0000a038, 0x038a0196},
-+      {0x0000a03c, 0x038c038b},
-+      {0x0000a040, 0x0390038d},
-+      {0x0000a044, 0x03920391},
-+      {0x0000a048, 0x03940393},
-+      {0x0000a04c, 0x03960395},
-+      {0x0000a050, 0x00000000},
-+      {0x0000a054, 0x00000000},
-+      {0x0000a058, 0x00000000},
-+      {0x0000a05c, 0x00000000},
-+      {0x0000a060, 0x00000000},
-+      {0x0000a064, 0x00000000},
-+      {0x0000a068, 0x00000000},
-+      {0x0000a06c, 0x00000000},
-+      {0x0000a070, 0x00000000},
-+      {0x0000a074, 0x00000000},
-+      {0x0000a078, 0x00000000},
-+      {0x0000a07c, 0x00000000},
-+      {0x0000a080, 0x22222229},
-+      {0x0000a084, 0x1d1d1d1d},
-+      {0x0000a088, 0x1d1d1d1d},
-+      {0x0000a08c, 0x1d1d1d1d},
-+      {0x0000a090, 0x171d1d1d},
-+      {0x0000a094, 0x11111717},
-+      {0x0000a098, 0x00030311},
-+      {0x0000a09c, 0x00000000},
-+      {0x0000a0a0, 0x00000000},
-+      {0x0000a0a4, 0x00000000},
-+      {0x0000a0a8, 0x00000000},
-+      {0x0000a0ac, 0x00000000},
-+      {0x0000a0b0, 0x00000000},
-+      {0x0000a0b4, 0x00000000},
-+      {0x0000a0b8, 0x00000000},
-+      {0x0000a0bc, 0x00000000},
-+      {0x0000a0c0, 0x001f0000},
-+      {0x0000a0c4, 0x01000101},
-+      {0x0000a0c8, 0x011e011f},
-+      {0x0000a0cc, 0x011c011d},
-+      {0x0000a0d0, 0x02030204},
-+      {0x0000a0d4, 0x02010202},
-+      {0x0000a0d8, 0x021f0200},
-+      {0x0000a0dc, 0x0302021e},
-+      {0x0000a0e0, 0x03000301},
-+      {0x0000a0e4, 0x031e031f},
-+      {0x0000a0e8, 0x0402031d},
-+      {0x0000a0ec, 0x04000401},
-+      {0x0000a0f0, 0x041e041f},
-+      {0x0000a0f4, 0x0502041d},
-+      {0x0000a0f8, 0x05000501},
-+      {0x0000a0fc, 0x051e051f},
-+      {0x0000a100, 0x06010602},
-+      {0x0000a104, 0x061f0600},
-+      {0x0000a108, 0x061d061e},
-+      {0x0000a10c, 0x07020703},
-+      {0x0000a110, 0x07000701},
-+      {0x0000a114, 0x00000000},
-+      {0x0000a118, 0x00000000},
-+      {0x0000a11c, 0x00000000},
-+      {0x0000a120, 0x00000000},
-+      {0x0000a124, 0x00000000},
-+      {0x0000a128, 0x00000000},
-+      {0x0000a12c, 0x00000000},
-+      {0x0000a130, 0x00000000},
-+      {0x0000a134, 0x00000000},
-+      {0x0000a138, 0x00000000},
-+      {0x0000a13c, 0x00000000},
-+      {0x0000a140, 0x001f0000},
-+      {0x0000a144, 0x01000101},
-+      {0x0000a148, 0x011e011f},
-+      {0x0000a14c, 0x011c011d},
-+      {0x0000a150, 0x02030204},
-+      {0x0000a154, 0x02010202},
-+      {0x0000a158, 0x021f0200},
-+      {0x0000a15c, 0x0302021e},
-+      {0x0000a160, 0x03000301},
-+      {0x0000a164, 0x031e031f},
-+      {0x0000a168, 0x0402031d},
-+      {0x0000a16c, 0x04000401},
-+      {0x0000a170, 0x041e041f},
-+      {0x0000a174, 0x0502041d},
-+      {0x0000a178, 0x05000501},
-+      {0x0000a17c, 0x051e051f},
-+      {0x0000a180, 0x06010602},
-+      {0x0000a184, 0x061f0600},
-+      {0x0000a188, 0x061d061e},
-+      {0x0000a18c, 0x07020703},
-+      {0x0000a190, 0x07000701},
-+      {0x0000a194, 0x00000000},
-+      {0x0000a198, 0x00000000},
-+      {0x0000a19c, 0x00000000},
-+      {0x0000a1a0, 0x00000000},
-+      {0x0000a1a4, 0x00000000},
-+      {0x0000a1a8, 0x00000000},
-+      {0x0000a1ac, 0x00000000},
-+      {0x0000a1b0, 0x00000000},
-+      {0x0000a1b4, 0x00000000},
-+      {0x0000a1b8, 0x00000000},
-+      {0x0000a1bc, 0x00000000},
-+      {0x0000a1c0, 0x00000000},
-+      {0x0000a1c4, 0x00000000},
-+      {0x0000a1c8, 0x00000000},
-+      {0x0000a1cc, 0x00000000},
-+      {0x0000a1d0, 0x00000000},
-+      {0x0000a1d4, 0x00000000},
-+      {0x0000a1d8, 0x00000000},
-+      {0x0000a1dc, 0x00000000},
-+      {0x0000a1e0, 0x00000000},
-+      {0x0000a1e4, 0x00000000},
-+      {0x0000a1e8, 0x00000000},
-+      {0x0000a1ec, 0x00000000},
-+      {0x0000a1f0, 0x00000396},
-+      {0x0000a1f4, 0x00000396},
-+      {0x0000a1f8, 0x00000396},
-+      {0x0000a1fc, 0x00000196},
-+      {0x0000b000, 0x00010000},
-+      {0x0000b004, 0x00030002},
-+      {0x0000b008, 0x00050004},
-+      {0x0000b00c, 0x00810080},
-+      {0x0000b010, 0x00830082},
-+      {0x0000b014, 0x01810180},
-+      {0x0000b018, 0x01830182},
-+      {0x0000b01c, 0x01850184},
-+      {0x0000b020, 0x02810280},
-+      {0x0000b024, 0x02830282},
-+      {0x0000b028, 0x02850284},
-+      {0x0000b02c, 0x02890288},
-+      {0x0000b030, 0x028b028a},
-+      {0x0000b034, 0x0388028c},
-+      {0x0000b038, 0x038a0389},
-+      {0x0000b03c, 0x038c038b},
-+      {0x0000b040, 0x0390038d},
-+      {0x0000b044, 0x03920391},
-+      {0x0000b048, 0x03940393},
-+      {0x0000b04c, 0x03960395},
-+      {0x0000b050, 0x00000000},
-+      {0x0000b054, 0x00000000},
-+      {0x0000b058, 0x00000000},
-+      {0x0000b05c, 0x00000000},
-+      {0x0000b060, 0x00000000},
-+      {0x0000b064, 0x00000000},
-+      {0x0000b068, 0x00000000},
-+      {0x0000b06c, 0x00000000},
-+      {0x0000b070, 0x00000000},
-+      {0x0000b074, 0x00000000},
-+      {0x0000b078, 0x00000000},
-+      {0x0000b07c, 0x00000000},
-+      {0x0000b080, 0x32323232},
-+      {0x0000b084, 0x2f2f3232},
-+      {0x0000b088, 0x23282a2d},
-+      {0x0000b08c, 0x1c1e2123},
-+      {0x0000b090, 0x14171919},
-+      {0x0000b094, 0x0e0e1214},
-+      {0x0000b098, 0x03050707},
-+      {0x0000b09c, 0x00030303},
-+      {0x0000b0a0, 0x00000000},
-+      {0x0000b0a4, 0x00000000},
-+      {0x0000b0a8, 0x00000000},
-+      {0x0000b0ac, 0x00000000},
-+      {0x0000b0b0, 0x00000000},
-+      {0x0000b0b4, 0x00000000},
-+      {0x0000b0b8, 0x00000000},
-+      {0x0000b0bc, 0x00000000},
-+      {0x0000b0c0, 0x003f0020},
-+      {0x0000b0c4, 0x00400041},
-+      {0x0000b0c8, 0x0140005f},
-+      {0x0000b0cc, 0x0160015f},
-+      {0x0000b0d0, 0x017e017f},
-+      {0x0000b0d4, 0x02410242},
-+      {0x0000b0d8, 0x025f0240},
-+      {0x0000b0dc, 0x027f0260},
-+      {0x0000b0e0, 0x0341027e},
-+      {0x0000b0e4, 0x035f0340},
-+      {0x0000b0e8, 0x037f0360},
-+      {0x0000b0ec, 0x04400441},
-+      {0x0000b0f0, 0x0460045f},
-+      {0x0000b0f4, 0x0541047f},
-+      {0x0000b0f8, 0x055f0540},
-+      {0x0000b0fc, 0x057f0560},
-+      {0x0000b100, 0x06400641},
-+      {0x0000b104, 0x0660065f},
-+      {0x0000b108, 0x067e067f},
-+      {0x0000b10c, 0x07410742},
-+      {0x0000b110, 0x075f0740},
-+      {0x0000b114, 0x077f0760},
-+      {0x0000b118, 0x07800781},
-+      {0x0000b11c, 0x07a0079f},
-+      {0x0000b120, 0x07c107bf},
-+      {0x0000b124, 0x000007c0},
-+      {0x0000b128, 0x00000000},
-+      {0x0000b12c, 0x00000000},
-+      {0x0000b130, 0x00000000},
-+      {0x0000b134, 0x00000000},
-+      {0x0000b138, 0x00000000},
-+      {0x0000b13c, 0x00000000},
-+      {0x0000b140, 0x003f0020},
-+      {0x0000b144, 0x00400041},
-+      {0x0000b148, 0x0140005f},
-+      {0x0000b14c, 0x0160015f},
-+      {0x0000b150, 0x017e017f},
-+      {0x0000b154, 0x02410242},
-+      {0x0000b158, 0x025f0240},
-+      {0x0000b15c, 0x027f0260},
-+      {0x0000b160, 0x0341027e},
-+      {0x0000b164, 0x035f0340},
-+      {0x0000b168, 0x037f0360},
-+      {0x0000b16c, 0x04400441},
-+      {0x0000b170, 0x0460045f},
-+      {0x0000b174, 0x0541047f},
-+      {0x0000b178, 0x055f0540},
-+      {0x0000b17c, 0x057f0560},
-+      {0x0000b180, 0x06400641},
-+      {0x0000b184, 0x0660065f},
-+      {0x0000b188, 0x067e067f},
-+      {0x0000b18c, 0x07410742},
-+      {0x0000b190, 0x075f0740},
-+      {0x0000b194, 0x077f0760},
-+      {0x0000b198, 0x07800781},
-+      {0x0000b19c, 0x07a0079f},
-+      {0x0000b1a0, 0x07c107bf},
-+      {0x0000b1a4, 0x000007c0},
-+      {0x0000b1a8, 0x00000000},
-+      {0x0000b1ac, 0x00000000},
-+      {0x0000b1b0, 0x00000000},
-+      {0x0000b1b4, 0x00000000},
-+      {0x0000b1b8, 0x00000000},
-+      {0x0000b1bc, 0x00000000},
-+      {0x0000b1c0, 0x00000000},
-+      {0x0000b1c4, 0x00000000},
-+      {0x0000b1c8, 0x00000000},
-+      {0x0000b1cc, 0x00000000},
-+      {0x0000b1d0, 0x00000000},
-+      {0x0000b1d4, 0x00000000},
-+      {0x0000b1d8, 0x00000000},
-+      {0x0000b1dc, 0x00000000},
-+      {0x0000b1e0, 0x00000000},
-+      {0x0000b1e4, 0x00000000},
-+      {0x0000b1e8, 0x00000000},
-+      {0x0000b1ec, 0x00000000},
-+      {0x0000b1f0, 0x00000396},
-+      {0x0000b1f4, 0x00000396},
-+      {0x0000b1f8, 0x00000396},
-+      {0x0000b1fc, 0x00000196},
-+};
-+
-+static const u32 ar9300Modes_low_ob_db_tx_gain_table_2p2[][5] = {
-+      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-+      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-+      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-+      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-+      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-+      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-+      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-+      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-+      {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
-+      {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-+      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
-+      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
-+      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
-+      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
-+      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
-+      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
-+      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
-+      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
-+      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
-+      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
-+      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-+      {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
-+      {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
-+      {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
-+      {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
-+      {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
-+      {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
-+      {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-+      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-+      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-+      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-+      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-+      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-+      {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
-+      {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
-+      {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
-+      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
-+      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
-+      {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
-+      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
-+      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
-+      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
-+      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
-+      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
-+      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
-+      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
-+      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
-+      {0x0000a5cc, 0x5c82486b, 0x5c82486b, 0x47801a83, 0x47801a83},
-+      {0x0000a5d0, 0x61824a6c, 0x61824a6c, 0x4a801c84, 0x4a801c84},
-+      {0x0000a5d4, 0x66826a6c, 0x66826a6c, 0x4e801ce3, 0x4e801ce3},
-+      {0x0000a5d8, 0x6b826e6c, 0x6b826e6c, 0x52801ce5, 0x52801ce5},
-+      {0x0000a5dc, 0x7082708c, 0x7082708c, 0x56801ce9, 0x56801ce9},
-+      {0x0000a5e0, 0x7382b08a, 0x7382b08a, 0x5a801ceb, 0x5a801ceb},
-+      {0x0000a5e4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5e8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5ec, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f0, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5f8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x0000a5fc, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-+      {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-+      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-+      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+      {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-+      {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-+      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-+};
-+
-+static const u32 ar9300_2p2_mac_core[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00000008, 0x00000000},
-+      {0x00000030, 0x00020085},
-+      {0x00000034, 0x00000005},
-+      {0x00000040, 0x00000000},
-+      {0x00000044, 0x00000000},
-+      {0x00000048, 0x00000008},
-+      {0x0000004c, 0x00000010},
-+      {0x00000050, 0x00000000},
-+      {0x00001040, 0x002ffc0f},
-+      {0x00001044, 0x002ffc0f},
-+      {0x00001048, 0x002ffc0f},
-+      {0x0000104c, 0x002ffc0f},
-+      {0x00001050, 0x002ffc0f},
-+      {0x00001054, 0x002ffc0f},
-+      {0x00001058, 0x002ffc0f},
-+      {0x0000105c, 0x002ffc0f},
-+      {0x00001060, 0x002ffc0f},
-+      {0x00001064, 0x002ffc0f},
-+      {0x000010f0, 0x00000100},
-+      {0x00001270, 0x00000000},
-+      {0x000012b0, 0x00000000},
-+      {0x000012f0, 0x00000000},
-+      {0x0000143c, 0x00000000},
-+      {0x0000147c, 0x00000000},
-+      {0x00008000, 0x00000000},
-+      {0x00008004, 0x00000000},
-+      {0x00008008, 0x00000000},
-+      {0x0000800c, 0x00000000},
-+      {0x00008018, 0x00000000},
-+      {0x00008020, 0x00000000},
-+      {0x00008038, 0x00000000},
-+      {0x0000803c, 0x00000000},
-+      {0x00008040, 0x00000000},
-+      {0x00008044, 0x00000000},
-+      {0x00008048, 0x00000000},
-+      {0x0000804c, 0xffffffff},
-+      {0x00008054, 0x00000000},
-+      {0x00008058, 0x00000000},
-+      {0x0000805c, 0x000fc78f},
-+      {0x00008060, 0x0000000f},
-+      {0x00008064, 0x00000000},
-+      {0x00008070, 0x00000310},
-+      {0x00008074, 0x00000020},
-+      {0x00008078, 0x00000000},
-+      {0x0000809c, 0x0000000f},
-+      {0x000080a0, 0x00000000},
-+      {0x000080a4, 0x02ff0000},
-+      {0x000080a8, 0x0e070605},
-+      {0x000080ac, 0x0000000d},
-+      {0x000080b0, 0x00000000},
-+      {0x000080b4, 0x00000000},
-+      {0x000080b8, 0x00000000},
-+      {0x000080bc, 0x00000000},
-+      {0x000080c0, 0x2a800000},
-+      {0x000080c4, 0x06900168},
-+      {0x000080c8, 0x13881c20},
-+      {0x000080cc, 0x01f40000},
-+      {0x000080d0, 0x00252500},
-+      {0x000080d4, 0x00a00000},
-+      {0x000080d8, 0x00400000},
-+      {0x000080dc, 0x00000000},
-+      {0x000080e0, 0xffffffff},
-+      {0x000080e4, 0x0000ffff},
-+      {0x000080e8, 0x3f3f3f3f},
-+      {0x000080ec, 0x00000000},
-+      {0x000080f0, 0x00000000},
-+      {0x000080f4, 0x00000000},
-+      {0x000080fc, 0x00020000},
-+      {0x00008100, 0x00000000},
-+      {0x00008108, 0x00000052},
-+      {0x0000810c, 0x00000000},
-+      {0x00008110, 0x00000000},
-+      {0x00008114, 0x000007ff},
-+      {0x00008118, 0x000000aa},
-+      {0x0000811c, 0x00003210},
-+      {0x00008124, 0x00000000},
-+      {0x00008128, 0x00000000},
-+      {0x0000812c, 0x00000000},
-+      {0x00008130, 0x00000000},
-+      {0x00008134, 0x00000000},
-+      {0x00008138, 0x00000000},
-+      {0x0000813c, 0x0000ffff},
-+      {0x00008144, 0xffffffff},
-+      {0x00008168, 0x00000000},
-+      {0x0000816c, 0x00000000},
-+      {0x00008170, 0x18486200},
-+      {0x00008174, 0x33332210},
-+      {0x00008178, 0x00000000},
-+      {0x0000817c, 0x00020000},
-+      {0x000081c0, 0x00000000},
-+      {0x000081c4, 0x33332210},
-+      {0x000081c8, 0x00000000},
-+      {0x000081cc, 0x00000000},
-+      {0x000081d4, 0x00000000},
-+      {0x000081ec, 0x00000000},
-+      {0x000081f0, 0x00000000},
-+      {0x000081f4, 0x00000000},
-+      {0x000081f8, 0x00000000},
-+      {0x000081fc, 0x00000000},
-+      {0x00008240, 0x00100000},
-+      {0x00008244, 0x0010f424},
-+      {0x00008248, 0x00000800},
-+      {0x0000824c, 0x0001e848},
-+      {0x00008250, 0x00000000},
-+      {0x00008254, 0x00000000},
-+      {0x00008258, 0x00000000},
-+      {0x0000825c, 0x40000000},
-+      {0x00008260, 0x00080922},
-+      {0x00008264, 0x9bc00010},
-+      {0x00008268, 0xffffffff},
-+      {0x0000826c, 0x0000ffff},
-+      {0x00008270, 0x00000000},
-+      {0x00008274, 0x40000000},
-+      {0x00008278, 0x003e4180},
-+      {0x0000827c, 0x00000004},
-+      {0x00008284, 0x0000002c},
-+      {0x00008288, 0x0000002c},
-+      {0x0000828c, 0x000000ff},
-+      {0x00008294, 0x00000000},
-+      {0x00008298, 0x00000000},
-+      {0x0000829c, 0x00000000},
-+      {0x00008300, 0x00000140},
-+      {0x00008314, 0x00000000},
-+      {0x0000831c, 0x0000010d},
-+      {0x00008328, 0x00000000},
-+      {0x0000832c, 0x00000007},
-+      {0x00008330, 0x00000302},
-+      {0x00008334, 0x00000700},
-+      {0x00008338, 0x00ff0000},
-+      {0x0000833c, 0x02400000},
-+      {0x00008340, 0x000107ff},
-+      {0x00008344, 0xaa48105b},
-+      {0x00008348, 0x008f0000},
-+      {0x0000835c, 0x00000000},
-+      {0x00008360, 0xffffffff},
-+      {0x00008364, 0xffffffff},
-+      {0x00008368, 0x00000000},
-+      {0x00008370, 0x00000000},
-+      {0x00008374, 0x000000ff},
-+      {0x00008378, 0x00000000},
-+      {0x0000837c, 0x00000000},
-+      {0x00008380, 0xffffffff},
-+      {0x00008384, 0xffffffff},
-+      {0x00008390, 0xffffffff},
-+      {0x00008394, 0xffffffff},
-+      {0x00008398, 0x00000000},
-+      {0x0000839c, 0x00000000},
-+      {0x000083a0, 0x00000000},
-+      {0x000083a4, 0x0000fa14},
-+      {0x000083a8, 0x000f0c00},
-+      {0x000083ac, 0x33332210},
-+      {0x000083b0, 0x33332210},
-+      {0x000083b4, 0x33332210},
-+      {0x000083b8, 0x33332210},
-+      {0x000083bc, 0x00000000},
-+      {0x000083c0, 0x00000000},
-+      {0x000083c4, 0x00000000},
-+      {0x000083c8, 0x00000000},
-+      {0x000083cc, 0x00000200},
-+      {0x000083d0, 0x000301ff},
-+};
-+
-+static const u32 ar9300Common_wo_xlna_rx_gain_table_2p2[][2] = {
-+      /* Addr      allmodes  */
-+      {0x0000a000, 0x00010000},
-+      {0x0000a004, 0x00030002},
-+      {0x0000a008, 0x00050004},
-+      {0x0000a00c, 0x00810080},
-+      {0x0000a010, 0x00830082},
-+      {0x0000a014, 0x01810180},
-+      {0x0000a018, 0x01830182},
-+      {0x0000a01c, 0x01850184},
-+      {0x0000a020, 0x01890188},
-+      {0x0000a024, 0x018b018a},
-+      {0x0000a028, 0x018d018c},
-+      {0x0000a02c, 0x03820190},
-+      {0x0000a030, 0x03840383},
-+      {0x0000a034, 0x03880385},
-+      {0x0000a038, 0x038a0389},
-+      {0x0000a03c, 0x038c038b},
-+      {0x0000a040, 0x0390038d},
-+      {0x0000a044, 0x03920391},
-+      {0x0000a048, 0x03940393},
-+      {0x0000a04c, 0x03960395},
-+      {0x0000a050, 0x00000000},
-+      {0x0000a054, 0x00000000},
-+      {0x0000a058, 0x00000000},
-+      {0x0000a05c, 0x00000000},
-+      {0x0000a060, 0x00000000},
-+      {0x0000a064, 0x00000000},
-+      {0x0000a068, 0x00000000},
-+      {0x0000a06c, 0x00000000},
-+      {0x0000a070, 0x00000000},
-+      {0x0000a074, 0x00000000},
-+      {0x0000a078, 0x00000000},
-+      {0x0000a07c, 0x00000000},
-+      {0x0000a080, 0x29292929},
-+      {0x0000a084, 0x29292929},
-+      {0x0000a088, 0x29292929},
-+      {0x0000a08c, 0x29292929},
-+      {0x0000a090, 0x22292929},
-+      {0x0000a094, 0x1d1d2222},
-+      {0x0000a098, 0x0c111117},
-+      {0x0000a09c, 0x00030303},
-+      {0x0000a0a0, 0x00000000},
-+      {0x0000a0a4, 0x00000000},
-+      {0x0000a0a8, 0x00000000},
-+      {0x0000a0ac, 0x00000000},
-+      {0x0000a0b0, 0x00000000},
-+      {0x0000a0b4, 0x00000000},
-+      {0x0000a0b8, 0x00000000},
-+      {0x0000a0bc, 0x00000000},
-+      {0x0000a0c0, 0x001f0000},
-+      {0x0000a0c4, 0x01000101},
-+      {0x0000a0c8, 0x011e011f},
-+      {0x0000a0cc, 0x011c011d},
-+      {0x0000a0d0, 0x02030204},
-+      {0x0000a0d4, 0x02010202},
-+      {0x0000a0d8, 0x021f0200},
-+      {0x0000a0dc, 0x0302021e},
-+      {0x0000a0e0, 0x03000301},
-+      {0x0000a0e4, 0x031e031f},
-+      {0x0000a0e8, 0x0402031d},
-+      {0x0000a0ec, 0x04000401},
-+      {0x0000a0f0, 0x041e041f},
-+      {0x0000a0f4, 0x0502041d},
-+      {0x0000a0f8, 0x05000501},
-+      {0x0000a0fc, 0x051e051f},
-+      {0x0000a100, 0x06010602},
-+      {0x0000a104, 0x061f0600},
-+      {0x0000a108, 0x061d061e},
-+      {0x0000a10c, 0x07020703},
-+      {0x0000a110, 0x07000701},
-+      {0x0000a114, 0x00000000},
-+      {0x0000a118, 0x00000000},
-+      {0x0000a11c, 0x00000000},
-+      {0x0000a120, 0x00000000},
-+      {0x0000a124, 0x00000000},
-+      {0x0000a128, 0x00000000},
-+      {0x0000a12c, 0x00000000},
-+      {0x0000a130, 0x00000000},
-+      {0x0000a134, 0x00000000},
-+      {0x0000a138, 0x00000000},
-+      {0x0000a13c, 0x00000000},
-+      {0x0000a140, 0x001f0000},
-+      {0x0000a144, 0x01000101},
-+      {0x0000a148, 0x011e011f},
-+      {0x0000a14c, 0x011c011d},
-+      {0x0000a150, 0x02030204},
-+      {0x0000a154, 0x02010202},
-+      {0x0000a158, 0x021f0200},
-+      {0x0000a15c, 0x0302021e},
-+      {0x0000a160, 0x03000301},
-+      {0x0000a164, 0x031e031f},
-+      {0x0000a168, 0x0402031d},
-+      {0x0000a16c, 0x04000401},
-+      {0x0000a170, 0x041e041f},
-+      {0x0000a174, 0x0502041d},
-+      {0x0000a178, 0x05000501},
-+      {0x0000a17c, 0x051e051f},
-+      {0x0000a180, 0x06010602},
-+      {0x0000a184, 0x061f0600},
-+      {0x0000a188, 0x061d061e},
-+      {0x0000a18c, 0x07020703},
-+      {0x0000a190, 0x07000701},
-+      {0x0000a194, 0x00000000},
-+      {0x0000a198, 0x00000000},
-+      {0x0000a19c, 0x00000000},
-+      {0x0000a1a0, 0x00000000},
-+      {0x0000a1a4, 0x00000000},
-+      {0x0000a1a8, 0x00000000},
-+      {0x0000a1ac, 0x00000000},
-+      {0x0000a1b0, 0x00000000},
-+      {0x0000a1b4, 0x00000000},
-+      {0x0000a1b8, 0x00000000},
-+      {0x0000a1bc, 0x00000000},
-+      {0x0000a1c0, 0x00000000},
-+      {0x0000a1c4, 0x00000000},
-+      {0x0000a1c8, 0x00000000},
-+      {0x0000a1cc, 0x00000000},
-+      {0x0000a1d0, 0x00000000},
-+      {0x0000a1d4, 0x00000000},
-+      {0x0000a1d8, 0x00000000},
-+      {0x0000a1dc, 0x00000000},
-+      {0x0000a1e0, 0x00000000},
-+      {0x0000a1e4, 0x00000000},
-+      {0x0000a1e8, 0x00000000},
-+      {0x0000a1ec, 0x00000000},
-+      {0x0000a1f0, 0x00000396},
-+      {0x0000a1f4, 0x00000396},
-+      {0x0000a1f8, 0x00000396},
-+      {0x0000a1fc, 0x00000196},
-+      {0x0000b000, 0x00010000},
-+      {0x0000b004, 0x00030002},
-+      {0x0000b008, 0x00050004},
-+      {0x0000b00c, 0x00810080},
-+      {0x0000b010, 0x00830082},
-+      {0x0000b014, 0x01810180},
-+      {0x0000b018, 0x01830182},
-+      {0x0000b01c, 0x01850184},
-+      {0x0000b020, 0x02810280},
-+      {0x0000b024, 0x02830282},
-+      {0x0000b028, 0x02850284},
-+      {0x0000b02c, 0x02890288},
-+      {0x0000b030, 0x028b028a},
-+      {0x0000b034, 0x0388028c},
-+      {0x0000b038, 0x038a0389},
-+      {0x0000b03c, 0x038c038b},
-+      {0x0000b040, 0x0390038d},
-+      {0x0000b044, 0x03920391},
-+      {0x0000b048, 0x03940393},
-+      {0x0000b04c, 0x03960395},
-+      {0x0000b050, 0x00000000},
-+      {0x0000b054, 0x00000000},
-+      {0x0000b058, 0x00000000},
-+      {0x0000b05c, 0x00000000},
-+      {0x0000b060, 0x00000000},
-+      {0x0000b064, 0x00000000},
-+      {0x0000b068, 0x00000000},
-+      {0x0000b06c, 0x00000000},
-+      {0x0000b070, 0x00000000},
-+      {0x0000b074, 0x00000000},
-+      {0x0000b078, 0x00000000},
-+      {0x0000b07c, 0x00000000},
-+      {0x0000b080, 0x32323232},
-+      {0x0000b084, 0x2f2f3232},
-+      {0x0000b088, 0x23282a2d},
-+      {0x0000b08c, 0x1c1e2123},
-+      {0x0000b090, 0x14171919},
-+      {0x0000b094, 0x0e0e1214},
-+      {0x0000b098, 0x03050707},
-+      {0x0000b09c, 0x00030303},
-+      {0x0000b0a0, 0x00000000},
-+      {0x0000b0a4, 0x00000000},
-+      {0x0000b0a8, 0x00000000},
-+      {0x0000b0ac, 0x00000000},
-+      {0x0000b0b0, 0x00000000},
-+      {0x0000b0b4, 0x00000000},
-+      {0x0000b0b8, 0x00000000},
-+      {0x0000b0bc, 0x00000000},
-+      {0x0000b0c0, 0x003f0020},
-+      {0x0000b0c4, 0x00400041},
-+      {0x0000b0c8, 0x0140005f},
-+      {0x0000b0cc, 0x0160015f},
-+      {0x0000b0d0, 0x017e017f},
-+      {0x0000b0d4, 0x02410242},
-+      {0x0000b0d8, 0x025f0240},
-+      {0x0000b0dc, 0x027f0260},
-+      {0x0000b0e0, 0x0341027e},
-+      {0x0000b0e4, 0x035f0340},
-+      {0x0000b0e8, 0x037f0360},
-+      {0x0000b0ec, 0x04400441},
-+      {0x0000b0f0, 0x0460045f},
-+      {0x0000b0f4, 0x0541047f},
-+      {0x0000b0f8, 0x055f0540},
-+      {0x0000b0fc, 0x057f0560},
-+      {0x0000b100, 0x06400641},
-+      {0x0000b104, 0x0660065f},
-+      {0x0000b108, 0x067e067f},
-+      {0x0000b10c, 0x07410742},
-+      {0x0000b110, 0x075f0740},
-+      {0x0000b114, 0x077f0760},
-+      {0x0000b118, 0x07800781},
-+      {0x0000b11c, 0x07a0079f},
-+      {0x0000b120, 0x07c107bf},
-+      {0x0000b124, 0x000007c0},
-+      {0x0000b128, 0x00000000},
-+      {0x0000b12c, 0x00000000},
-+      {0x0000b130, 0x00000000},
-+      {0x0000b134, 0x00000000},
-+      {0x0000b138, 0x00000000},
-+      {0x0000b13c, 0x00000000},
-+      {0x0000b140, 0x003f0020},
-+      {0x0000b144, 0x00400041},
-+      {0x0000b148, 0x0140005f},
-+      {0x0000b14c, 0x0160015f},
-+      {0x0000b150, 0x017e017f},
-+      {0x0000b154, 0x02410242},
-+      {0x0000b158, 0x025f0240},
-+      {0x0000b15c, 0x027f0260},
-+      {0x0000b160, 0x0341027e},
-+      {0x0000b164, 0x035f0340},
-+      {0x0000b168, 0x037f0360},
-+      {0x0000b16c, 0x04400441},
-+      {0x0000b170, 0x0460045f},
-+      {0x0000b174, 0x0541047f},
-+      {0x0000b178, 0x055f0540},
-+      {0x0000b17c, 0x057f0560},
-+      {0x0000b180, 0x06400641},
-+      {0x0000b184, 0x0660065f},
-+      {0x0000b188, 0x067e067f},
-+      {0x0000b18c, 0x07410742},
-+      {0x0000b190, 0x075f0740},
-+      {0x0000b194, 0x077f0760},
-+      {0x0000b198, 0x07800781},
-+      {0x0000b19c, 0x07a0079f},
-+      {0x0000b1a0, 0x07c107bf},
-+      {0x0000b1a4, 0x000007c0},
-+      {0x0000b1a8, 0x00000000},
-+      {0x0000b1ac, 0x00000000},
-+      {0x0000b1b0, 0x00000000},
-+      {0x0000b1b4, 0x00000000},
-+      {0x0000b1b8, 0x00000000},
-+      {0x0000b1bc, 0x00000000},
-+      {0x0000b1c0, 0x00000000},
-+      {0x0000b1c4, 0x00000000},
-+      {0x0000b1c8, 0x00000000},
-+      {0x0000b1cc, 0x00000000},
-+      {0x0000b1d0, 0x00000000},
-+      {0x0000b1d4, 0x00000000},
-+      {0x0000b1d8, 0x00000000},
-+      {0x0000b1dc, 0x00000000},
-+      {0x0000b1e0, 0x00000000},
-+      {0x0000b1e4, 0x00000000},
-+      {0x0000b1e8, 0x00000000},
-+      {0x0000b1ec, 0x00000000},
-+      {0x0000b1f0, 0x00000396},
-+      {0x0000b1f4, 0x00000396},
-+      {0x0000b1f8, 0x00000396},
-+      {0x0000b1fc, 0x00000196},
-+};
-+
-+static const u32 ar9300_2p2_soc_preamble[][2] = {
-+      /* Addr      allmodes  */
-+      {0x000040a4, 0x00a0c1c9},
-+      {0x00007008, 0x00000000},
-+      {0x00007020, 0x00000000},
-+      {0x00007034, 0x00000002},
-+      {0x00007038, 0x000004c2},
-+      {0x00007048, 0x00000008},
-+};
-+
-+static const u32 ar9300PciePhy_pll_on_clkreq_disable_L1_2p2[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00004040, 0x08212e5e},
-+      {0x00004040, 0x0008003b},
-+      {0x00004044, 0x00000000},
-+};
-+
-+static const u32 ar9300PciePhy_clkreq_enable_L1_2p2[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00004040, 0x08253e5e},
-+      {0x00004040, 0x0008003b},
-+      {0x00004044, 0x00000000},
-+};
-+
-+static const u32 ar9300PciePhy_clkreq_disable_L1_2p2[][2] = {
-+      /* Addr      allmodes  */
-+      {0x00004040, 0x08213e5e},
-+      {0x00004040, 0x0008003b},
-+      {0x00004044, 0x00000000},
-+};
-+
-+#endif /* INITVALS_9003_2P2_H */
---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -739,6 +739,12 @@ static bool ar9003_hw_init_cal(struct at
-        */
-       ar9003_hw_set_chain_masks(ah, 0x7, 0x7);
- 
-+      /* Do Tx IQ Calibration */
-+      ar9003_hw_tx_iq_cal(ah);
-+      REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
-+      udelay(5);
-+      REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
-+
-       /* Calibrate the AGC */
-       REG_WRITE(ah, AR_PHY_AGC_CONTROL,
-                 REG_READ(ah, AR_PHY_AGC_CONTROL) |
-@@ -753,10 +759,6 @@ static bool ar9003_hw_init_cal(struct at
-               return false;
-       }
- 
--      /* Do Tx IQ Calibration */
--      if (ah->config.tx_iq_calibration)
--              ar9003_hw_tx_iq_cal(ah);
--
-       /* Revert chainmasks to their original values before NF cal */
-       ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
- 
---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-@@ -16,7 +16,8 @@
- 
- #include "hw.h"
- #include "ar9003_mac.h"
--#include "ar9003_initvals.h"
-+#include "ar9003_2p0_initvals.h"
-+#include "ar9003_2p2_initvals.h"
- 
- /* General hardware code for the AR9003 hadware family */
- 
-@@ -31,12 +32,8 @@ static bool ar9003_hw_macversion_support
-       return false;
- }
- 
--/* AR9003 2.0 - new INI format (pre, core, post arrays per subsystem) */
--/*
-- * XXX: move TX/RX gain INI to its own init_mode_gain_regs after
-- * ensuring it does not affect hardware bring up
-- */
--static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
-+/* AR9003 2.0 */
-+static void ar9003_2p0_hw_init_mode_regs(struct ath_hw *ah)
- {
-       /* mac */
-       INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-@@ -106,27 +103,128 @@ static void ar9003_hw_init_mode_regs(str
-                      3);
- }
- 
-+/* AR9003 2.2 */
-+static void ar9003_2p2_hw_init_mode_regs(struct ath_hw *ah)
-+{
-+      /* 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);
-+      INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-+                     ar9300_2p2_mac_postamble,
-+                     ARRAY_SIZE(ar9300_2p2_mac_postamble), 5);
-+
-+      /* 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);
-+      INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-+                     ar9300_2p2_baseband_postamble,
-+                     ARRAY_SIZE(ar9300_2p2_baseband_postamble), 5);
-+
-+      /* 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);
-+      INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-+                     ar9300_2p2_radio_postamble,
-+                     ARRAY_SIZE(ar9300_2p2_radio_postamble), 5);
-+
-+      /* 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);
-+      INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST],
-+                     ar9300_2p2_soc_postamble,
-+                     ARRAY_SIZE(ar9300_2p2_soc_postamble), 5);
-+
-+      /* rx/tx gain */
-+      INIT_INI_ARRAY(&ah->iniModesRxGain,
-+                     ar9300Common_rx_gain_table_2p2,
-+                     ARRAY_SIZE(ar9300Common_rx_gain_table_2p2), 2);
-+      INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                     ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
-+                     ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p2),
-+                     5);
-+
-+      /* 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);
-+
-+      /* Sleep Setting */
-+
-+      INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-+                     ar9300PciePhy_clkreq_enable_L1_2p2,
-+                     ARRAY_SIZE(ar9300PciePhy_clkreq_enable_L1_2p2),
-+                     2);
-+
-+      /* Fast clock modal settings */
-+      INIT_INI_ARRAY(&ah->iniModesAdditional,
-+                     ar9300Modes_fast_clock_2p2,
-+                     ARRAY_SIZE(ar9300Modes_fast_clock_2p2),
-+                     3);
-+}
-+
-+/*
-+ * The AR9003 family uses a new INI format (pre, core, post
-+ * arrays per subsystem).
-+ */
-+static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
-+{
-+      if (AR_SREV_9300_20(ah))
-+              ar9003_2p0_hw_init_mode_regs(ah);
-+      else
-+              ar9003_2p2_hw_init_mode_regs(ah);
-+}
-+
- static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
- {
-       switch (ar9003_hw_get_tx_gain_idx(ah)) {
-       case 0:
-       default:
--              INIT_INI_ARRAY(&ah->iniModesTxGain,
--                             ar9300Modes_lowest_ob_db_tx_gain_table_2p0,
--                             ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p0),
--                             5);
-+              if (AR_SREV_9300_20(ah))
-+                      INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                                     ar9300Modes_lowest_ob_db_tx_gain_table_2p0,
-+                                     ARRAY_SIZE(ar9300Modes_lowest_ob_db_tx_gain_table_2p0),
-+                                     5);
-+              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);
-               break;
-       case 1:
--              INIT_INI_ARRAY(&ah->iniModesTxGain,
--                             ar9300Modes_high_ob_db_tx_gain_table_2p0,
--                             ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p0),
--                             5);
-+              if (AR_SREV_9300_20(ah))
-+                      INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                                     ar9300Modes_high_ob_db_tx_gain_table_2p0,
-+                                     ARRAY_SIZE(ar9300Modes_high_ob_db_tx_gain_table_2p0),
-+                                     5);
-+              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);
-               break;
-       case 2:
--              INIT_INI_ARRAY(&ah->iniModesTxGain,
--                             ar9300Modes_low_ob_db_tx_gain_table_2p0,
--                             ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p0),
--                             5);
-+              if (AR_SREV_9300_20(ah))
-+                      INIT_INI_ARRAY(&ah->iniModesTxGain,
-+                                     ar9300Modes_low_ob_db_tx_gain_table_2p0,
-+                                     ARRAY_SIZE(ar9300Modes_low_ob_db_tx_gain_table_2p0),
-+                                     5);
-+              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);
-               break;
-       }
- }
-@@ -136,15 +234,28 @@ static void ar9003_rx_gain_table_apply(s
-       switch (ar9003_hw_get_rx_gain_idx(ah)) {
-       case 0:
-       default:
--              INIT_INI_ARRAY(&ah->iniModesRxGain, ar9300Common_rx_gain_table_2p0,
--                             ARRAY_SIZE(ar9300Common_rx_gain_table_2p0),
--                             2);
-+              if (AR_SREV_9300_20(ah))
-+                      INIT_INI_ARRAY(&ah->iniModesRxGain,
-+                                     ar9300Common_rx_gain_table_2p0,
-+                                     ARRAY_SIZE(ar9300Common_rx_gain_table_2p0),
-+                                     2);
-+              else
-+                      INIT_INI_ARRAY(&ah->iniModesRxGain,
-+                                     ar9300Common_rx_gain_table_2p2,
-+                                     ARRAY_SIZE(ar9300Common_rx_gain_table_2p2),
-+                                     2);
-               break;
-       case 1:
--              INIT_INI_ARRAY(&ah->iniModesRxGain,
--                             ar9300Common_wo_xlna_rx_gain_table_2p0,
--                             ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p0),
--                             2);
-+              if (AR_SREV_9300_20(ah))
-+                      INIT_INI_ARRAY(&ah->iniModesRxGain,
-+                                     ar9300Common_wo_xlna_rx_gain_table_2p0,
-+                                     ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p0),
-+                                     2);
-+              else
-+                      INIT_INI_ARRAY(&ah->iniModesRxGain,
-+                                     ar9300Common_wo_xlna_rx_gain_table_2p2,
-+                                     ARRAY_SIZE(ar9300Common_wo_xlna_rx_gain_table_2p2),
-+                                     2);
-               break;
-       }
- }
---- a/drivers/net/wireless/ath/ath9k/ar9003_initvals.h
-+++ /dev/null
-@@ -1,1784 +0,0 @@
--/*
-- * Copyright (c) 2010 Atheros Communications Inc.
-- *
-- * Permission to use, copy, modify, and/or distribute this software for any
-- * purpose with or without fee is hereby granted, provided that the above
-- * copyright notice and this permission notice appear in all copies.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- */
--
--#ifndef INITVALS_9003_H
--#define INITVALS_9003_H
--
--/* AR9003 2.0 */
--
--static const u32 ar9300_2p0_radio_postamble[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x0001609c, 0x0dd08f29, 0x0dd08f29, 0x0b283f31, 0x0b283f31},
--      {0x000160ac, 0xa4653c00, 0xa4653c00, 0x24652800, 0x24652800},
--      {0x000160b0, 0x03284f3e, 0x03284f3e, 0x05d08f20, 0x05d08f20},
--      {0x0001610c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
--      {0x0001650c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
--      {0x0001690c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x00016940, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
--};
--
--static const u32 ar9300Modes_lowest_ob_db_tx_gain_table_2p0[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
--      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
--      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
--      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
--      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
--      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
--      {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
--      {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
--      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
--      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
--      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
--      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
--      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
--      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
--      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
--      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
--      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
--      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
--      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
--      {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
--      {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
--      {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
--      {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
--      {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
--      {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
--      {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
--      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
--      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
--      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
--      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
--      {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
--      {0x0000a598, 0x21820220, 0x21820220, 0x16800402, 0x16800402},
--      {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
--      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
--      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
--      {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
--      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
--      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
--      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
--      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
--      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
--      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
--      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
--      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
--      {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x47801a83, 0x47801a83},
--      {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4a801c84, 0x4a801c84},
--      {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4e801ce3, 0x4e801ce3},
--      {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x52801ce5, 0x52801ce5},
--      {0x0000a5dc, 0x7086308c, 0x7086308c, 0x56801ce9, 0x56801ce9},
--      {0x0000a5e0, 0x738a308a, 0x738a308a, 0x5a801ceb, 0x5a801ceb},
--      {0x0000a5e4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5e8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5ec, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5f0, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5f4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5f8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5fc, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
--      {0x00016048, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
--      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--      {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
--      {0x00016448, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
--      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--      {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
--      {0x00016848, 0x62480001, 0x62480001, 0x62480001, 0x62480001},
--      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--};
--
--static const u32 ar9300Modes_fast_clock_2p0[][3] = {
--      /* Addr      5G_HT20     5G_HT40   */
--      {0x00001030, 0x00000268, 0x000004d0},
--      {0x00001070, 0x0000018c, 0x00000318},
--      {0x000010b0, 0x00000fd0, 0x00001fa0},
--      {0x00008014, 0x044c044c, 0x08980898},
--      {0x0000801c, 0x148ec02b, 0x148ec057},
--      {0x00008318, 0x000044c0, 0x00008980},
--      {0x00009e00, 0x03721821, 0x03721821},
--      {0x0000a230, 0x0000000b, 0x00000016},
--      {0x0000a254, 0x00000898, 0x00001130},
--};
--
--static const u32 ar9300_2p0_radio_core[][2] = {
--      /* Addr      allmodes  */
--      {0x00016000, 0x36db6db6},
--      {0x00016004, 0x6db6db40},
--      {0x00016008, 0x73f00000},
--      {0x0001600c, 0x00000000},
--      {0x00016040, 0x7f80fff8},
--      {0x0001604c, 0x76d005b5},
--      {0x00016050, 0x556cf031},
--      {0x00016054, 0x13449440},
--      {0x00016058, 0x0c51c92c},
--      {0x0001605c, 0x3db7fffc},
--      {0x00016060, 0xfffffffc},
--      {0x00016064, 0x000f0278},
--      {0x0001606c, 0x6db60000},
--      {0x00016080, 0x00000000},
--      {0x00016084, 0x0e48048c},
--      {0x00016088, 0x54214514},
--      {0x0001608c, 0x119f481e},
--      {0x00016090, 0x24926490},
--      {0x00016098, 0xd2888888},
--      {0x000160a0, 0x0a108ffe},
--      {0x000160a4, 0x812fc370},
--      {0x000160a8, 0x423c8000},
--      {0x000160b4, 0x92480080},
--      {0x000160c0, 0x00adb6d0},
--      {0x000160c4, 0x6db6db60},
--      {0x000160c8, 0x6db6db6c},
--      {0x000160cc, 0x01e6c000},
--      {0x00016100, 0x3fffbe01},
--      {0x00016104, 0xfff80000},
--      {0x00016108, 0x00080010},
--      {0x00016144, 0x02084080},
--      {0x00016148, 0x00000000},
--      {0x00016280, 0x058a0001},
--      {0x00016284, 0x3d840208},
--      {0x00016288, 0x05a20408},
--      {0x0001628c, 0x00038c07},
--      {0x00016290, 0x40000004},
--      {0x00016294, 0x458aa14f},
--      {0x00016380, 0x00000000},
--      {0x00016384, 0x00000000},
--      {0x00016388, 0x00800700},
--      {0x0001638c, 0x00800700},
--      {0x00016390, 0x00800700},
--      {0x00016394, 0x00000000},
--      {0x00016398, 0x00000000},
--      {0x0001639c, 0x00000000},
--      {0x000163a0, 0x00000001},
--      {0x000163a4, 0x00000001},
--      {0x000163a8, 0x00000000},
--      {0x000163ac, 0x00000000},
--      {0x000163b0, 0x00000000},
--      {0x000163b4, 0x00000000},
--      {0x000163b8, 0x00000000},
--      {0x000163bc, 0x00000000},
--      {0x000163c0, 0x000000a0},
--      {0x000163c4, 0x000c0000},
--      {0x000163c8, 0x14021402},
--      {0x000163cc, 0x00001402},
--      {0x000163d0, 0x00000000},
--      {0x000163d4, 0x00000000},
--      {0x00016400, 0x36db6db6},
--      {0x00016404, 0x6db6db40},
--      {0x00016408, 0x73f00000},
--      {0x0001640c, 0x00000000},
--      {0x00016440, 0x7f80fff8},
--      {0x0001644c, 0x76d005b5},
--      {0x00016450, 0x556cf031},
--      {0x00016454, 0x13449440},
--      {0x00016458, 0x0c51c92c},
--      {0x0001645c, 0x3db7fffc},
--      {0x00016460, 0xfffffffc},
--      {0x00016464, 0x000f0278},
--      {0x0001646c, 0x6db60000},
--      {0x00016500, 0x3fffbe01},
--      {0x00016504, 0xfff80000},
--      {0x00016508, 0x00080010},
--      {0x00016544, 0x02084080},
--      {0x00016548, 0x00000000},
--      {0x00016780, 0x00000000},
--      {0x00016784, 0x00000000},
--      {0x00016788, 0x00800700},
--      {0x0001678c, 0x00800700},
--      {0x00016790, 0x00800700},
--      {0x00016794, 0x00000000},
--      {0x00016798, 0x00000000},
--      {0x0001679c, 0x00000000},
--      {0x000167a0, 0x00000001},
--      {0x000167a4, 0x00000001},
--      {0x000167a8, 0x00000000},
--      {0x000167ac, 0x00000000},
--      {0x000167b0, 0x00000000},
--      {0x000167b4, 0x00000000},
--      {0x000167b8, 0x00000000},
--      {0x000167bc, 0x00000000},
--      {0x000167c0, 0x000000a0},
--      {0x000167c4, 0x000c0000},
--      {0x000167c8, 0x14021402},
--      {0x000167cc, 0x00001402},
--      {0x000167d0, 0x00000000},
--      {0x000167d4, 0x00000000},
--      {0x00016800, 0x36db6db6},
--      {0x00016804, 0x6db6db40},
--      {0x00016808, 0x73f00000},
--      {0x0001680c, 0x00000000},
--      {0x00016840, 0x7f80fff8},
--      {0x0001684c, 0x76d005b5},
--      {0x00016850, 0x556cf031},
--      {0x00016854, 0x13449440},
--      {0x00016858, 0x0c51c92c},
--      {0x0001685c, 0x3db7fffc},
--      {0x00016860, 0xfffffffc},
--      {0x00016864, 0x000f0278},
--      {0x0001686c, 0x6db60000},
--      {0x00016900, 0x3fffbe01},
--      {0x00016904, 0xfff80000},
--      {0x00016908, 0x00080010},
--      {0x00016944, 0x02084080},
--      {0x00016948, 0x00000000},
--      {0x00016b80, 0x00000000},
--      {0x00016b84, 0x00000000},
--      {0x00016b88, 0x00800700},
--      {0x00016b8c, 0x00800700},
--      {0x00016b90, 0x00800700},
--      {0x00016b94, 0x00000000},
--      {0x00016b98, 0x00000000},
--      {0x00016b9c, 0x00000000},
--      {0x00016ba0, 0x00000001},
--      {0x00016ba4, 0x00000001},
--      {0x00016ba8, 0x00000000},
--      {0x00016bac, 0x00000000},
--      {0x00016bb0, 0x00000000},
--      {0x00016bb4, 0x00000000},
--      {0x00016bb8, 0x00000000},
--      {0x00016bbc, 0x00000000},
--      {0x00016bc0, 0x000000a0},
--      {0x00016bc4, 0x000c0000},
--      {0x00016bc8, 0x14021402},
--      {0x00016bcc, 0x00001402},
--      {0x00016bd0, 0x00000000},
--      {0x00016bd4, 0x00000000},
--};
--
--static const u32 ar9300Common_rx_gain_table_merlin_2p0[][2] = {
--      /* Addr      allmodes  */
--      {0x0000a000, 0x02000101},
--      {0x0000a004, 0x02000102},
--      {0x0000a008, 0x02000103},
--      {0x0000a00c, 0x02000104},
--      {0x0000a010, 0x02000200},
--      {0x0000a014, 0x02000201},
--      {0x0000a018, 0x02000202},
--      {0x0000a01c, 0x02000203},
--      {0x0000a020, 0x02000204},
--      {0x0000a024, 0x02000205},
--      {0x0000a028, 0x02000208},
--      {0x0000a02c, 0x02000302},
--      {0x0000a030, 0x02000303},
--      {0x0000a034, 0x02000304},
--      {0x0000a038, 0x02000400},
--      {0x0000a03c, 0x02010300},
--      {0x0000a040, 0x02010301},
--      {0x0000a044, 0x02010302},
--      {0x0000a048, 0x02000500},
--      {0x0000a04c, 0x02010400},
--      {0x0000a050, 0x02020300},
--      {0x0000a054, 0x02020301},
--      {0x0000a058, 0x02020302},
--      {0x0000a05c, 0x02020303},
--      {0x0000a060, 0x02020400},
--      {0x0000a064, 0x02030300},
--      {0x0000a068, 0x02030301},
--      {0x0000a06c, 0x02030302},
--      {0x0000a070, 0x02030303},
--      {0x0000a074, 0x02030400},
--      {0x0000a078, 0x02040300},
--      {0x0000a07c, 0x02040301},
--      {0x0000a080, 0x02040302},
--      {0x0000a084, 0x02040303},
--      {0x0000a088, 0x02030500},
--      {0x0000a08c, 0x02040400},
--      {0x0000a090, 0x02050203},
--      {0x0000a094, 0x02050204},
--      {0x0000a098, 0x02050205},
--      {0x0000a09c, 0x02040500},
--      {0x0000a0a0, 0x02050301},
--      {0x0000a0a4, 0x02050302},
--      {0x0000a0a8, 0x02050303},
--      {0x0000a0ac, 0x02050400},
--      {0x0000a0b0, 0x02050401},
--      {0x0000a0b4, 0x02050402},
--      {0x0000a0b8, 0x02050403},
--      {0x0000a0bc, 0x02050500},
--      {0x0000a0c0, 0x02050501},
--      {0x0000a0c4, 0x02050502},
--      {0x0000a0c8, 0x02050503},
--      {0x0000a0cc, 0x02050504},
--      {0x0000a0d0, 0x02050600},
--      {0x0000a0d4, 0x02050601},
--      {0x0000a0d8, 0x02050602},
--      {0x0000a0dc, 0x02050603},
--      {0x0000a0e0, 0x02050604},
--      {0x0000a0e4, 0x02050700},
--      {0x0000a0e8, 0x02050701},
--      {0x0000a0ec, 0x02050702},
--      {0x0000a0f0, 0x02050703},
--      {0x0000a0f4, 0x02050704},
--      {0x0000a0f8, 0x02050705},
--      {0x0000a0fc, 0x02050708},
--      {0x0000a100, 0x02050709},
--      {0x0000a104, 0x0205070a},
--      {0x0000a108, 0x0205070b},
--      {0x0000a10c, 0x0205070c},
--      {0x0000a110, 0x0205070d},
--      {0x0000a114, 0x02050710},
--      {0x0000a118, 0x02050711},
--      {0x0000a11c, 0x02050712},
--      {0x0000a120, 0x02050713},
--      {0x0000a124, 0x02050714},
--      {0x0000a128, 0x02050715},
--      {0x0000a12c, 0x02050730},
--      {0x0000a130, 0x02050731},
--      {0x0000a134, 0x02050732},
--      {0x0000a138, 0x02050733},
--      {0x0000a13c, 0x02050734},
--      {0x0000a140, 0x02050735},
--      {0x0000a144, 0x02050750},
--      {0x0000a148, 0x02050751},
--      {0x0000a14c, 0x02050752},
--      {0x0000a150, 0x02050753},
--      {0x0000a154, 0x02050754},
--      {0x0000a158, 0x02050755},
--      {0x0000a15c, 0x02050770},
--      {0x0000a160, 0x02050771},
--      {0x0000a164, 0x02050772},
--      {0x0000a168, 0x02050773},
--      {0x0000a16c, 0x02050774},
--      {0x0000a170, 0x02050775},
--      {0x0000a174, 0x00000776},
--      {0x0000a178, 0x00000776},
--      {0x0000a17c, 0x00000776},
--      {0x0000a180, 0x00000776},
--      {0x0000a184, 0x00000776},
--      {0x0000a188, 0x00000776},
--      {0x0000a18c, 0x00000776},
--      {0x0000a190, 0x00000776},
--      {0x0000a194, 0x00000776},
--      {0x0000a198, 0x00000776},
--      {0x0000a19c, 0x00000776},
--      {0x0000a1a0, 0x00000776},
--      {0x0000a1a4, 0x00000776},
--      {0x0000a1a8, 0x00000776},
--      {0x0000a1ac, 0x00000776},
--      {0x0000a1b0, 0x00000776},
--      {0x0000a1b4, 0x00000776},
--      {0x0000a1b8, 0x00000776},
--      {0x0000a1bc, 0x00000776},
--      {0x0000a1c0, 0x00000776},
--      {0x0000a1c4, 0x00000776},
--      {0x0000a1c8, 0x00000776},
--      {0x0000a1cc, 0x00000776},
--      {0x0000a1d0, 0x00000776},
--      {0x0000a1d4, 0x00000776},
--      {0x0000a1d8, 0x00000776},
--      {0x0000a1dc, 0x00000776},
--      {0x0000a1e0, 0x00000776},
--      {0x0000a1e4, 0x00000776},
--      {0x0000a1e8, 0x00000776},
--      {0x0000a1ec, 0x00000776},
--      {0x0000a1f0, 0x00000776},
--      {0x0000a1f4, 0x00000776},
--      {0x0000a1f8, 0x00000776},
--      {0x0000a1fc, 0x00000776},
--      {0x0000b000, 0x02000101},
--      {0x0000b004, 0x02000102},
--      {0x0000b008, 0x02000103},
--      {0x0000b00c, 0x02000104},
--      {0x0000b010, 0x02000200},
--      {0x0000b014, 0x02000201},
--      {0x0000b018, 0x02000202},
--      {0x0000b01c, 0x02000203},
--      {0x0000b020, 0x02000204},
--      {0x0000b024, 0x02000205},
--      {0x0000b028, 0x02000208},
--      {0x0000b02c, 0x02000302},
--      {0x0000b030, 0x02000303},
--      {0x0000b034, 0x02000304},
--      {0x0000b038, 0x02000400},
--      {0x0000b03c, 0x02010300},
--      {0x0000b040, 0x02010301},
--      {0x0000b044, 0x02010302},
--      {0x0000b048, 0x02000500},
--      {0x0000b04c, 0x02010400},
--      {0x0000b050, 0x02020300},
--      {0x0000b054, 0x02020301},
--      {0x0000b058, 0x02020302},
--      {0x0000b05c, 0x02020303},
--      {0x0000b060, 0x02020400},
--      {0x0000b064, 0x02030300},
--      {0x0000b068, 0x02030301},
--      {0x0000b06c, 0x02030302},
--      {0x0000b070, 0x02030303},
--      {0x0000b074, 0x02030400},
--      {0x0000b078, 0x02040300},
--      {0x0000b07c, 0x02040301},
--      {0x0000b080, 0x02040302},
--      {0x0000b084, 0x02040303},
--      {0x0000b088, 0x02030500},
--      {0x0000b08c, 0x02040400},
--      {0x0000b090, 0x02050203},
--      {0x0000b094, 0x02050204},
--      {0x0000b098, 0x02050205},
--      {0x0000b09c, 0x02040500},
--      {0x0000b0a0, 0x02050301},
--      {0x0000b0a4, 0x02050302},
--      {0x0000b0a8, 0x02050303},
--      {0x0000b0ac, 0x02050400},
--      {0x0000b0b0, 0x02050401},
--      {0x0000b0b4, 0x02050402},
--      {0x0000b0b8, 0x02050403},
--      {0x0000b0bc, 0x02050500},
--      {0x0000b0c0, 0x02050501},
--      {0x0000b0c4, 0x02050502},
--      {0x0000b0c8, 0x02050503},
--      {0x0000b0cc, 0x02050504},
--      {0x0000b0d0, 0x02050600},
--      {0x0000b0d4, 0x02050601},
--      {0x0000b0d8, 0x02050602},
--      {0x0000b0dc, 0x02050603},
--      {0x0000b0e0, 0x02050604},
--      {0x0000b0e4, 0x02050700},
--      {0x0000b0e8, 0x02050701},
--      {0x0000b0ec, 0x02050702},
--      {0x0000b0f0, 0x02050703},
--      {0x0000b0f4, 0x02050704},
--      {0x0000b0f8, 0x02050705},
--      {0x0000b0fc, 0x02050708},
--      {0x0000b100, 0x02050709},
--      {0x0000b104, 0x0205070a},
--      {0x0000b108, 0x0205070b},
--      {0x0000b10c, 0x0205070c},
--      {0x0000b110, 0x0205070d},
--      {0x0000b114, 0x02050710},
--      {0x0000b118, 0x02050711},
--      {0x0000b11c, 0x02050712},
--      {0x0000b120, 0x02050713},
--      {0x0000b124, 0x02050714},
--      {0x0000b128, 0x02050715},
--      {0x0000b12c, 0x02050730},
--      {0x0000b130, 0x02050731},
--      {0x0000b134, 0x02050732},
--      {0x0000b138, 0x02050733},
--      {0x0000b13c, 0x02050734},
--      {0x0000b140, 0x02050735},
--      {0x0000b144, 0x02050750},
--      {0x0000b148, 0x02050751},
--      {0x0000b14c, 0x02050752},
--      {0x0000b150, 0x02050753},
--      {0x0000b154, 0x02050754},
--      {0x0000b158, 0x02050755},
--      {0x0000b15c, 0x02050770},
--      {0x0000b160, 0x02050771},
--      {0x0000b164, 0x02050772},
--      {0x0000b168, 0x02050773},
--      {0x0000b16c, 0x02050774},
--      {0x0000b170, 0x02050775},
--      {0x0000b174, 0x00000776},
--      {0x0000b178, 0x00000776},
--      {0x0000b17c, 0x00000776},
--      {0x0000b180, 0x00000776},
--      {0x0000b184, 0x00000776},
--      {0x0000b188, 0x00000776},
--      {0x0000b18c, 0x00000776},
--      {0x0000b190, 0x00000776},
--      {0x0000b194, 0x00000776},
--      {0x0000b198, 0x00000776},
--      {0x0000b19c, 0x00000776},
--      {0x0000b1a0, 0x00000776},
--      {0x0000b1a4, 0x00000776},
--      {0x0000b1a8, 0x00000776},
--      {0x0000b1ac, 0x00000776},
--      {0x0000b1b0, 0x00000776},
--      {0x0000b1b4, 0x00000776},
--      {0x0000b1b8, 0x00000776},
--      {0x0000b1bc, 0x00000776},
--      {0x0000b1c0, 0x00000776},
--      {0x0000b1c4, 0x00000776},
--      {0x0000b1c8, 0x00000776},
--      {0x0000b1cc, 0x00000776},
--      {0x0000b1d0, 0x00000776},
--      {0x0000b1d4, 0x00000776},
--      {0x0000b1d8, 0x00000776},
--      {0x0000b1dc, 0x00000776},
--      {0x0000b1e0, 0x00000776},
--      {0x0000b1e4, 0x00000776},
--      {0x0000b1e8, 0x00000776},
--      {0x0000b1ec, 0x00000776},
--      {0x0000b1f0, 0x00000776},
--      {0x0000b1f4, 0x00000776},
--      {0x0000b1f8, 0x00000776},
--      {0x0000b1fc, 0x00000776},
--};
--
--static const u32 ar9300_2p0_mac_postamble[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
--      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
--      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
--      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
--      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
--      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
--      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
--      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
--};
--
--static const u32 ar9300_2p0_soc_postamble[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
--};
--
--static const u32 ar9200_merlin_2p0_radio_core[][2] = {
--      /* Addr      allmodes  */
--      {0x00007800, 0x00040000},
--      {0x00007804, 0xdb005012},
--      {0x00007808, 0x04924914},
--      {0x0000780c, 0x21084210},
--      {0x00007810, 0x6d801300},
--      {0x00007814, 0x0019beff},
--      {0x00007818, 0x07e41000},
--      {0x0000781c, 0x00392000},
--      {0x00007820, 0x92592480},
--      {0x00007824, 0x00040000},
--      {0x00007828, 0xdb005012},
--      {0x0000782c, 0x04924914},
--      {0x00007830, 0x21084210},
--      {0x00007834, 0x6d801300},
--      {0x00007838, 0x0019beff},
--      {0x0000783c, 0x07e40000},
--      {0x00007840, 0x00392000},
--      {0x00007844, 0x92592480},
--      {0x00007848, 0x00100000},
--      {0x0000784c, 0x773f0567},
--      {0x00007850, 0x54214514},
--      {0x00007854, 0x12035828},
--      {0x00007858, 0x92592692},
--      {0x0000785c, 0x00000000},
--      {0x00007860, 0x56400000},
--      {0x00007864, 0x0a8e370e},
--      {0x00007868, 0xc0102850},
--      {0x0000786c, 0x812d4000},
--      {0x00007870, 0x807ec400},
--      {0x00007874, 0x001b6db0},
--      {0x00007878, 0x00376b63},
--      {0x0000787c, 0x06db6db6},
--      {0x00007880, 0x006d8000},
--      {0x00007884, 0xffeffffe},
--      {0x00007888, 0xffeffffe},
--      {0x0000788c, 0x00010000},
--      {0x00007890, 0x02060aeb},
--      {0x00007894, 0x5a108000},
--};
--
--static const u32 ar9300_2p0_baseband_postamble[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
--      {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
--      {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
--      {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
--      {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
--      {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
--      {0x00009c00, 0x00000044, 0x000000c4, 0x000000c4, 0x00000044},
--      {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
--      {0x00009e04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
--      {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
--      {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e},
--      {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
--      {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
--      {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
--      {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
--      {0x00009e44, 0x02321e27, 0x02321e27, 0x02291e27, 0x02291e27},
--      {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
--      {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
--      {0x0000a204, 0x000037c0, 0x000037c4, 0x000037c4, 0x000037c0},
--      {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
--      {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
--      {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
--      {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
--      {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
--      {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
--      {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
--      {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
--      {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
--      {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
--      {0x0000a284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
--      {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
--      {0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
--      {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
--      {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
--      {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
--      {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
--      {0x0000ae04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
--      {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
--      {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
--      {0x0000b284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
--      {0x0000b830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
--      {0x0000be04, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
--      {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x0000be1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
--      {0x0000be20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
--      {0x0000c284, 0x00000000, 0x00000000, 0x00000150, 0x00000150},
--};
--
--static const u32 ar9300_2p0_baseband_core[][2] = {
--      /* Addr      allmodes  */
--      {0x00009800, 0xafe68e30},
--      {0x00009804, 0xfd14e000},
--      {0x00009808, 0x9c0a9f6b},
--      {0x0000980c, 0x04900000},
--      {0x00009814, 0x9280c00a},
--      {0x00009818, 0x00000000},
--      {0x0000981c, 0x00020028},
--      {0x00009834, 0x5f3ca3de},
--      {0x00009838, 0x0108ecff},
--      {0x0000983c, 0x14750600},
--      {0x00009880, 0x201fff00},
--      {0x00009884, 0x00001042},
--      {0x000098a4, 0x00200400},
--      {0x000098b0, 0x52440bbe},
--      {0x000098d0, 0x004b6a8e},
--      {0x000098d4, 0x00000820},
--      {0x000098dc, 0x00000000},
--      {0x000098f0, 0x00000000},
--      {0x000098f4, 0x00000000},
--      {0x00009c04, 0xff55ff55},
--      {0x00009c08, 0x0320ff55},
--      {0x00009c0c, 0x00000000},
--      {0x00009c10, 0x00000000},
--      {0x00009c14, 0x00046384},
--      {0x00009c18, 0x05b6b440},
--      {0x00009c1c, 0x00b6b440},
--      {0x00009d00, 0xc080a333},
--      {0x00009d04, 0x40206c10},
--      {0x00009d08, 0x009c4060},
--      {0x00009d0c, 0x9883800a},
--      {0x00009d10, 0x01834061},
--      {0x00009d14, 0x00c0040b},
--      {0x00009d18, 0x00000000},
--      {0x00009e08, 0x0038230c},
--      {0x00009e24, 0x990bb515},
--      {0x00009e28, 0x0c6f0000},
--      {0x00009e30, 0x06336f77},
--      {0x00009e34, 0x6af6532f},
--      {0x00009e38, 0x0cc80c00},
--      {0x00009e3c, 0xcf946222},
--      {0x00009e40, 0x0d261820},
--      {0x00009e4c, 0x00001004},
--      {0x00009e50, 0x00ff03f1},
--      {0x00009e54, 0x00000000},
--      {0x00009fc0, 0x803e4788},
--      {0x00009fc4, 0x0001efb5},
--      {0x00009fcc, 0x40000014},
--      {0x00009fd0, 0x01193b93},
--      {0x0000a20c, 0x00000000},
--      {0x0000a220, 0x00000000},
--      {0x0000a224, 0x00000000},
--      {0x0000a228, 0x10002310},
--      {0x0000a22c, 0x01036a1e},
--      {0x0000a234, 0x10000fff},
--      {0x0000a23c, 0x00000000},
--      {0x0000a244, 0x0c000000},
--      {0x0000a2a0, 0x00000001},
--      {0x0000a2c0, 0x00000001},
--      {0x0000a2c8, 0x00000000},
--      {0x0000a2cc, 0x18c43433},
--      {0x0000a2d4, 0x00000000},
--      {0x0000a2dc, 0x00000000},
--      {0x0000a2e0, 0x00000000},
--      {0x0000a2e4, 0x00000000},
--      {0x0000a2e8, 0x00000000},
--      {0x0000a2ec, 0x00000000},
--      {0x0000a2f0, 0x00000000},
--      {0x0000a2f4, 0x00000000},
--      {0x0000a2f8, 0x00000000},
--      {0x0000a344, 0x00000000},
--      {0x0000a34c, 0x00000000},
--      {0x0000a350, 0x0000a000},
--      {0x0000a364, 0x00000000},
--      {0x0000a370, 0x00000000},
--      {0x0000a390, 0x00000001},
--      {0x0000a394, 0x00000444},
--      {0x0000a398, 0x001f0e0f},
--      {0x0000a39c, 0x0075393f},
--      {0x0000a3a0, 0xb79f6427},
--      {0x0000a3a4, 0x00000000},
--      {0x0000a3a8, 0xaaaaaaaa},
--      {0x0000a3ac, 0x3c466478},
--      {0x0000a3c0, 0x20202020},
--      {0x0000a3c4, 0x22222220},
--      {0x0000a3c8, 0x20200020},
--      {0x0000a3cc, 0x20202020},
--      {0x0000a3d0, 0x20202020},
--      {0x0000a3d4, 0x20202020},
--      {0x0000a3d8, 0x20202020},
--      {0x0000a3dc, 0x20202020},
--      {0x0000a3e0, 0x20202020},
--      {0x0000a3e4, 0x20202020},
--      {0x0000a3e8, 0x20202020},
--      {0x0000a3ec, 0x20202020},
--      {0x0000a3f0, 0x00000000},
--      {0x0000a3f4, 0x00000246},
--      {0x0000a3f8, 0x0cdbd380},
--      {0x0000a3fc, 0x000f0f01},
--      {0x0000a400, 0x8fa91f01},
--      {0x0000a404, 0x00000000},
--      {0x0000a408, 0x0e79e5c6},
--      {0x0000a40c, 0x00820820},
--      {0x0000a414, 0x1ce739ce},
--      {0x0000a418, 0x2d001dce},
--      {0x0000a41c, 0x1ce739ce},
--      {0x0000a420, 0x000001ce},
--      {0x0000a424, 0x1ce739ce},
--      {0x0000a428, 0x000001ce},
--      {0x0000a42c, 0x1ce739ce},
--      {0x0000a430, 0x1ce739ce},
--      {0x0000a434, 0x00000000},
--      {0x0000a438, 0x00001801},
--      {0x0000a43c, 0x00000000},
--      {0x0000a440, 0x00000000},
--      {0x0000a444, 0x00000000},
--      {0x0000a448, 0x04000080},
--      {0x0000a44c, 0x00000001},
--      {0x0000a450, 0x00010000},
--      {0x0000a458, 0x00000000},
--      {0x0000a600, 0x00000000},
--      {0x0000a604, 0x00000000},
--      {0x0000a608, 0x00000000},
--      {0x0000a60c, 0x00000000},
--      {0x0000a610, 0x00000000},
--      {0x0000a614, 0x00000000},
--      {0x0000a618, 0x00000000},
--      {0x0000a61c, 0x00000000},
--      {0x0000a620, 0x00000000},
--      {0x0000a624, 0x00000000},
--      {0x0000a628, 0x00000000},
--      {0x0000a62c, 0x00000000},
--      {0x0000a630, 0x00000000},
--      {0x0000a634, 0x00000000},
--      {0x0000a638, 0x00000000},
--      {0x0000a63c, 0x00000000},
--      {0x0000a640, 0x00000000},
--      {0x0000a644, 0x3fad9d74},
--      {0x0000a648, 0x0048060a},
--      {0x0000a64c, 0x00000637},
--      {0x0000a670, 0x03020100},
--      {0x0000a674, 0x09080504},
--      {0x0000a678, 0x0d0c0b0a},
--      {0x0000a67c, 0x13121110},
--      {0x0000a680, 0x31301514},
--      {0x0000a684, 0x35343332},
--      {0x0000a688, 0x00000036},
--      {0x0000a690, 0x00000838},
--      {0x0000a7c0, 0x00000000},
--      {0x0000a7c4, 0xfffffffc},
--      {0x0000a7c8, 0x00000000},
--      {0x0000a7cc, 0x00000000},
--      {0x0000a7d0, 0x00000000},
--      {0x0000a7d4, 0x00000004},
--      {0x0000a7dc, 0x00000001},
--      {0x0000a8d0, 0x004b6a8e},
--      {0x0000a8d4, 0x00000820},
--      {0x0000a8dc, 0x00000000},
--      {0x0000a8f0, 0x00000000},
--      {0x0000a8f4, 0x00000000},
--      {0x0000b2d0, 0x00000080},
--      {0x0000b2d4, 0x00000000},
--      {0x0000b2dc, 0x00000000},
--      {0x0000b2e0, 0x00000000},
--      {0x0000b2e4, 0x00000000},
--      {0x0000b2e8, 0x00000000},
--      {0x0000b2ec, 0x00000000},
--      {0x0000b2f0, 0x00000000},
--      {0x0000b2f4, 0x00000000},
--      {0x0000b2f8, 0x00000000},
--      {0x0000b408, 0x0e79e5c0},
--      {0x0000b40c, 0x00820820},
--      {0x0000b420, 0x00000000},
--      {0x0000b8d0, 0x004b6a8e},
--      {0x0000b8d4, 0x00000820},
--      {0x0000b8dc, 0x00000000},
--      {0x0000b8f0, 0x00000000},
--      {0x0000b8f4, 0x00000000},
--      {0x0000c2d0, 0x00000080},
--      {0x0000c2d4, 0x00000000},
--      {0x0000c2dc, 0x00000000},
--      {0x0000c2e0, 0x00000000},
--      {0x0000c2e4, 0x00000000},
--      {0x0000c2e8, 0x00000000},
--      {0x0000c2ec, 0x00000000},
--      {0x0000c2f0, 0x00000000},
--      {0x0000c2f4, 0x00000000},
--      {0x0000c2f8, 0x00000000},
--      {0x0000c408, 0x0e79e5c0},
--      {0x0000c40c, 0x00820820},
--      {0x0000c420, 0x00000000},
--};
--
--static const u32 ar9300Modes_high_power_tx_gain_table_2p0[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
--      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
--      {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
--      {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
--      {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
--      {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
--      {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
--      {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
--      {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
--      {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
--      {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
--      {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
--      {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
--      {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
--      {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
--      {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
--      {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
--      {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
--      {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
--      {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
--      {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
--      {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
--      {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
--      {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
--      {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
--      {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
--      {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
--      {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
--      {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
--      {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
--      {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
--      {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
--      {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
--      {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
--      {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
--      {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
--      {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
--      {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
--      {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
--      {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
--      {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
--      {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
--      {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
--      {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
--      {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
--      {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
--      {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
--      {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
--      {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
--      {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
--      {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
--      {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x00016044, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
--      {0x00016048, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
--      {0x00016068, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
--      {0x00016444, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
--      {0x00016448, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
--      {0x00016468, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
--      {0x00016844, 0x056db2e6, 0x056db2e6, 0x056db2e6, 0x056db2e6},
--      {0x00016848, 0xae480001, 0xae480001, 0xae480001, 0xae480001},
--      {0x00016868, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c, 0x6eb6db6c},
--};
--
--static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p0[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
--      {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
--      {0x0000a504, 0x06002223, 0x06002223, 0x04000002, 0x04000002},
--      {0x0000a508, 0x0a022220, 0x0a022220, 0x08000004, 0x08000004},
--      {0x0000a50c, 0x0f022223, 0x0f022223, 0x0b000200, 0x0b000200},
--      {0x0000a510, 0x14022620, 0x14022620, 0x0f000202, 0x0f000202},
--      {0x0000a514, 0x18022622, 0x18022622, 0x11000400, 0x11000400},
--      {0x0000a518, 0x1b022822, 0x1b022822, 0x15000402, 0x15000402},
--      {0x0000a51c, 0x20022842, 0x20022842, 0x19000404, 0x19000404},
--      {0x0000a520, 0x22022c41, 0x22022c41, 0x1b000603, 0x1b000603},
--      {0x0000a524, 0x28023042, 0x28023042, 0x1f000a02, 0x1f000a02},
--      {0x0000a528, 0x2c023044, 0x2c023044, 0x23000a04, 0x23000a04},
--      {0x0000a52c, 0x2f023644, 0x2f023644, 0x26000a20, 0x26000a20},
--      {0x0000a530, 0x34025643, 0x34025643, 0x2a000e20, 0x2a000e20},
--      {0x0000a534, 0x38025a44, 0x38025a44, 0x2e000e22, 0x2e000e22},
--      {0x0000a538, 0x3b025e45, 0x3b025e45, 0x31000e24, 0x31000e24},
--      {0x0000a53c, 0x41025e4a, 0x41025e4a, 0x34001640, 0x34001640},
--      {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
--      {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
--      {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
--      {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
--      {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
--      {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
--      {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
--      {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
--      {0x0000a560, 0x70049f56, 0x70049f56, 0x54001ceb, 0x54001ceb},
--      {0x0000a564, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a568, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a56c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a570, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a574, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a578, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a57c, 0x7504ff56, 0x7504ff56, 0x56001eec, 0x56001eec},
--      {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
--      {0x0000a584, 0x06802223, 0x06802223, 0x04800002, 0x04800002},
--      {0x0000a588, 0x0a822220, 0x0a822220, 0x08800004, 0x08800004},
--      {0x0000a58c, 0x0f822223, 0x0f822223, 0x0b800200, 0x0b800200},
--      {0x0000a590, 0x14822620, 0x14822620, 0x0f800202, 0x0f800202},
--      {0x0000a594, 0x18822622, 0x18822622, 0x11800400, 0x11800400},
--      {0x0000a598, 0x1b822822, 0x1b822822, 0x15800402, 0x15800402},
--      {0x0000a59c, 0x20822842, 0x20822842, 0x19800404, 0x19800404},
--      {0x0000a5a0, 0x22822c41, 0x22822c41, 0x1b800603, 0x1b800603},
--      {0x0000a5a4, 0x28823042, 0x28823042, 0x1f800a02, 0x1f800a02},
--      {0x0000a5a8, 0x2c823044, 0x2c823044, 0x23800a04, 0x23800a04},
--      {0x0000a5ac, 0x2f823644, 0x2f823644, 0x26800a20, 0x26800a20},
--      {0x0000a5b0, 0x34825643, 0x34825643, 0x2a800e20, 0x2a800e20},
--      {0x0000a5b4, 0x38825a44, 0x38825a44, 0x2e800e22, 0x2e800e22},
--      {0x0000a5b8, 0x3b825e45, 0x3b825e45, 0x31800e24, 0x31800e24},
--      {0x0000a5bc, 0x41825e4a, 0x41825e4a, 0x34801640, 0x34801640},
--      {0x0000a5c0, 0x48825e6c, 0x48825e6c, 0x38801660, 0x38801660},
--      {0x0000a5c4, 0x4e825e8e, 0x4e825e8e, 0x3b801861, 0x3b801861},
--      {0x0000a5c8, 0x53825eb2, 0x53825eb2, 0x3e801a81, 0x3e801a81},
--      {0x0000a5cc, 0x59825eb5, 0x59825eb5, 0x42801a83, 0x42801a83},
--      {0x0000a5d0, 0x5f825ef6, 0x5f825ef6, 0x44801c84, 0x44801c84},
--      {0x0000a5d4, 0x62825f56, 0x62825f56, 0x48801ce3, 0x48801ce3},
--      {0x0000a5d8, 0x66827f56, 0x66827f56, 0x4c801ce5, 0x4c801ce5},
--      {0x0000a5dc, 0x6a829f56, 0x6a829f56, 0x50801ce9, 0x50801ce9},
--      {0x0000a5e0, 0x70849f56, 0x70849f56, 0x54801ceb, 0x54801ceb},
--      {0x0000a5e4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5e8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5ec, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5f0, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5f4, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5f8, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x0000a5fc, 0x7584ff56, 0x7584ff56, 0x56801eec, 0x56801eec},
--      {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
--      {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
--      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--      {0x00016444, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
--      {0x00016448, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
--      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--      {0x00016844, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
--      {0x00016848, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
--      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--};
--
--static const u32 ar9300Common_rx_gain_table_2p0[][2] = {
--      /* Addr      allmodes  */
--      {0x0000a000, 0x00010000},
--      {0x0000a004, 0x00030002},
--      {0x0000a008, 0x00050004},
--      {0x0000a00c, 0x00810080},
--      {0x0000a010, 0x00830082},
--      {0x0000a014, 0x01810180},
--      {0x0000a018, 0x01830182},
--      {0x0000a01c, 0x01850184},
--      {0x0000a020, 0x01890188},
--      {0x0000a024, 0x018b018a},
--      {0x0000a028, 0x018d018c},
--      {0x0000a02c, 0x01910190},
--      {0x0000a030, 0x01930192},
--      {0x0000a034, 0x01950194},
--      {0x0000a038, 0x038a0196},
--      {0x0000a03c, 0x038c038b},
--      {0x0000a040, 0x0390038d},
--      {0x0000a044, 0x03920391},
--      {0x0000a048, 0x03940393},
--      {0x0000a04c, 0x03960395},
--      {0x0000a050, 0x00000000},
--      {0x0000a054, 0x00000000},
--      {0x0000a058, 0x00000000},
--      {0x0000a05c, 0x00000000},
--      {0x0000a060, 0x00000000},
--      {0x0000a064, 0x00000000},
--      {0x0000a068, 0x00000000},
--      {0x0000a06c, 0x00000000},
--      {0x0000a070, 0x00000000},
--      {0x0000a074, 0x00000000},
--      {0x0000a078, 0x00000000},
--      {0x0000a07c, 0x00000000},
--      {0x0000a080, 0x22222229},
--      {0x0000a084, 0x1d1d1d1d},
--      {0x0000a088, 0x1d1d1d1d},
--      {0x0000a08c, 0x1d1d1d1d},
--      {0x0000a090, 0x171d1d1d},
--      {0x0000a094, 0x11111717},
--      {0x0000a098, 0x00030311},
--      {0x0000a09c, 0x00000000},
--      {0x0000a0a0, 0x00000000},
--      {0x0000a0a4, 0x00000000},
--      {0x0000a0a8, 0x00000000},
--      {0x0000a0ac, 0x00000000},
--      {0x0000a0b0, 0x00000000},
--      {0x0000a0b4, 0x00000000},
--      {0x0000a0b8, 0x00000000},
--      {0x0000a0bc, 0x00000000},
--      {0x0000a0c0, 0x001f0000},
--      {0x0000a0c4, 0x01000101},
--      {0x0000a0c8, 0x011e011f},
--      {0x0000a0cc, 0x011c011d},
--      {0x0000a0d0, 0x02030204},
--      {0x0000a0d4, 0x02010202},
--      {0x0000a0d8, 0x021f0200},
--      {0x0000a0dc, 0x0302021e},
--      {0x0000a0e0, 0x03000301},
--      {0x0000a0e4, 0x031e031f},
--      {0x0000a0e8, 0x0402031d},
--      {0x0000a0ec, 0x04000401},
--      {0x0000a0f0, 0x041e041f},
--      {0x0000a0f4, 0x0502041d},
--      {0x0000a0f8, 0x05000501},
--      {0x0000a0fc, 0x051e051f},
--      {0x0000a100, 0x06010602},
--      {0x0000a104, 0x061f0600},
--      {0x0000a108, 0x061d061e},
--      {0x0000a10c, 0x07020703},
--      {0x0000a110, 0x07000701},
--      {0x0000a114, 0x00000000},
--      {0x0000a118, 0x00000000},
--      {0x0000a11c, 0x00000000},
--      {0x0000a120, 0x00000000},
--      {0x0000a124, 0x00000000},
--      {0x0000a128, 0x00000000},
--      {0x0000a12c, 0x00000000},
--      {0x0000a130, 0x00000000},
--      {0x0000a134, 0x00000000},
--      {0x0000a138, 0x00000000},
--      {0x0000a13c, 0x00000000},
--      {0x0000a140, 0x001f0000},
--      {0x0000a144, 0x01000101},
--      {0x0000a148, 0x011e011f},
--      {0x0000a14c, 0x011c011d},
--      {0x0000a150, 0x02030204},
--      {0x0000a154, 0x02010202},
--      {0x0000a158, 0x021f0200},
--      {0x0000a15c, 0x0302021e},
--      {0x0000a160, 0x03000301},
--      {0x0000a164, 0x031e031f},
--      {0x0000a168, 0x0402031d},
--      {0x0000a16c, 0x04000401},
--      {0x0000a170, 0x041e041f},
--      {0x0000a174, 0x0502041d},
--      {0x0000a178, 0x05000501},
--      {0x0000a17c, 0x051e051f},
--      {0x0000a180, 0x06010602},
--      {0x0000a184, 0x061f0600},
--      {0x0000a188, 0x061d061e},
--      {0x0000a18c, 0x07020703},
--      {0x0000a190, 0x07000701},
--      {0x0000a194, 0x00000000},
--      {0x0000a198, 0x00000000},
--      {0x0000a19c, 0x00000000},
--      {0x0000a1a0, 0x00000000},
--      {0x0000a1a4, 0x00000000},
--      {0x0000a1a8, 0x00000000},
--      {0x0000a1ac, 0x00000000},
--      {0x0000a1b0, 0x00000000},
--      {0x0000a1b4, 0x00000000},
--      {0x0000a1b8, 0x00000000},
--      {0x0000a1bc, 0x00000000},
--      {0x0000a1c0, 0x00000000},
--      {0x0000a1c4, 0x00000000},
--      {0x0000a1c8, 0x00000000},
--      {0x0000a1cc, 0x00000000},
--      {0x0000a1d0, 0x00000000},
--      {0x0000a1d4, 0x00000000},
--      {0x0000a1d8, 0x00000000},
--      {0x0000a1dc, 0x00000000},
--      {0x0000a1e0, 0x00000000},
--      {0x0000a1e4, 0x00000000},
--      {0x0000a1e8, 0x00000000},
--      {0x0000a1ec, 0x00000000},
--      {0x0000a1f0, 0x00000396},
--      {0x0000a1f4, 0x00000396},
--      {0x0000a1f8, 0x00000396},
--      {0x0000a1fc, 0x00000196},
--      {0x0000b000, 0x00010000},
--      {0x0000b004, 0x00030002},
--      {0x0000b008, 0x00050004},
--      {0x0000b00c, 0x00810080},
--      {0x0000b010, 0x00830082},
--      {0x0000b014, 0x01810180},
--      {0x0000b018, 0x01830182},
--      {0x0000b01c, 0x01850184},
--      {0x0000b020, 0x02810280},
--      {0x0000b024, 0x02830282},
--      {0x0000b028, 0x02850284},
--      {0x0000b02c, 0x02890288},
--      {0x0000b030, 0x028b028a},
--      {0x0000b034, 0x0388028c},
--      {0x0000b038, 0x038a0389},
--      {0x0000b03c, 0x038c038b},
--      {0x0000b040, 0x0390038d},
--      {0x0000b044, 0x03920391},
--      {0x0000b048, 0x03940393},
--      {0x0000b04c, 0x03960395},
--      {0x0000b050, 0x00000000},
--      {0x0000b054, 0x00000000},
--      {0x0000b058, 0x00000000},
--      {0x0000b05c, 0x00000000},
--      {0x0000b060, 0x00000000},
--      {0x0000b064, 0x00000000},
--      {0x0000b068, 0x00000000},
--      {0x0000b06c, 0x00000000},
--      {0x0000b070, 0x00000000},
--      {0x0000b074, 0x00000000},
--      {0x0000b078, 0x00000000},
--      {0x0000b07c, 0x00000000},
--      {0x0000b080, 0x32323232},
--      {0x0000b084, 0x2f2f3232},
--      {0x0000b088, 0x23282a2d},
--      {0x0000b08c, 0x1c1e2123},
--      {0x0000b090, 0x14171919},
--      {0x0000b094, 0x0e0e1214},
--      {0x0000b098, 0x03050707},
--      {0x0000b09c, 0x00030303},
--      {0x0000b0a0, 0x00000000},
--      {0x0000b0a4, 0x00000000},
--      {0x0000b0a8, 0x00000000},
--      {0x0000b0ac, 0x00000000},
--      {0x0000b0b0, 0x00000000},
--      {0x0000b0b4, 0x00000000},
--      {0x0000b0b8, 0x00000000},
--      {0x0000b0bc, 0x00000000},
--      {0x0000b0c0, 0x003f0020},
--      {0x0000b0c4, 0x00400041},
--      {0x0000b0c8, 0x0140005f},
--      {0x0000b0cc, 0x0160015f},
--      {0x0000b0d0, 0x017e017f},
--      {0x0000b0d4, 0x02410242},
--      {0x0000b0d8, 0x025f0240},
--      {0x0000b0dc, 0x027f0260},
--      {0x0000b0e0, 0x0341027e},
--      {0x0000b0e4, 0x035f0340},
--      {0x0000b0e8, 0x037f0360},
--      {0x0000b0ec, 0x04400441},
--      {0x0000b0f0, 0x0460045f},
--      {0x0000b0f4, 0x0541047f},
--      {0x0000b0f8, 0x055f0540},
--      {0x0000b0fc, 0x057f0560},
--      {0x0000b100, 0x06400641},
--      {0x0000b104, 0x0660065f},
--      {0x0000b108, 0x067e067f},
--      {0x0000b10c, 0x07410742},
--      {0x0000b110, 0x075f0740},
--      {0x0000b114, 0x077f0760},
--      {0x0000b118, 0x07800781},
--      {0x0000b11c, 0x07a0079f},
--      {0x0000b120, 0x07c107bf},
--      {0x0000b124, 0x000007c0},
--      {0x0000b128, 0x00000000},
--      {0x0000b12c, 0x00000000},
--      {0x0000b130, 0x00000000},
--      {0x0000b134, 0x00000000},
--      {0x0000b138, 0x00000000},
--      {0x0000b13c, 0x00000000},
--      {0x0000b140, 0x003f0020},
--      {0x0000b144, 0x00400041},
--      {0x0000b148, 0x0140005f},
--      {0x0000b14c, 0x0160015f},
--      {0x0000b150, 0x017e017f},
--      {0x0000b154, 0x02410242},
--      {0x0000b158, 0x025f0240},
--      {0x0000b15c, 0x027f0260},
--      {0x0000b160, 0x0341027e},
--      {0x0000b164, 0x035f0340},
--      {0x0000b168, 0x037f0360},
--      {0x0000b16c, 0x04400441},
--      {0x0000b170, 0x0460045f},
--      {0x0000b174, 0x0541047f},
--      {0x0000b178, 0x055f0540},
--      {0x0000b17c, 0x057f0560},
--      {0x0000b180, 0x06400641},
--      {0x0000b184, 0x0660065f},
--      {0x0000b188, 0x067e067f},
--      {0x0000b18c, 0x07410742},
--      {0x0000b190, 0x075f0740},
--      {0x0000b194, 0x077f0760},
--      {0x0000b198, 0x07800781},
--      {0x0000b19c, 0x07a0079f},
--      {0x0000b1a0, 0x07c107bf},
--      {0x0000b1a4, 0x000007c0},
--      {0x0000b1a8, 0x00000000},
--      {0x0000b1ac, 0x00000000},
--      {0x0000b1b0, 0x00000000},
--      {0x0000b1b4, 0x00000000},
--      {0x0000b1b8, 0x00000000},
--      {0x0000b1bc, 0x00000000},
--      {0x0000b1c0, 0x00000000},
--      {0x0000b1c4, 0x00000000},
--      {0x0000b1c8, 0x00000000},
--      {0x0000b1cc, 0x00000000},
--      {0x0000b1d0, 0x00000000},
--      {0x0000b1d4, 0x00000000},
--      {0x0000b1d8, 0x00000000},
--      {0x0000b1dc, 0x00000000},
--      {0x0000b1e0, 0x00000000},
--      {0x0000b1e4, 0x00000000},
--      {0x0000b1e8, 0x00000000},
--      {0x0000b1ec, 0x00000000},
--      {0x0000b1f0, 0x00000396},
--      {0x0000b1f4, 0x00000396},
--      {0x0000b1f8, 0x00000396},
--      {0x0000b1fc, 0x00000196},
--};
--
--static const u32 ar9300Modes_low_ob_db_tx_gain_table_2p0[][5] = {
--      /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--      {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
--      {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--      {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
--      {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
--      {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
--      {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
--      {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
--      {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
--      {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
--      {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
--      {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
--      {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
--      {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
--      {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
--      {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
--      {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
--      {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
--      {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
--      {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
--      {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
--      {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
--      {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
--      {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
--      {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
--      {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
--      {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
--      {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
--      {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
--      {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
--      {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
--      {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
--      {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
--      {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
--      {0x0000a598, 0x21820220, 0x21820220, 0x16800402, 0x16800402},
--      {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
--      {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
--      {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
--      {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
--      {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
--      {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
--      {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
--      {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
--      {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
--      {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
--      {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
--      {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
--      {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x47801a83, 0x47801a83},
--      {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4a801c84, 0x4a801c84},
--      {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4e801ce3, 0x4e801ce3},
--      {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x52801ce5, 0x52801ce5},
--      {0x0000a5dc, 0x7086308c, 0x7086308c, 0x56801ce9, 0x56801ce9},
--      {0x0000a5e0, 0x738a308a, 0x738a308a, 0x5a801ceb, 0x5a801ceb},
--      {0x0000a5e4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5e8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5ec, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5f0, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5f4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5f8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x0000a5fc, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
--      {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
--      {0x00016048, 0x64000001, 0x64000001, 0x64000001, 0x64000001},
--      {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--      {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
--      {0x00016448, 0x64000001, 0x64000001, 0x64000001, 0x64000001},
--      {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--      {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
--      {0x00016848, 0x64000001, 0x64000001, 0x64000001, 0x64000001},
--      {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
--};
--
--static const u32 ar9300_2p0_mac_core[][2] = {
--      /* Addr      allmodes  */
--      {0x00000008, 0x00000000},
--      {0x00000030, 0x00020085},
--      {0x00000034, 0x00000005},
--      {0x00000040, 0x00000000},
--      {0x00000044, 0x00000000},
--      {0x00000048, 0x00000008},
--      {0x0000004c, 0x00000010},
--      {0x00000050, 0x00000000},
--      {0x00001040, 0x002ffc0f},
--      {0x00001044, 0x002ffc0f},
--      {0x00001048, 0x002ffc0f},
--      {0x0000104c, 0x002ffc0f},
--      {0x00001050, 0x002ffc0f},
--      {0x00001054, 0x002ffc0f},
--      {0x00001058, 0x002ffc0f},
--      {0x0000105c, 0x002ffc0f},
--      {0x00001060, 0x002ffc0f},
--      {0x00001064, 0x002ffc0f},
--      {0x000010f0, 0x00000100},
--      {0x00001270, 0x00000000},
--      {0x000012b0, 0x00000000},
--      {0x000012f0, 0x00000000},
--      {0x0000143c, 0x00000000},
--      {0x0000147c, 0x00000000},
--      {0x00008000, 0x00000000},
--      {0x00008004, 0x00000000},
--      {0x00008008, 0x00000000},
--      {0x0000800c, 0x00000000},
--      {0x00008018, 0x00000000},
--      {0x00008020, 0x00000000},
--      {0x00008038, 0x00000000},
--      {0x0000803c, 0x00000000},
--      {0x00008040, 0x00000000},
--      {0x00008044, 0x00000000},
--      {0x00008048, 0x00000000},
--      {0x0000804c, 0xffffffff},
--      {0x00008054, 0x00000000},
--      {0x00008058, 0x00000000},
--      {0x0000805c, 0x000fc78f},
--      {0x00008060, 0x0000000f},
--      {0x00008064, 0x00000000},
--      {0x00008070, 0x00000310},
--      {0x00008074, 0x00000020},
--      {0x00008078, 0x00000000},
--      {0x0000809c, 0x0000000f},
--      {0x000080a0, 0x00000000},
--      {0x000080a4, 0x02ff0000},
--      {0x000080a8, 0x0e070605},
--      {0x000080ac, 0x0000000d},
--      {0x000080b0, 0x00000000},
--      {0x000080b4, 0x00000000},
--      {0x000080b8, 0x00000000},
--      {0x000080bc, 0x00000000},
--      {0x000080c0, 0x2a800000},
--      {0x000080c4, 0x06900168},
--      {0x000080c8, 0x13881c20},
--      {0x000080cc, 0x01f40000},
--      {0x000080d0, 0x00252500},
--      {0x000080d4, 0x00a00000},
--      {0x000080d8, 0x00400000},
--      {0x000080dc, 0x00000000},
--      {0x000080e0, 0xffffffff},
--      {0x000080e4, 0x0000ffff},
--      {0x000080e8, 0x3f3f3f3f},
--      {0x000080ec, 0x00000000},
--      {0x000080f0, 0x00000000},
--      {0x000080f4, 0x00000000},
--      {0x000080fc, 0x00020000},
--      {0x00008100, 0x00000000},
--      {0x00008108, 0x00000052},
--      {0x0000810c, 0x00000000},
--      {0x00008110, 0x00000000},
--      {0x00008114, 0x000007ff},
--      {0x00008118, 0x000000aa},
--      {0x0000811c, 0x00003210},
--      {0x00008124, 0x00000000},
--      {0x00008128, 0x00000000},
--      {0x0000812c, 0x00000000},
--      {0x00008130, 0x00000000},
--      {0x00008134, 0x00000000},
--      {0x00008138, 0x00000000},
--      {0x0000813c, 0x0000ffff},
--      {0x00008144, 0xffffffff},
--      {0x00008168, 0x00000000},
--      {0x0000816c, 0x00000000},
--      {0x00008170, 0x18486200},
--      {0x00008174, 0x33332210},
--      {0x00008178, 0x00000000},
--      {0x0000817c, 0x00020000},
--      {0x000081c0, 0x00000000},
--      {0x000081c4, 0x33332210},
--      {0x000081c8, 0x00000000},
--      {0x000081cc, 0x00000000},
--      {0x000081d4, 0x00000000},
--      {0x000081ec, 0x00000000},
--      {0x000081f0, 0x00000000},
--      {0x000081f4, 0x00000000},
--      {0x000081f8, 0x00000000},
--      {0x000081fc, 0x00000000},
--      {0x00008240, 0x00100000},
--      {0x00008244, 0x0010f424},
--      {0x00008248, 0x00000800},
--      {0x0000824c, 0x0001e848},
--      {0x00008250, 0x00000000},
--      {0x00008254, 0x00000000},
--      {0x00008258, 0x00000000},
--      {0x0000825c, 0x40000000},
--      {0x00008260, 0x00080922},
--      {0x00008264, 0x98a00010},
--      {0x00008268, 0xffffffff},
--      {0x0000826c, 0x0000ffff},
--      {0x00008270, 0x00000000},
--      {0x00008274, 0x40000000},
--      {0x00008278, 0x003e4180},
--      {0x0000827c, 0x00000004},
--      {0x00008284, 0x0000002c},
--      {0x00008288, 0x0000002c},
--      {0x0000828c, 0x000000ff},
--      {0x00008294, 0x00000000},
--      {0x00008298, 0x00000000},
--      {0x0000829c, 0x00000000},
--      {0x00008300, 0x00000140},
--      {0x00008314, 0x00000000},
--      {0x0000831c, 0x0000010d},
--      {0x00008328, 0x00000000},
--      {0x0000832c, 0x00000007},
--      {0x00008330, 0x00000302},
--      {0x00008334, 0x00000700},
--      {0x00008338, 0x00ff0000},
--      {0x0000833c, 0x02400000},
--      {0x00008340, 0x000107ff},
--      {0x00008344, 0xaa48105b},
--      {0x00008348, 0x008f0000},
--      {0x0000835c, 0x00000000},
--      {0x00008360, 0xffffffff},
--      {0x00008364, 0xffffffff},
--      {0x00008368, 0x00000000},
--      {0x00008370, 0x00000000},
--      {0x00008374, 0x000000ff},
--      {0x00008378, 0x00000000},
--      {0x0000837c, 0x00000000},
--      {0x00008380, 0xffffffff},
--      {0x00008384, 0xffffffff},
--      {0x00008390, 0xffffffff},
--      {0x00008394, 0xffffffff},
--      {0x00008398, 0x00000000},
--      {0x0000839c, 0x00000000},
--      {0x000083a0, 0x00000000},
--      {0x000083a4, 0x0000fa14},
--      {0x000083a8, 0x000f0c00},
--      {0x000083ac, 0x33332210},
--      {0x000083b0, 0x33332210},
--      {0x000083b4, 0x33332210},
--      {0x000083b8, 0x33332210},
--      {0x000083bc, 0x00000000},
--      {0x000083c0, 0x00000000},
--      {0x000083c4, 0x00000000},
--      {0x000083c8, 0x00000000},
--      {0x000083cc, 0x00000200},
--      {0x000083d0, 0x000301ff},
--};
--
--static const u32 ar9300Common_wo_xlna_rx_gain_table_2p0[][2] = {
--      /* Addr      allmodes  */
--      {0x0000a000, 0x00010000},
--      {0x0000a004, 0x00030002},
--      {0x0000a008, 0x00050004},
--      {0x0000a00c, 0x00810080},
--      {0x0000a010, 0x00830082},
--      {0x0000a014, 0x01810180},
--      {0x0000a018, 0x01830182},
--      {0x0000a01c, 0x01850184},
--      {0x0000a020, 0x01890188},
--      {0x0000a024, 0x018b018a},
--      {0x0000a028, 0x018d018c},
--      {0x0000a02c, 0x03820190},
--      {0x0000a030, 0x03840383},
--      {0x0000a034, 0x03880385},
--      {0x0000a038, 0x038a0389},
--      {0x0000a03c, 0x038c038b},
--      {0x0000a040, 0x0390038d},
--      {0x0000a044, 0x03920391},
--      {0x0000a048, 0x03940393},
--      {0x0000a04c, 0x03960395},
--      {0x0000a050, 0x00000000},
--      {0x0000a054, 0x00000000},
--      {0x0000a058, 0x00000000},
--      {0x0000a05c, 0x00000000},
--      {0x0000a060, 0x00000000},
--      {0x0000a064, 0x00000000},
--      {0x0000a068, 0x00000000},
--      {0x0000a06c, 0x00000000},
--      {0x0000a070, 0x00000000},
--      {0x0000a074, 0x00000000},
--      {0x0000a078, 0x00000000},
--      {0x0000a07c, 0x00000000},
--      {0x0000a080, 0x29292929},
--      {0x0000a084, 0x29292929},
--      {0x0000a088, 0x29292929},
--      {0x0000a08c, 0x29292929},
--      {0x0000a090, 0x22292929},
--      {0x0000a094, 0x1d1d2222},
--      {0x0000a098, 0x0c111117},
--      {0x0000a09c, 0x00030303},
--      {0x0000a0a0, 0x00000000},
--      {0x0000a0a4, 0x00000000},
--      {0x0000a0a8, 0x00000000},
--      {0x0000a0ac, 0x00000000},
--      {0x0000a0b0, 0x00000000},
--      {0x0000a0b4, 0x00000000},
--      {0x0000a0b8, 0x00000000},
--      {0x0000a0bc, 0x00000000},
--      {0x0000a0c0, 0x001f0000},
--      {0x0000a0c4, 0x01000101},
--      {0x0000a0c8, 0x011e011f},
--      {0x0000a0cc, 0x011c011d},
--      {0x0000a0d0, 0x02030204},
--      {0x0000a0d4, 0x02010202},
--      {0x0000a0d8, 0x021f0200},
--      {0x0000a0dc, 0x0302021e},
--      {0x0000a0e0, 0x03000301},
--      {0x0000a0e4, 0x031e031f},
--      {0x0000a0e8, 0x0402031d},
--      {0x0000a0ec, 0x04000401},
--      {0x0000a0f0, 0x041e041f},
--      {0x0000a0f4, 0x0502041d},
--      {0x0000a0f8, 0x05000501},
--      {0x0000a0fc, 0x051e051f},
--      {0x0000a100, 0x06010602},
--      {0x0000a104, 0x061f0600},
--      {0x0000a108, 0x061d061e},
--      {0x0000a10c, 0x07020703},
--      {0x0000a110, 0x07000701},
--      {0x0000a114, 0x00000000},
--      {0x0000a118, 0x00000000},
--      {0x0000a11c, 0x00000000},
--      {0x0000a120, 0x00000000},
--      {0x0000a124, 0x00000000},
--      {0x0000a128, 0x00000000},
--      {0x0000a12c, 0x00000000},
--      {0x0000a130, 0x00000000},
--      {0x0000a134, 0x00000000},
--      {0x0000a138, 0x00000000},
--      {0x0000a13c, 0x00000000},
--      {0x0000a140, 0x001f0000},
--      {0x0000a144, 0x01000101},
--      {0x0000a148, 0x011e011f},
--      {0x0000a14c, 0x011c011d},
--      {0x0000a150, 0x02030204},
--      {0x0000a154, 0x02010202},
--      {0x0000a158, 0x021f0200},
--      {0x0000a15c, 0x0302021e},
--      {0x0000a160, 0x03000301},
--      {0x0000a164, 0x031e031f},
--      {0x0000a168, 0x0402031d},
--      {0x0000a16c, 0x04000401},
--      {0x0000a170, 0x041e041f},
--      {0x0000a174, 0x0502041d},
--      {0x0000a178, 0x05000501},
--      {0x0000a17c, 0x051e051f},
--      {0x0000a180, 0x06010602},
--      {0x0000a184, 0x061f0600},
--      {0x0000a188, 0x061d061e},
--      {0x0000a18c, 0x07020703},
--      {0x0000a190, 0x07000701},
--      {0x0000a194, 0x00000000},
--      {0x0000a198, 0x00000000},
--      {0x0000a19c, 0x00000000},
--      {0x0000a1a0, 0x00000000},
--      {0x0000a1a4, 0x00000000},
--      {0x0000a1a8, 0x00000000},
--      {0x0000a1ac, 0x00000000},
--      {0x0000a1b0, 0x00000000},
--      {0x0000a1b4, 0x00000000},
--      {0x0000a1b8, 0x00000000},
--      {0x0000a1bc, 0x00000000},
--      {0x0000a1c0, 0x00000000},
--      {0x0000a1c4, 0x00000000},
--      {0x0000a1c8, 0x00000000},
--      {0x0000a1cc, 0x00000000},
--      {0x0000a1d0, 0x00000000},
--      {0x0000a1d4, 0x00000000},
--      {0x0000a1d8, 0x00000000},
--      {0x0000a1dc, 0x00000000},
--      {0x0000a1e0, 0x00000000},
--      {0x0000a1e4, 0x00000000},
--      {0x0000a1e8, 0x00000000},
--      {0x0000a1ec, 0x00000000},
--      {0x0000a1f0, 0x00000396},
--      {0x0000a1f4, 0x00000396},
--      {0x0000a1f8, 0x00000396},
--      {0x0000a1fc, 0x00000196},
--      {0x0000b000, 0x00010000},
--      {0x0000b004, 0x00030002},
--      {0x0000b008, 0x00050004},
--      {0x0000b00c, 0x00810080},
--      {0x0000b010, 0x00830082},
--      {0x0000b014, 0x01810180},
--      {0x0000b018, 0x01830182},
--      {0x0000b01c, 0x01850184},
--      {0x0000b020, 0x02810280},
--      {0x0000b024, 0x02830282},
--      {0x0000b028, 0x02850284},
--      {0x0000b02c, 0x02890288},
--      {0x0000b030, 0x028b028a},
--      {0x0000b034, 0x0388028c},
--      {0x0000b038, 0x038a0389},
--      {0x0000b03c, 0x038c038b},
--      {0x0000b040, 0x0390038d},
--      {0x0000b044, 0x03920391},
--      {0x0000b048, 0x03940393},
--      {0x0000b04c, 0x03960395},
--      {0x0000b050, 0x00000000},
--      {0x0000b054, 0x00000000},
--      {0x0000b058, 0x00000000},
--      {0x0000b05c, 0x00000000},
--      {0x0000b060, 0x00000000},
--      {0x0000b064, 0x00000000},
--      {0x0000b068, 0x00000000},
--      {0x0000b06c, 0x00000000},
--      {0x0000b070, 0x00000000},
--      {0x0000b074, 0x00000000},
--      {0x0000b078, 0x00000000},
--      {0x0000b07c, 0x00000000},
--      {0x0000b080, 0x32323232},
--      {0x0000b084, 0x2f2f3232},
--      {0x0000b088, 0x23282a2d},
--      {0x0000b08c, 0x1c1e2123},
--      {0x0000b090, 0x14171919},
--      {0x0000b094, 0x0e0e1214},
--      {0x0000b098, 0x03050707},
--      {0x0000b09c, 0x00030303},
--      {0x0000b0a0, 0x00000000},
--      {0x0000b0a4, 0x00000000},
--      {0x0000b0a8, 0x00000000},
--      {0x0000b0ac, 0x00000000},
--      {0x0000b0b0, 0x00000000},
--      {0x0000b0b4, 0x00000000},
--      {0x0000b0b8, 0x00000000},
--      {0x0000b0bc, 0x00000000},
--      {0x0000b0c0, 0x003f0020},
--      {0x0000b0c4, 0x00400041},
--      {0x0000b0c8, 0x0140005f},
--      {0x0000b0cc, 0x0160015f},
--      {0x0000b0d0, 0x017e017f},
--      {0x0000b0d4, 0x02410242},
--      {0x0000b0d8, 0x025f0240},
--      {0x0000b0dc, 0x027f0260},
--      {0x0000b0e0, 0x0341027e},
--      {0x0000b0e4, 0x035f0340},
--      {0x0000b0e8, 0x037f0360},
--      {0x0000b0ec, 0x04400441},
--      {0x0000b0f0, 0x0460045f},
--      {0x0000b0f4, 0x0541047f},
--      {0x0000b0f8, 0x055f0540},
--      {0x0000b0fc, 0x057f0560},
--      {0x0000b100, 0x06400641},
--      {0x0000b104, 0x0660065f},
--      {0x0000b108, 0x067e067f},
--      {0x0000b10c, 0x07410742},
--      {0x0000b110, 0x075f0740},
--      {0x0000b114, 0x077f0760},
--      {0x0000b118, 0x07800781},
--      {0x0000b11c, 0x07a0079f},
--      {0x0000b120, 0x07c107bf},
--      {0x0000b124, 0x000007c0},
--      {0x0000b128, 0x00000000},
--      {0x0000b12c, 0x00000000},
--      {0x0000b130, 0x00000000},
--      {0x0000b134, 0x00000000},
--      {0x0000b138, 0x00000000},
--      {0x0000b13c, 0x00000000},
--      {0x0000b140, 0x003f0020},
--      {0x0000b144, 0x00400041},
--      {0x0000b148, 0x0140005f},
--      {0x0000b14c, 0x0160015f},
--      {0x0000b150, 0x017e017f},
--      {0x0000b154, 0x02410242},
--      {0x0000b158, 0x025f0240},
--      {0x0000b15c, 0x027f0260},
--      {0x0000b160, 0x0341027e},
--      {0x0000b164, 0x035f0340},
--      {0x0000b168, 0x037f0360},
--      {0x0000b16c, 0x04400441},
--      {0x0000b170, 0x0460045f},
--      {0x0000b174, 0x0541047f},
--      {0x0000b178, 0x055f0540},
--      {0x0000b17c, 0x057f0560},
--      {0x0000b180, 0x06400641},
--      {0x0000b184, 0x0660065f},
--      {0x0000b188, 0x067e067f},
--      {0x0000b18c, 0x07410742},
--      {0x0000b190, 0x075f0740},
--      {0x0000b194, 0x077f0760},
--      {0x0000b198, 0x07800781},
--      {0x0000b19c, 0x07a0079f},
--      {0x0000b1a0, 0x07c107bf},
--      {0x0000b1a4, 0x000007c0},
--      {0x0000b1a8, 0x00000000},
--      {0x0000b1ac, 0x00000000},
--      {0x0000b1b0, 0x00000000},
--      {0x0000b1b4, 0x00000000},
--      {0x0000b1b8, 0x00000000},
--      {0x0000b1bc, 0x00000000},
--      {0x0000b1c0, 0x00000000},
--      {0x0000b1c4, 0x00000000},
--      {0x0000b1c8, 0x00000000},
--      {0x0000b1cc, 0x00000000},
--      {0x0000b1d0, 0x00000000},
--      {0x0000b1d4, 0x00000000},
--      {0x0000b1d8, 0x00000000},
--      {0x0000b1dc, 0x00000000},
--      {0x0000b1e0, 0x00000000},
--      {0x0000b1e4, 0x00000000},
--      {0x0000b1e8, 0x00000000},
--      {0x0000b1ec, 0x00000000},
--      {0x0000b1f0, 0x00000396},
--      {0x0000b1f4, 0x00000396},
--      {0x0000b1f8, 0x00000396},
--      {0x0000b1fc, 0x00000196},
--};
--
--static const u32 ar9300_2p0_soc_preamble[][2] = {
--      /* Addr      allmodes  */
--      {0x000040a4, 0x00a0c1c9},
--      {0x00007008, 0x00000000},
--      {0x00007020, 0x00000000},
--      {0x00007034, 0x00000002},
--      {0x00007038, 0x000004c2},
--};
--
--static const u32 ar9300PciePhy_pll_on_clkreq_disable_L1_2p0[][2] = {
--      /* Addr      allmodes  */
--      {0x00004040, 0x08212e5e},
--      {0x00004040, 0x0008003b},
--      {0x00004044, 0x00000000},
--};
--
--static const u32 ar9300PciePhy_clkreq_enable_L1_2p0[][2] = {
--      /* Addr      allmodes  */
--      {0x00004040, 0x08253e5e},
--      {0x00004040, 0x0008003b},
--      {0x00004044, 0x00000000},
--};
--
--static const u32 ar9300PciePhy_clkreq_disable_L1_2p0[][2] = {
--      /* Addr      allmodes  */
--      {0x00004040, 0x08213e5e},
--      {0x00004040, 0x0008003b},
--      {0x00004044, 0x00000000},
--};
--
--#endif /* INITVALS_9003_H */
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -90,6 +90,8 @@ static bool ar9003_hw_get_isr(struct ath
-                                 MAP_ISR_S2_CST);
-                       mask2 |= ((isr2 & AR_ISR_S2_TSFOOR) >>
-                                 MAP_ISR_S2_TSFOOR);
-+                      mask2 |= ((isr2 & AR_ISR_S2_BB_WATCHDOG) >>
-+                                MAP_ISR_S2_BB_WATCHDOG);
- 
-                       if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
-                               REG_WRITE(ah, AR_ISR_S2, isr2);
-@@ -167,6 +169,9 @@ static bool ar9003_hw_get_isr(struct ath
- 
-                       (void) REG_READ(ah, AR_ISR);
-               }
-+
-+              if (*masked & ATH9K_INT_BB_WATCHDOG)
-+                      ar9003_hw_bb_watchdog_read(ah);
-       }
- 
-       if (sync_cause) {
-@@ -229,7 +234,8 @@ static void ar9003_hw_fill_txdesc(struct
- }
- 
- static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
--                               struct ath_tx_status *ts)
-+                               struct ath_tx_status *ts,
-+                               void *txs_desc)
- {
-       struct ar9003_txs *ads;
- 
-@@ -300,6 +306,7 @@ static int ar9003_hw_proc_txdesc(struct 
- 
-       ts->tid = MS(ads->status8, AR_TxTid);
- 
-+      memcpy(txs_desc, ads, sizeof(*ads));
-       memset(ads, 0, sizeof(*ads));
- 
-       return 0;
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
-@@ -47,6 +47,7 @@
- #define MAP_ISR_S2_DTIMSYNC     7
- #define MAP_ISR_S2_DTIM         7
- #define MAP_ISR_S2_TSFOOR       4
-+#define MAP_ISR_S2_BB_WATCHDOG  6
- 
- #define AR9003TXC_CONST(_ds) ((const struct ar9003_txc *) _ds)
- 
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -1132,3 +1132,122 @@ void ar9003_hw_attach_phy_ops(struct ath
-       priv_ops->do_getnf = ar9003_hw_do_getnf;
-       priv_ops->loadnf = ar9003_hw_loadnf;
- }
-+
-+void ar9003_hw_bb_watchdog_config(struct ath_hw *ah)
-+{
-+      struct ath_common *common = ath9k_hw_common(ah);
-+      u32 idle_tmo_ms = ah->bb_watchdog_timeout_ms;
-+      u32 val, idle_count;
-+
-+      if (!idle_tmo_ms) {
-+              /* disable IRQ, disable chip-reset for BB panic */
-+              REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_2,
-+                        REG_READ(ah, AR_PHY_WATCHDOG_CTL_2) &
-+                        ~(AR_PHY_WATCHDOG_RST_ENABLE |
-+                          AR_PHY_WATCHDOG_IRQ_ENABLE));
-+
-+              /* disable watchdog in non-IDLE mode, disable in IDLE mode */
-+              REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_1,
-+                        REG_READ(ah, AR_PHY_WATCHDOG_CTL_1) &
-+                        ~(AR_PHY_WATCHDOG_NON_IDLE_ENABLE |
-+                          AR_PHY_WATCHDOG_IDLE_ENABLE));
-+
-+              ath_print(common, ATH_DBG_RESET, "Disabled BB Watchdog\n");
-+              return;
-+      }
-+
-+      /* enable IRQ, disable chip-reset for BB watchdog */
-+      val = REG_READ(ah, AR_PHY_WATCHDOG_CTL_2) & AR_PHY_WATCHDOG_CNTL2_MASK;
-+      REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_2,
-+                (val | AR_PHY_WATCHDOG_IRQ_ENABLE) &
-+                ~AR_PHY_WATCHDOG_RST_ENABLE);
-+
-+      /* bound limit to 10 secs */
-+      if (idle_tmo_ms > 10000)
-+              idle_tmo_ms = 10000;
-+
-+      /*
-+       * The time unit for watchdog event is 2^15 44/88MHz cycles.
-+       *
-+       * For HT20 we have a time unit of 2^15/44 MHz = .74 ms per tick
-+       * For HT40 we have a time unit of 2^15/88 MHz = .37 ms per tick
-+       *
-+       * Given we use fast clock now in 5 GHz, these time units should
-+       * be common for both 2 GHz and 5 GHz.
-+       */
-+      idle_count = (100 * idle_tmo_ms) / 74;
-+      if (ah->curchan && IS_CHAN_HT40(ah->curchan))
-+              idle_count = (100 * idle_tmo_ms) / 37;
-+
-+      /*
-+       * enable watchdog in non-IDLE mode, disable in IDLE mode,
-+       * set idle time-out.
-+       */
-+      REG_WRITE(ah, AR_PHY_WATCHDOG_CTL_1,
-+                AR_PHY_WATCHDOG_NON_IDLE_ENABLE |
-+                AR_PHY_WATCHDOG_IDLE_MASK |
-+                (AR_PHY_WATCHDOG_NON_IDLE_MASK & (idle_count << 2)));
-+
-+      ath_print(common, ATH_DBG_RESET,
-+                "Enabled BB Watchdog timeout (%u ms)\n",
-+                idle_tmo_ms);
-+}
-+
-+void ar9003_hw_bb_watchdog_read(struct ath_hw *ah)
-+{
-+      /*
-+       * we want to avoid printing in ISR context so we save the
-+       * watchdog status to be printed later in bottom half context.
-+       */
-+      ah->bb_watchdog_last_status = REG_READ(ah, AR_PHY_WATCHDOG_STATUS);
-+
-+      /*
-+       * the watchdog timer should reset on status read but to be sure
-+       * sure we write 0 to the watchdog status bit.
-+       */
-+      REG_WRITE(ah, AR_PHY_WATCHDOG_STATUS,
-+                ah->bb_watchdog_last_status & ~AR_PHY_WATCHDOG_STATUS_CLR);
-+}
-+
-+void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah)
-+{
-+      struct ath_common *common = ath9k_hw_common(ah);
-+      u32 rxc_pcnt = 0, rxf_pcnt = 0, txf_pcnt = 0, status;
-+
-+      if (likely(!(common->debug_mask & ATH_DBG_RESET)))
-+              return;
-+
-+      status = ah->bb_watchdog_last_status;
-+      ath_print(common, ATH_DBG_RESET,
-+                "\n==== BB update: BB status=0x%08x ====\n", status);
-+      ath_print(common, ATH_DBG_RESET,
-+                "** BB state: wd=%u det=%u rdar=%u rOFDM=%d "
-+                "rCCK=%u tOFDM=%u tCCK=%u agc=%u src=%u **\n",
-+                MS(status, AR_PHY_WATCHDOG_INFO),
-+                MS(status, AR_PHY_WATCHDOG_DET_HANG),
-+                MS(status, AR_PHY_WATCHDOG_RADAR_SM),
-+                MS(status, AR_PHY_WATCHDOG_RX_OFDM_SM),
-+                MS(status, AR_PHY_WATCHDOG_RX_CCK_SM),
-+                MS(status, AR_PHY_WATCHDOG_TX_OFDM_SM),
-+                MS(status, AR_PHY_WATCHDOG_TX_CCK_SM),
-+                MS(status, AR_PHY_WATCHDOG_AGC_SM),
-+                MS(status,AR_PHY_WATCHDOG_SRCH_SM));
-+
-+      ath_print(common, ATH_DBG_RESET,
-+                "** BB WD cntl: cntl1=0x%08x cntl2=0x%08x **\n",
-+                REG_READ(ah, AR_PHY_WATCHDOG_CTL_1),
-+                REG_READ(ah, AR_PHY_WATCHDOG_CTL_2));
-+      ath_print(common, ATH_DBG_RESET,
-+                "** BB mode: BB_gen_controls=0x%08x **\n",
-+                REG_READ(ah, AR_PHY_GEN_CTRL));
-+
-+      if (ath9k_hw_GetMibCycleCountsPct(ah, &rxc_pcnt, &rxf_pcnt, &txf_pcnt))
-+              ath_print(common, ATH_DBG_RESET,
-+                        "** BB busy times: rx_clear=%d%%, "
-+                        "rx_frame=%d%%, tx_frame=%d%% **\n",
-+                        rxc_pcnt, rxf_pcnt, txf_pcnt);
-+
-+      ath_print(common, ATH_DBG_RESET,
-+                "==== BB update: done ====\n\n");
-+}
-+EXPORT_SYMBOL(ar9003_hw_bb_watchdog_dbg_info);
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -483,10 +483,10 @@
- #define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + 0x48c)
- #define AR_PHY_TX_IQCAL_CORR_COEFF_01_B0    (AR_SM_BASE + 0x450)
- 
--#define AR_PHY_PANIC_WD_STATUS      (AR_SM_BASE + 0x5c0)
--#define AR_PHY_PANIC_WD_CTL_1       (AR_SM_BASE + 0x5c4)
--#define AR_PHY_PANIC_WD_CTL_2       (AR_SM_BASE + 0x5c8)
--#define AR_PHY_BT_CTL               (AR_SM_BASE + 0x5cc)
-+#define AR_PHY_WATCHDOG_STATUS      (AR_SM_BASE + 0x5c0)
-+#define AR_PHY_WATCHDOG_CTL_1       (AR_SM_BASE + 0x5c4)
-+#define AR_PHY_WATCHDOG_CTL_2       (AR_SM_BASE + 0x5c8)
-+#define AR_PHY_WATCHDOG_CTL         (AR_SM_BASE + 0x5cc)
- #define AR_PHY_ONLY_WARMRESET       (AR_SM_BASE + 0x5d0)
- #define AR_PHY_ONLY_CTL             (AR_SM_BASE + 0x5d4)
- #define AR_PHY_ECO_CTRL             (AR_SM_BASE + 0x5dc)
-@@ -812,35 +812,35 @@
- #define AR_PHY_CAL_MEAS_2_9300_10(_i) (AR_PHY_IQ_ADC_MEAS_2_B0_9300_10 + (AR_PHY_CHAIN_OFFSET * (_i)))
- #define AR_PHY_CAL_MEAS_3_9300_10(_i) (AR_PHY_IQ_ADC_MEAS_3_B0_9300_10 + (AR_PHY_CHAIN_OFFSET * (_i)))
- 
--#define AR_PHY_BB_PANIC_NON_IDLE_ENABLE 0x00000001
--#define AR_PHY_BB_PANIC_IDLE_ENABLE     0x00000002
--#define AR_PHY_BB_PANIC_IDLE_MASK       0xFFFF0000
--#define AR_PHY_BB_PANIC_NON_IDLE_MASK   0x0000FFFC
--
--#define AR_PHY_BB_PANIC_RST_ENABLE      0x00000002
--#define AR_PHY_BB_PANIC_IRQ_ENABLE      0x00000004
--#define AR_PHY_BB_PANIC_CNTL2_MASK      0xFFFFFFF9
--
--#define AR_PHY_BB_WD_STATUS             0x00000007
--#define AR_PHY_BB_WD_STATUS_S           0
--#define AR_PHY_BB_WD_DET_HANG           0x00000008
--#define AR_PHY_BB_WD_DET_HANG_S         3
--#define AR_PHY_BB_WD_RADAR_SM           0x000000F0
--#define AR_PHY_BB_WD_RADAR_SM_S         4
--#define AR_PHY_BB_WD_RX_OFDM_SM         0x00000F00
--#define AR_PHY_BB_WD_RX_OFDM_SM_S       8
--#define AR_PHY_BB_WD_RX_CCK_SM          0x0000F000
--#define AR_PHY_BB_WD_RX_CCK_SM_S        12
--#define AR_PHY_BB_WD_TX_OFDM_SM         0x000F0000
--#define AR_PHY_BB_WD_TX_OFDM_SM_S       16
--#define AR_PHY_BB_WD_TX_CCK_SM          0x00F00000
--#define AR_PHY_BB_WD_TX_CCK_SM_S        20
--#define AR_PHY_BB_WD_AGC_SM             0x0F000000
--#define AR_PHY_BB_WD_AGC_SM_S           24
--#define AR_PHY_BB_WD_SRCH_SM            0xF0000000
--#define AR_PHY_BB_WD_SRCH_SM_S          28
-+#define AR_PHY_WATCHDOG_NON_IDLE_ENABLE    0x00000001
-+#define AR_PHY_WATCHDOG_IDLE_ENABLE        0x00000002
-+#define AR_PHY_WATCHDOG_IDLE_MASK          0xFFFF0000
-+#define AR_PHY_WATCHDOG_NON_IDLE_MASK      0x0000FFFC
-+
-+#define AR_PHY_WATCHDOG_RST_ENABLE         0x00000002
-+#define AR_PHY_WATCHDOG_IRQ_ENABLE         0x00000004
-+#define AR_PHY_WATCHDOG_CNTL2_MASK         0xFFFFFFF9
-+
-+#define AR_PHY_WATCHDOG_INFO               0x00000007
-+#define AR_PHY_WATCHDOG_INFO_S             0
-+#define AR_PHY_WATCHDOG_DET_HANG           0x00000008
-+#define AR_PHY_WATCHDOG_DET_HANG_S         3
-+#define AR_PHY_WATCHDOG_RADAR_SM           0x000000F0
-+#define AR_PHY_WATCHDOG_RADAR_SM_S         4
-+#define AR_PHY_WATCHDOG_RX_OFDM_SM         0x00000F00
-+#define AR_PHY_WATCHDOG_RX_OFDM_SM_S       8
-+#define AR_PHY_WATCHDOG_RX_CCK_SM          0x0000F000
-+#define AR_PHY_WATCHDOG_RX_CCK_SM_S        12
-+#define AR_PHY_WATCHDOG_TX_OFDM_SM         0x000F0000
-+#define AR_PHY_WATCHDOG_TX_OFDM_SM_S       16
-+#define AR_PHY_WATCHDOG_TX_CCK_SM          0x00F00000
-+#define AR_PHY_WATCHDOG_TX_CCK_SM_S        20
-+#define AR_PHY_WATCHDOG_AGC_SM             0x0F000000
-+#define AR_PHY_WATCHDOG_AGC_SM_S           24
-+#define AR_PHY_WATCHDOG_SRCH_SM            0xF0000000
-+#define AR_PHY_WATCHDOG_SRCH_SM_S          28
- 
--#define AR_PHY_BB_WD_STATUS_CLR         0x00000008
-+#define AR_PHY_WATCHDOG_STATUS_CLR         0x00000008
- 
- void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
- 
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -23,6 +23,7 @@
- 
- #include "debug.h"
- #include "common.h"
-+#include "pktlog.h"
- 
- /*
-  * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
-@@ -206,6 +207,69 @@ struct ath_txq {
-       u8 txq_tailidx;
- };
- 
-+struct ath_atx_ac {
-+      int sched;
-+      int qnum;
-+      struct list_head list;
-+      struct list_head tid_q;
-+};
-+
-+struct ath_buf_state {
-+      int bfs_nframes;
-+      u16 bfs_al;
-+      u16 bfs_frmlen;
-+      int bfs_seqno;
-+      int bfs_tidno;
-+      int bfs_retries;
-+      u8 bf_type;
-+      u32 bfs_keyix;
-+      enum ath9k_key_type bfs_keytype;
-+};
-+
-+struct ath_buf {
-+      struct list_head list;
-+      struct ath_buf *bf_lastbf;      /* last buf of this unit (a frame or
-+                                         an aggregate) */
-+      struct ath_buf *bf_next;        /* next subframe in the aggregate */
-+      struct sk_buff *bf_mpdu;        /* enclosing frame structure */
-+      void *bf_desc;                  /* virtual addr of desc */
-+      dma_addr_t bf_daddr;            /* physical addr of desc */
-+      dma_addr_t bf_buf_addr;         /* physical addr of data buffer */
-+      bool bf_stale;
-+      bool bf_isnullfunc;
-+      bool bf_tx_aborted;
-+      u16 bf_flags;
-+      struct ath_buf_state bf_state;
-+      dma_addr_t bf_dmacontext;
-+      struct ath_wiphy *aphy;
-+};
-+
-+struct ath_atx_tid {
-+      struct list_head list;
-+      struct list_head buf_q;
-+      struct ath_node *an;
-+      struct ath_atx_ac *ac;
-+      struct ath_buf *tx_buf[ATH_TID_MAX_BUFS];
-+      u16 seq_start;
-+      u16 seq_next;
-+      u16 baw_size;
-+      int tidno;
-+      int baw_head;   /* first un-acked tx buffer */
-+      int baw_tail;   /* next unused tx buffer slot */
-+      int sched;
-+      int paused;
-+      u8 state;
-+};
-+
-+struct ath_node {
-+      struct ath_common *common;
-+      struct ath_atx_tid tid[WME_NUM_TID];
-+      struct ath_atx_ac ac[WME_NUM_AC];
-+      u16 maxampdu;
-+      u8 mpdudensity;
-+      int last_rssi;
-+};
-+
- #define AGGR_CLEANUP         BIT(1)
- #define AGGR_ADDBA_COMPLETE  BIT(2)
- #define AGGR_ADDBA_PROGRESS  BIT(3)
-@@ -446,6 +510,7 @@ void ath_deinit_leds(struct ath_softc *s
- #define SC_OP_TSF_RESET              BIT(11)
- #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
- #define SC_OP_BT_SCAN              BIT(13)
-+#define SC_OP_PKTLOGGING           BIT(14)
- 
- /* Powersave flags */
- #define PS_WAIT_FOR_BEACON        BIT(0)
-@@ -523,6 +588,10 @@ struct ath_softc {
- #ifdef CONFIG_ATH9K_DEBUGFS
-       struct ath9k_debug debug;
- #endif
-+#ifdef CONFIG_ATH9K_PKTLOG
-+      struct ath_pktlog_debugfs pktlog;
-+#endif
-+      bool is_pkt_logging;
-       struct ath_beacon_config cur_beacon_conf;
-       struct delayed_work tx_complete_work;
-       struct ath_btcoex btcoex;
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -76,22 +76,13 @@ static void ath_beacon_setup(struct ath_
-       ds = bf->bf_desc;
-       flags = ATH9K_TXDESC_NOACK;
- 
--      if (((sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC) ||
--           (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) &&
--          (ah->caps.hw_caps & ATH9K_HW_CAP_VEOL)) {
--              ds->ds_link = bf->bf_daddr; /* self-linked */
--              flags |= ATH9K_TXDESC_VEOL;
--              /* Let hardware handle antenna switching. */
--              antenna = 0;
--      } else {
--              ds->ds_link = 0;
--              /*
--               * Switch antenna every beacon.
--               * Should only switch every beacon period, not for every SWBA
--               * XXX assumes two antennae
--               */
--              antenna = ((sc->beacon.ast_be_xmit / sc->nbcnvifs) & 1 ? 2 : 1);
--      }
-+      ds->ds_link = 0;
-+      /*
-+       * Switch antenna every beacon.
-+       * Should only switch every beacon period, not for every SWBA
-+       * XXX assumes two antennae
-+       */
-+      antenna = ((sc->beacon.ast_be_xmit / sc->nbcnvifs) & 1 ? 2 : 1);
- 
-       sband = &sc->sbands[common->hw->conf.channel->band];
-       rate = sband->bitrates[rateidx].hw_value;
-@@ -215,36 +206,6 @@ static struct ath_buf *ath_beacon_genera
-       return bf;
- }
- 
--/*
-- * Startup beacon transmission for adhoc mode when they are sent entirely
-- * by the hardware using the self-linked descriptor + veol trick.
--*/
--static void ath_beacon_start_adhoc(struct ath_softc *sc,
--                                 struct ieee80211_vif *vif)
--{
--      struct ath_hw *ah = sc->sc_ah;
--      struct ath_common *common = ath9k_hw_common(ah);
--      struct ath_buf *bf;
--      struct ath_vif *avp;
--      struct sk_buff *skb;
--
--      avp = (void *)vif->drv_priv;
--
--      if (avp->av_bcbuf == NULL)
--              return;
--
--      bf = avp->av_bcbuf;
--      skb = bf->bf_mpdu;
--
--      ath_beacon_setup(sc, avp, bf, 0);
--
--      /* NB: caller is known to have already stopped tx dma */
--      ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bf->bf_daddr);
--      ath9k_hw_txstart(ah, sc->beacon.beaconq);
--      ath_print(common, ATH_DBG_BEACON, "TXDP%u = %llx (%p)\n",
--                sc->beacon.beaconq, ito64(bf->bf_daddr), bf->bf_desc);
--}
--
- int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif)
- {
-       struct ath_softc *sc = aphy->sc;
-@@ -265,7 +226,8 @@ int ath_beacon_alloc(struct ath_wiphy *a
-               list_del(&avp->av_bcbuf->list);
- 
-               if (sc->sc_ah->opmode == NL80211_IFTYPE_AP ||
--                  !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_VEOL)) {
-+                  sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC ||
-+                  sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT) {
-                       int slot;
-                       /*
-                        * Assign the vif to a beacon xmit slot. As
-@@ -274,17 +236,11 @@ int ath_beacon_alloc(struct ath_wiphy *a
-                       avp->av_bslot = 0;
-                       for (slot = 0; slot < ATH_BCBUF; slot++)
-                               if (sc->beacon.bslot[slot] == NULL) {
--                                      /*
--                                       * XXX hack, space out slots to better
--                                       * deal with misses
--                                       */
--                                      if (slot+1 < ATH_BCBUF &&
--                                          sc->beacon.bslot[slot+1] == NULL) {
--                                              avp->av_bslot = slot+1;
--                                              break;
--                                      }
-                                       avp->av_bslot = slot;
-+
-                                       /* 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;
-@@ -721,8 +677,7 @@ static void ath_beacon_config_adhoc(stru
-        * self-linked tx descriptor and let the hardware deal with things.
-        */
-       intval |= ATH9K_BEACON_ENA;
--      if (!(ah->caps.hw_caps & ATH9K_HW_CAP_VEOL))
--              ah->imask |= ATH9K_INT_SWBA;
-+      ah->imask |= ATH9K_INT_SWBA;
- 
-       ath_beaconq_config(sc);
- 
-@@ -732,10 +687,6 @@ static void ath_beacon_config_adhoc(stru
-       ath9k_beacon_init(sc, nexttbtt, intval);
-       sc->beacon.bmisscnt = 0;
-       ath9k_hw_set_interrupts(ah, ah->imask);
--
--      /* FIXME: Handle properly when vif is NULL */
--      if (vif && ah->caps.hw_caps & ATH9K_HW_CAP_VEOL)
--              ath_beacon_start_adhoc(sc, vif);
- }
- 
- void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif)
---- a/drivers/net/wireless/ath/ath9k/common.c
-+++ b/drivers/net/wireless/ath/ath9k/common.c
-@@ -27,270 +27,6 @@ MODULE_AUTHOR("Atheros Communications");
- MODULE_DESCRIPTION("Shared library for Atheros wireless 802.11n LAN cards.");
- MODULE_LICENSE("Dual BSD/GPL");
- 
--/* Common RX processing */
--
--/* Assumes you've already done the endian to CPU conversion */
--static bool ath9k_rx_accept(struct ath_common *common,
--                          struct sk_buff *skb,
--                          struct ieee80211_rx_status *rxs,
--                          struct ath_rx_status *rx_stats,
--                          bool *decrypt_error)
--{
--      struct ath_hw *ah = common->ah;
--      struct ieee80211_hdr *hdr;
--      __le16 fc;
--
--      hdr = (struct ieee80211_hdr *) skb->data;
--      fc = hdr->frame_control;
--
--      if (!rx_stats->rs_datalen)
--              return false;
--        /*
--         * rs_status follows rs_datalen so if rs_datalen is too large
--         * we can take a hint that hardware corrupted it, so ignore
--         * those frames.
--         */
--      if (rx_stats->rs_datalen > common->rx_bufsize)
--              return false;
--
--      /*
--       * rs_more indicates chained descriptors which can be used
--       * to link buffers together for a sort of scatter-gather
--       * operation.
--       * reject the frame, we don't support scatter-gather yet and
--       * the frame is probably corrupt anyway
--       */
--      if (rx_stats->rs_more)
--              return false;
--
--      /*
--       * The rx_stats->rs_status will not be set until the end of the
--       * chained descriptors so it can be ignored if rs_more is set. The
--       * rs_more will be false at the last element of the chained
--       * descriptors.
--       */
--      if (rx_stats->rs_status != 0) {
--              if (rx_stats->rs_status & ATH9K_RXERR_CRC)
--                      rxs->flag |= RX_FLAG_FAILED_FCS_CRC;
--              if (rx_stats->rs_status & ATH9K_RXERR_PHY)
--                      return false;
--
--              if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) {
--                      *decrypt_error = true;
--              } else if (rx_stats->rs_status & ATH9K_RXERR_MIC) {
--                      if (ieee80211_is_ctl(fc))
--                              /*
--                               * Sometimes, we get invalid
--                               * MIC failures on valid control frames.
--                               * Remove these mic errors.
--                               */
--                              rx_stats->rs_status &= ~ATH9K_RXERR_MIC;
--                      else
--                              rxs->flag |= RX_FLAG_MMIC_ERROR;
--              }
--              /*
--               * Reject error frames with the exception of
--               * decryption and MIC failures. For monitor mode,
--               * we also ignore the CRC error.
--               */
--              if (ah->opmode == NL80211_IFTYPE_MONITOR) {
--                      if (rx_stats->rs_status &
--                          ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC |
--                            ATH9K_RXERR_CRC))
--                              return false;
--              } else {
--                      if (rx_stats->rs_status &
--                          ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC)) {
--                              return false;
--                      }
--              }
--      }
--      return true;
--}
--
--static int ath9k_process_rate(struct ath_common *common,
--                            struct ieee80211_hw *hw,
--                            struct ath_rx_status *rx_stats,
--                            struct ieee80211_rx_status *rxs,
--                            struct sk_buff *skb)
--{
--      struct ieee80211_supported_band *sband;
--      enum ieee80211_band band;
--      unsigned int i = 0;
--
--      band = hw->conf.channel->band;
--      sband = hw->wiphy->bands[band];
--
--      if (rx_stats->rs_rate & 0x80) {
--              /* HT rate */
--              rxs->flag |= RX_FLAG_HT;
--              if (rx_stats->rs_flags & ATH9K_RX_2040)
--                      rxs->flag |= RX_FLAG_40MHZ;
--              if (rx_stats->rs_flags & ATH9K_RX_GI)
--                      rxs->flag |= RX_FLAG_SHORT_GI;
--              rxs->rate_idx = rx_stats->rs_rate & 0x7f;
--              return 0;
--      }
--
--      for (i = 0; i < sband->n_bitrates; i++) {
--              if (sband->bitrates[i].hw_value == rx_stats->rs_rate) {
--                      rxs->rate_idx = i;
--                      return 0;
--              }
--              if (sband->bitrates[i].hw_value_short == rx_stats->rs_rate) {
--                      rxs->flag |= RX_FLAG_SHORTPRE;
--                      rxs->rate_idx = i;
--                      return 0;
--              }
--      }
--
--      /*
--       * No valid hardware bitrate found -- we should not get here
--       * because hardware has already validated this frame as OK.
--       */
--      ath_print(common, ATH_DBG_XMIT, "unsupported hw bitrate detected "
--                "0x%02x using 1 Mbit\n", rx_stats->rs_rate);
--      if ((common->debug_mask & ATH_DBG_XMIT))
--              print_hex_dump_bytes("", DUMP_PREFIX_NONE, skb->data, skb->len);
--
--      return -EINVAL;
--}
--
--static void ath9k_process_rssi(struct ath_common *common,
--                             struct ieee80211_hw *hw,
--                             struct sk_buff *skb,
--                             struct ath_rx_status *rx_stats)
--{
--      struct ath_hw *ah = common->ah;
--      struct ieee80211_sta *sta;
--      struct ieee80211_hdr *hdr;
--      struct ath_node *an;
--      int last_rssi = ATH_RSSI_DUMMY_MARKER;
--      __le16 fc;
--
--      hdr = (struct ieee80211_hdr *)skb->data;
--      fc = hdr->frame_control;
--
--      rcu_read_lock();
--      /*
--       * XXX: use ieee80211_find_sta! This requires quite a bit of work
--       * under the current ath9k virtual wiphy implementation as we have
--       * no way of tying a vif to wiphy. Typically vifs are attached to
--       * at least one sdata of a wiphy on mac80211 but with ath9k virtual
--       * wiphy you'd have to iterate over every wiphy and each sdata.
--       */
--      sta = ieee80211_find_sta_by_hw(hw, hdr->addr2);
--      if (sta) {
--              an = (struct ath_node *) sta->drv_priv;
--              if (rx_stats->rs_rssi != ATH9K_RSSI_BAD &&
--                 !rx_stats->rs_moreaggr)
--                      ATH_RSSI_LPF(an->last_rssi, rx_stats->rs_rssi);
--              last_rssi = an->last_rssi;
--      }
--      rcu_read_unlock();
--
--      if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
--              rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
--                                            ATH_RSSI_EP_MULTIPLIER);
--      if (rx_stats->rs_rssi < 0)
--              rx_stats->rs_rssi = 0;
--
--      /* Update Beacon RSSI, this is used by ANI. */
--      if (ieee80211_is_beacon(fc))
--              ah->stats.avgbrssi = rx_stats->rs_rssi;
--}
--
--/*
-- * For Decrypt or Demic errors, we only mark packet status here and always push
-- * up the frame up to let mac80211 handle the actual error case, be it no
-- * decryption key or real decryption error. This let us keep statistics there.
-- */
--int ath9k_cmn_rx_skb_preprocess(struct ath_common *common,
--                              struct ieee80211_hw *hw,
--                              struct sk_buff *skb,
--                              struct ath_rx_status *rx_stats,
--                              struct ieee80211_rx_status *rx_status,
--                              bool *decrypt_error)
--{
--      struct ath_hw *ah = common->ah;
--
--      memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
--
--      /*
--       * everything but the rate is checked here, the rate check is done
--       * separately to avoid doing two lookups for a rate for each frame.
--       */
--      if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error))
--              return -EINVAL;
--
--      ath9k_process_rssi(common, hw, skb, rx_stats);
--
--      if (ath9k_process_rate(common, hw, rx_stats, rx_status, skb))
--              return -EINVAL;
--
--      rx_status->mactime = ath9k_hw_extend_tsf(ah, rx_stats->rs_tstamp);
--      rx_status->band = hw->conf.channel->band;
--      rx_status->freq = hw->conf.channel->center_freq;
--      rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
--      rx_status->antenna = rx_stats->rs_antenna;
--      rx_status->flag |= RX_FLAG_TSFT;
--
--      return 0;
--}
--EXPORT_SYMBOL(ath9k_cmn_rx_skb_preprocess);
--
--void ath9k_cmn_rx_skb_postprocess(struct ath_common *common,
--                                struct sk_buff *skb,
--                                struct ath_rx_status *rx_stats,
--                                struct ieee80211_rx_status *rxs,
--                                bool decrypt_error)
--{
--      struct ath_hw *ah = common->ah;
--      struct ieee80211_hdr *hdr;
--      int hdrlen, padpos, padsize;
--      u8 keyix;
--      __le16 fc;
--
--      /* see if any padding is done by the hw and remove it */
--      hdr = (struct ieee80211_hdr *) skb->data;
--      hdrlen = ieee80211_get_hdrlen_from_skb(skb);
--      fc = hdr->frame_control;
--      padpos = ath9k_cmn_padpos(hdr->frame_control);
--
--      /* The MAC header is padded to have 32-bit boundary if the
--       * packet payload is non-zero. The general calculation for
--       * padsize would take into account odd header lengths:
--       * padsize = (4 - padpos % 4) % 4; However, since only
--       * even-length headers are used, padding can only be 0 or 2
--       * bytes and we can optimize this a bit. In addition, we must
--       * not try to remove padding from short control frames that do
--       * not have payload. */
--      padsize = padpos & 3;
--      if (padsize && skb->len>=padpos+padsize+FCS_LEN) {
--              memmove(skb->data + padsize, skb->data, padpos);
--              skb_pull(skb, padsize);
--      }
--
--      keyix = rx_stats->rs_keyix;
--
--      if (!(keyix == ATH9K_RXKEYIX_INVALID) && !decrypt_error &&
--          ieee80211_has_protected(fc)) {
--              rxs->flag |= RX_FLAG_DECRYPTED;
--      } else if (ieee80211_has_protected(fc)
--                 && !decrypt_error && skb->len >= hdrlen + 4) {
--              keyix = skb->data[hdrlen + 3] >> 6;
--
--              if (test_bit(keyix, common->keymap))
--                      rxs->flag |= RX_FLAG_DECRYPTED;
--      }
--      if (ah->sw_mgmt_crypto &&
--          (rxs->flag & RX_FLAG_DECRYPTED) &&
--          ieee80211_is_mgmt(fc))
--              /* Use software decrypt for management frames. */
--              rxs->flag &= ~RX_FLAG_DECRYPTED;
--}
--EXPORT_SYMBOL(ath9k_cmn_rx_skb_postprocess);
--
- int ath9k_cmn_padpos(__le16 frame_control)
- {
-       int padpos = 24;
---- a/drivers/net/wireless/ath/ath9k/common.h
-+++ b/drivers/net/wireless/ath/ath9k/common.h
-@@ -52,82 +52,6 @@
- #define ATH_EP_RND(x, mul)                                            \
-       ((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
- 
--struct ath_atx_ac {
--      int sched;
--      int qnum;
--      struct list_head list;
--      struct list_head tid_q;
--};
--
--struct ath_buf_state {
--      int bfs_nframes;
--      u16 bfs_al;
--      u16 bfs_frmlen;
--      int bfs_seqno;
--      int bfs_tidno;
--      int bfs_retries;
--      u8 bf_type;
--      u32 bfs_keyix;
--      enum ath9k_key_type bfs_keytype;
--};
--
--struct ath_buf {
--      struct list_head list;
--      struct ath_buf *bf_lastbf;      /* last buf of this unit (a frame or
--                                         an aggregate) */
--      struct ath_buf *bf_next;        /* next subframe in the aggregate */
--      struct sk_buff *bf_mpdu;        /* enclosing frame structure */
--      void *bf_desc;                  /* virtual addr of desc */
--      dma_addr_t bf_daddr;            /* physical addr of desc */
--      dma_addr_t bf_buf_addr;         /* physical addr of data buffer */
--      bool bf_stale;
--      bool bf_isnullfunc;
--      bool bf_tx_aborted;
--      u16 bf_flags;
--      struct ath_buf_state bf_state;
--      dma_addr_t bf_dmacontext;
--      struct ath_wiphy *aphy;
--};
--
--struct ath_atx_tid {
--      struct list_head list;
--      struct list_head buf_q;
--      struct ath_node *an;
--      struct ath_atx_ac *ac;
--      struct ath_buf *tx_buf[ATH_TID_MAX_BUFS];
--      u16 seq_start;
--      u16 seq_next;
--      u16 baw_size;
--      int tidno;
--      int baw_head;   /* first un-acked tx buffer */
--      int baw_tail;   /* next unused tx buffer slot */
--      int sched;
--      int paused;
--      u8 state;
--};
--
--struct ath_node {
--      struct ath_common *common;
--      struct ath_atx_tid tid[WME_NUM_TID];
--      struct ath_atx_ac ac[WME_NUM_AC];
--      u16 maxampdu;
--      u8 mpdudensity;
--      int last_rssi;
--};
--
--int ath9k_cmn_rx_skb_preprocess(struct ath_common *common,
--                              struct ieee80211_hw *hw,
--                              struct sk_buff *skb,
--                              struct ath_rx_status *rx_stats,
--                              struct ieee80211_rx_status *rx_status,
--                              bool *decrypt_error);
--
--void ath9k_cmn_rx_skb_postprocess(struct ath_common *common,
--                                struct sk_buff *skb,
--                                struct ath_rx_status *rx_stats,
--                                struct ieee80211_rx_status *rxs,
--                                bool decrypt_error);
--
- int ath9k_cmn_padpos(__le16 frame_control);
- int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);
- void ath9k_cmn_update_ichannel(struct ieee80211_hw *hw,
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -15,6 +15,7 @@
-  */
- 
- #include <linux/slab.h>
-+#include <linux/vmalloc.h>
- #include <asm/unaligned.h>
- 
- #include "ath9k.h"
-@@ -32,6 +33,19 @@ static int ath9k_debugfs_open(struct ino
-       return 0;
- }
- 
-+static ssize_t ath9k_debugfs_read_buf(struct file *file, char __user *user_buf,
-+                                    size_t count, loff_t *ppos)
-+{
-+      u8 *buf = file->private_data;
-+      return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
-+}
-+
-+static int ath9k_debugfs_release_buf (struct inode *inode, struct file *file)
-+{
-+      vfree(file->private_data);
-+      return 0;
-+}
-+
- #ifdef CONFIG_ATH_DEBUG
- 
- static ssize_t read_file_debug(struct file *file, char __user *user_buf,
-@@ -269,6 +283,8 @@ void ath_debug_stat_interrupt(struct ath
-                       sc->debug.stats.istats.rxlp++;
-               if (status & ATH9K_INT_RXHP)
-                       sc->debug.stats.istats.rxhp++;
-+              if (status & ATH9K_INT_BB_WATCHDOG)
-+                      sc->debug.stats.istats.bb_watchdog++;
-       } else {
-               if (status & ATH9K_INT_RX)
-                       sc->debug.stats.istats.rxok++;
-@@ -319,6 +335,9 @@ static ssize_t read_file_interrupt(struc
-                       "%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
-               len += snprintf(buf + len, sizeof(buf) - len,
-                       "%8s: %10u\n", "RXHP", sc->debug.stats.istats.rxhp);
-+              len += snprintf(buf + len, sizeof(buf) - len,
-+                      "%8s: %10u\n", "WATCHDOG",
-+                      sc->debug.stats.istats.bb_watchdog);
-       } else {
-               len += snprintf(buf + len, sizeof(buf) - len,
-                       "%8s: %10u\n", "RX", sc->debug.stats.istats.rxok);
-@@ -871,7 +890,38 @@ static ssize_t write_file_regval(struct 
- static const struct file_operations fops_regval = {
-       .read = read_file_regval,
-       .write = write_file_regval,
--      .open = ath9k_debugfs_open,
-+};
-+
-+#define REGDUMP_LINE_SIZE     20
-+#define REGDUMP_NUM_REGS      (0x16bd4 / 4 + 1)
-+#define REGDUMP_DATA_LEN      (REGDUMP_NUM_REGS * REGDUMP_LINE_SIZE + 1)
-+
-+static int open_file_regdump(struct inode *inode, struct file *file)
-+{
-+      struct ath_softc *sc = inode->i_private;
-+      unsigned int len = 0;
-+      u8 *buf;
-+      int i;
-+
-+      buf = vmalloc(REGDUMP_DATA_LEN);
-+      if (!buf)
-+              return -ENOMEM;
-+
-+      ath9k_ps_wakeup(sc);
-+      for (i = 0; i < REGDUMP_NUM_REGS; i++)
-+              len += scnprintf(buf + len, REGDUMP_DATA_LEN - len,
-+                      "0x%06x 0x%08x\n", i << 2, REG_READ(sc->sc_ah, i << 2));
-+      ath9k_ps_restore(sc);
-+
-+      file->private_data = buf;
-+
-+      return 0;
-+}
-+
-+static const struct file_operations fops_regdump = {
-+      .open = open_file_regdump,
-+      .read = ath9k_debugfs_read_buf,
-+      .release = ath9k_debugfs_release_buf,
-       .owner = THIS_MODULE
- };
- 
-@@ -935,6 +985,16 @@ int ath9k_init_debug(struct ath_hw *ah)
-               goto err;
- 
-       sc->debug.regidx = 0;
-+
-+      if (!debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy,
-+                      sc, &fops_regdump))
-+              goto err;
-+
-+#ifdef CONFIG_ATH9K_PKTLOG
-+      if (ath9k_init_pktlog(sc) != 0)
-+              goto err;
-+#endif
-+
-       return 0;
- err:
-       ath9k_exit_debug(ah);
-@@ -946,6 +1006,10 @@ void ath9k_exit_debug(struct ath_hw *ah)
-       struct ath_common *common = ath9k_hw_common(ah);
-       struct ath_softc *sc = (struct ath_softc *) common->priv;
- 
-+#ifdef CONFIG_ATH9K_PKTLOG
-+      ath9k_deinit_pktlog(sc);
-+#endif
-+      debugfs_remove(sc->debug.debugfs_regdump);
-       debugfs_remove_recursive(sc->debug.debugfs_phy);
- }
- 
---- a/drivers/net/wireless/ath/ath9k/debug.h
-+++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -53,6 +53,7 @@ struct ath_buf;
-  * @cabend: RX End of CAB traffic
-  * @dtimsync: DTIM sync lossage
-  * @dtim: RX Beacon with DTIM
-+ * @bb_watchdog: Baseband watchdog
-  */
- struct ath_interrupt_stats {
-       u32 total;
-@@ -76,6 +77,7 @@ struct ath_interrupt_stats {
-       u32 cabend;
-       u32 dtimsync;
-       u32 dtim;
-+      u32 bb_watchdog;
- };
- 
- struct ath_rc_stats {
-@@ -154,6 +156,14 @@ struct ath_stats {
- struct ath9k_debug {
-       struct dentry *debugfs_phy;
-       u32 regidx;
-+      struct dentry *debugfs_debug;
-+      struct dentry *debugfs_dma;
-+      struct dentry *debugfs_interrupt;
-+      struct dentry *debugfs_rcstat;
-+      struct dentry *debugfs_wiphy;
-+      struct dentry *debugfs_xmit;
-+      struct dentry *debugfs_recv;
-+      struct dentry *debugfs_regdump;
-       struct ath_stats stats;
- };
- 
---- a/drivers/net/wireless/ath/ath9k/hw-ops.h
-+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
-@@ -67,9 +67,10 @@ static inline void ath9k_hw_filltxdesc(s
- }
- 
- static inline int ath9k_hw_txprocdesc(struct ath_hw *ah, void *ds,
--                                    struct ath_tx_status *ts)
-+                                    struct ath_tx_status *ts,
-+                                    void *txs_desc)
- {
--      return ath9k_hw_ops(ah)->proc_txdesc(ah, ds, ts);
-+      return ath9k_hw_ops(ah)->proc_txdesc(ah, ds, ts, txs_desc);
- }
- 
- static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -395,12 +395,6 @@ static void ath9k_hw_init_config(struct 
-       ah->config.rx_intr_mitigation = true;
- 
-       /*
--       * Tx IQ Calibration (ah->config.tx_iq_calibration) is only
--       * used by AR9003, but it is showing reliability issues.
--       * It will take a while to fix so this is currently disabled.
--       */
--
--      /*
-        * We need this for PCI devices only (Cardbus, PCI, miniPCI)
-        * _and_ if on non-uniprocessor systems (Multiprocessor/HT).
-        * This means we use it for all AR5416 devices, and the few
-@@ -639,6 +633,7 @@ static int __ath9k_hw_init(struct ath_hw
-               ar9003_hw_set_nf_limits(ah);
- 
-       ath9k_init_nfcal_hist_buffer(ah);
-+      ah->bb_watchdog_timeout_ms = 25;
- 
-       common->state = ATH_HW_INITIALIZED;
- 
-@@ -1453,6 +1448,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-       if (AR_SREV_9300_20_OR_LATER(ah)) {
-               ath9k_hw_loadnf(ah, curchan);
-               ath9k_hw_start_nfcal(ah);
-+              ar9003_hw_bb_watchdog_config(ah);
-       }
- 
-       return 0;
-@@ -2177,7 +2173,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
-               pCap->hw_caps |= ATH9K_HW_CAP_RFSILENT;
-       }
- #endif
--      if (AR_SREV_9271(ah))
-+      if (AR_SREV_9271(ah) || AR_SREV_9300_20_OR_LATER(ah))
-               pCap->hw_caps |= ATH9K_HW_CAP_AUTOSLEEP;
-       else
-               pCap->hw_caps &= ~ATH9K_HW_CAP_AUTOSLEEP;
-@@ -2244,6 +2240,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw
-       if (AR_SREV_9300_20_OR_LATER(ah))
-               pCap->hw_caps |= ATH9K_HW_CAP_RAC_SUPPORTED;
- 
-+      if (AR_SREV_9287_10_OR_LATER(ah))
-+              pCap->hw_caps |= ATH9K_HW_CAP_SGI_20;
-+
-       return 0;
- }
- 
-@@ -2478,7 +2477,7 @@ void ath9k_hw_setrxfilter(struct ath_hw 
-               phybits |= AR_PHY_ERR_RADAR;
-       if (bits & ATH9K_RX_FILTER_PHYERR)
-               phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;
--      REG_WRITE(ah, AR_PHY_ERR, phybits);
-+      REG_WRITE(ah, AR_PHY_ERR, 0xffffffff);
- 
-       if (phybits)
-               REG_WRITE(ah, AR_RXCFG,
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -199,6 +199,7 @@ enum ath9k_hw_caps {
-       ATH9K_HW_CAP_RAC_SUPPORTED              = BIT(18),
-       ATH9K_HW_CAP_LDPC                       = BIT(19),
-       ATH9K_HW_CAP_FASTCLOCK                  = BIT(20),
-+      ATH9K_HW_CAP_SGI_20                     = BIT(21),
- };
- 
- enum ath9k_capability_type {
-@@ -262,7 +263,6 @@ struct ath9k_ops_config {
- #define AR_BASE_FREQ_5GHZ     4900
- #define AR_SPUR_FEEQ_BOUND_HT40 19
- #define AR_SPUR_FEEQ_BOUND_HT20 10
--      bool tx_iq_calibration; /* Only available for >= AR9003 */
-       int spurmode;
-       u16 spurchans[AR_EEPROM_MODAL_SPURS][2];
-       u8 max_txtrig_level;
-@@ -279,6 +279,7 @@ enum ath9k_int {
-       ATH9K_INT_TX = 0x00000040,
-       ATH9K_INT_TXDESC = 0x00000080,
-       ATH9K_INT_TIM_TIMER = 0x00000100,
-+      ATH9K_INT_BB_WATCHDOG = 0x00000400,
-       ATH9K_INT_TXURN = 0x00000800,
-       ATH9K_INT_MIB = 0x00001000,
-       ATH9K_INT_RXPHY = 0x00004000,
-@@ -581,7 +582,7 @@ struct ath_hw_ops {
-                           const void *ds0, dma_addr_t buf_addr,
-                           unsigned int qcu);
-       int (*proc_txdesc)(struct ath_hw *ah, void *ds,
--                         struct ath_tx_status *ts);
-+                         struct ath_tx_status *ts, void* txs_desc);
-       void (*set11n_txdesc)(struct ath_hw *ah, void *ds,
-                             u32 pktLen, enum ath9k_pkt_type type,
-                             u32 txPower, u32 keyIx,
-@@ -789,6 +790,11 @@ struct ath_hw {
-       u32 ts_paddr_end;
-       u16 ts_tail;
-       u8 ts_size;
-+
-+      u32 bb_watchdog_last_status;
-+      u32 bb_watchdog_timeout_ms; /* in ms, 0 to disable */
-+
-+      bool is_pkt_logging;
- };
- 
- static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
-@@ -910,10 +916,13 @@ void ar9002_hw_enable_async_fifo(struct 
- void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah);
- 
- /*
-- * Code specifric to AR9003, we stuff these here to avoid callbacks
-+ * Code specific to AR9003, we stuff these here to avoid callbacks
-  * for older families
-  */
- void ar9003_hw_set_nf_limits(struct ath_hw *ah);
-+void ar9003_hw_bb_watchdog_config(struct ath_hw *ah);
-+void ar9003_hw_bb_watchdog_read(struct ath_hw *ah);
-+void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah);
- 
- /* Hardware family op attach helpers */
- void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -209,6 +209,9 @@ static void setup_ht_cap(struct ath_soft
-       if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_LDPC)
-               ht_info->cap |= IEEE80211_HT_CAP_LDPC_CODING;
- 
-+      if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_SGI_20)
-+              ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
-+
-       ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
-       ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_8;
- 
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -521,6 +521,12 @@ irqreturn_t ath_isr(int irq, void *dev)
-           !(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)))
-               goto chip_reset;
- 
-+      if ((ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
-+          (status & ATH9K_INT_BB_WATCHDOG)) {
-+              ar9003_hw_bb_watchdog_dbg_info(ah);
-+              goto chip_reset;
-+      }
-+
-       if (status & ATH9K_INT_SWBA)
-               tasklet_schedule(&sc->bcon_tasklet);
- 
-@@ -1196,7 +1202,9 @@ static int ath9k_start(struct ieee80211_
-                   ATH9K_INT_GLOBAL;
- 
-       if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
--              ah->imask |= ATH9K_INT_RXHP | ATH9K_INT_RXLP;
-+              ah->imask |= ATH9K_INT_RXHP |
-+                           ATH9K_INT_RXLP |
-+                           ATH9K_INT_BB_WATCHDOG;
-       else
-               ah->imask |= ATH9K_INT_RX;
- 
-@@ -1275,7 +1283,8 @@ static int ath9k_tx(struct ieee80211_hw 
-                * completed and if needed, also for RX of buffered frames.
-                */
-               ath9k_ps_wakeup(sc);
--              ath9k_hw_setrxabort(sc->sc_ah, 0);
-+              if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
-+                      ath9k_hw_setrxabort(sc->sc_ah, 0);
-               if (ieee80211_is_pspoll(hdr->frame_control)) {
-                       ath_print(common, ATH_DBG_PS,
-                                 "Sending PS-Poll to pick a buffered frame\n");
-@@ -1539,8 +1548,8 @@ void ath9k_enable_ps(struct ath_softc *s
-                       ah->imask |= ATH9K_INT_TIM_TIMER;
-                       ath9k_hw_set_interrupts(ah, ah->imask);
-               }
-+              ath9k_hw_setrxabort(ah, 1);
-       }
--      ath9k_hw_setrxabort(ah, 1);
- }
- 
- static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
---- a/drivers/net/wireless/ath/ath9k/pci.c
-+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -29,6 +29,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
-       { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
-       { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */
-       { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */
-+      { PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E  AR9300 */
-       { 0 }
- };
- 
---- /dev/null
-+++ b/drivers/net/wireless/ath/ath9k/pktlog.c
-@@ -0,0 +1,783 @@
-+
-+#include <linux/vmalloc.h>
-+#include <linux/highmem.h>
-+#include "ath9k.h"
-+
-+static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-+{
-+      file->private_data = inode->i_private;
-+      return 0;
-+}
-+
-+static struct page *pktlog_virt_to_logical(void *addr)
-+{
-+      struct page *page;
-+      unsigned long vpage = 0UL;
-+
-+      page = vmalloc_to_page(addr);
-+      if (page) {
-+              vpage = (unsigned long) page_address(page);
-+              vpage |= ((unsigned long) addr & (PAGE_SIZE - 1));
-+      }
-+      return virt_to_page((void *) vpage);
-+}
-+
-+static void ath_pktlog_release(struct ath_pktlog *pktlog)
-+{
-+      unsigned long page_cnt, vaddr;
-+      struct page *page;
-+
-+      page_cnt =
-+              ((sizeof(*(pktlog->pktlog_buf)) +
-+              pktlog->pktlog_buf_size) / PAGE_SIZE) + 1;
-+
-+      for (vaddr = (unsigned long) (pktlog->pktlog_buf); vaddr <
-+                      (unsigned long) (pktlog->pktlog_buf) +
-+                      (page_cnt * PAGE_SIZE);
-+                      vaddr += PAGE_SIZE) {
-+              page = pktlog_virt_to_logical((void *) vaddr);
-+              clear_bit(PG_reserved, &page->flags);
-+      }
-+
-+      vfree(pktlog->pktlog_buf);
-+      pktlog->pktlog_buf = NULL;
-+}
-+
-+static int ath_alloc_pktlog_buf(struct ath_softc *sc)
-+{
-+      u32 page_cnt;
-+      unsigned long vaddr;
-+      struct page *page;
-+      struct ath_pktlog *pktlog = &sc->pktlog.pktlog;
-+
-+      if (pktlog->pktlog_buf_size == 0)
-+              return -EINVAL;
-+
-+      page_cnt = (sizeof(*(pktlog->pktlog_buf)) +
-+                  pktlog->pktlog_buf_size) / PAGE_SIZE;
-+
-+      pktlog->pktlog_buf =  vmalloc((page_cnt + 2) * PAGE_SIZE);
-+      if (pktlog->pktlog_buf == NULL) {
-+              printk(KERN_ERR "Failed to allocate memory  for pktlog");
-+              return -ENOMEM;
-+      }
-+
-+      pktlog->pktlog_buf = (struct ath_pktlog_buf *)
-+                                   (((unsigned long)
-+                                    (pktlog->pktlog_buf)
-+                                   + PAGE_SIZE - 1) & PAGE_MASK);
-+
-+      for (vaddr = (unsigned long) (pktlog->pktlog_buf);
-+                    vaddr < ((unsigned long) (pktlog->pktlog_buf)
-+                    + (page_cnt * PAGE_SIZE)); vaddr += PAGE_SIZE) {
-+              page = pktlog_virt_to_logical((void *)vaddr);
-+              set_bit(PG_reserved, &page->flags);
-+      }
-+
-+      return 0;
-+}
-+
-+static void ath_init_pktlog_buf(struct ath_pktlog *pktlog)
-+{
-+      pktlog->pktlog_buf->bufhdr.magic_num = PKTLOG_MAGIC_NUM;
-+      pktlog->pktlog_buf->bufhdr.version = CUR_PKTLOG_VER;
-+      pktlog->pktlog_buf->rd_offset = -1;
-+      pktlog->pktlog_buf->wr_offset = 0;
-+      if (pktlog->pktlog_filter == 0)
-+              pktlog->pktlog_filter = ATH_PKTLOG_FILTER_DEFAULT;
-+}
-+
-+static char *ath_pktlog_getbuf(struct ath_pktlog *pl_info,
-+                             u16 log_type, size_t log_size,
-+                             u32 flags)
-+{
-+      struct ath_pktlog_buf *log_buf;
-+      struct ath_pktlog_hdr *log_hdr;
-+      int32_t cur_wr_offset, buf_size;
-+      char *log_ptr;
-+
-+      log_buf = pl_info->pktlog_buf;
-+      buf_size = pl_info->pktlog_buf_size;
-+
-+      spin_lock_bh(&pl_info->pktlog_lock);
-+      cur_wr_offset = log_buf->wr_offset;
-+      /* Move read offset to the next entry if there is a buffer overlap */
-+      if (log_buf->rd_offset >= 0) {
-+              if ((cur_wr_offset <= log_buf->rd_offset)
-+                              && (cur_wr_offset +
-+                              sizeof(struct ath_pktlog_hdr)) >
-+                              log_buf->rd_offset)
-+                      PKTLOG_MOV_RD_IDX(log_buf->rd_offset, log_buf,
-+                                        buf_size);
-+      } else {
-+              log_buf->rd_offset = cur_wr_offset;
-+      }
-+
-+      log_hdr =
-+              (struct ath_pktlog_hdr *) (log_buf->log_data + cur_wr_offset);
-+      log_hdr->log_type = log_type;
-+      log_hdr->flags = flags;
-+      log_hdr->timestamp = jiffies;
-+      log_hdr->size = (u16) log_size;
-+
-+      cur_wr_offset += sizeof(*log_hdr);
-+
-+      if ((buf_size - cur_wr_offset) < log_size) {
-+              while ((cur_wr_offset <= log_buf->rd_offset)
-+                              && (log_buf->rd_offset < buf_size))
-+                      PKTLOG_MOV_RD_IDX(log_buf->rd_offset, log_buf,
-+                                        buf_size);
-+              cur_wr_offset = 0;
-+      }
-+
-+      while ((cur_wr_offset <= log_buf->rd_offset)
-+                      && (cur_wr_offset + log_size) > log_buf->rd_offset)
-+              PKTLOG_MOV_RD_IDX(log_buf->rd_offset, log_buf, buf_size);
-+
-+      log_ptr = &(log_buf->log_data[cur_wr_offset]);
-+
-+      cur_wr_offset += log_hdr->size;
-+
-+      log_buf->wr_offset =
-+              ((buf_size - cur_wr_offset) >=
-+               sizeof(struct ath_pktlog_hdr)) ? cur_wr_offset : 0;
-+      spin_unlock_bh(&pl_info->pktlog_lock);
-+
-+      return log_ptr;
-+}
-+
-+static void ath9k_hw_get_descinfo(struct ath_hw *ah, struct ath_desc_info *desc_info)
-+{
-+       desc_info->txctl_numwords = TXCTL_NUMWORDS(ah);
-+       desc_info->txctl_offset = TXCTL_OFFSET(ah);
-+       desc_info->txstatus_numwords = TXSTATUS_NUMWORDS(ah);
-+       desc_info->txstatus_offset = TXSTATUS_OFFSET(ah);
-+
-+       desc_info->rxctl_numwords = RXCTL_NUMWORDS(ah);
-+       desc_info->rxctl_offset = RXCTL_OFFSET(ah);
-+       desc_info->rxstatus_numwords = RXSTATUS_NUMWORDS(ah);
-+       desc_info->rxstatus_offset = RXSTATUS_OFFSET(ah);
-+}
-+
-+static int  pktlog_pgfault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+{
-+      unsigned long address = (unsigned long) vmf->virtual_address;
-+
-+      if (address == 0UL)
-+              return VM_FAULT_NOPAGE;
-+
-+      if (vmf->pgoff > vma->vm_end)
-+              return VM_FAULT_SIGBUS;
-+
-+      get_page(virt_to_page(address));
-+      vmf->page = virt_to_page(address);
-+      return VM_FAULT_MINOR;
-+}
-+
-+static struct vm_operations_struct pktlog_vmops = {
-+      .fault = pktlog_pgfault
-+};
-+
-+static int ath_pktlog_mmap(struct file *file, struct vm_area_struct *vma)
-+{
-+      struct ath_softc *sc = file->private_data;
-+
-+      /* entire buffer should be mapped */
-+      if (vma->vm_pgoff != 0)
-+              return -EINVAL;
-+
-+      if (!sc->pktlog.pktlog.pktlog_buf) {
-+              printk(KERN_ERR "Can't allocate pktlog buf");
-+              return -ENOMEM;
-+      }
-+
-+      vma->vm_flags |= VM_LOCKED;
-+      vma->vm_ops = &pktlog_vmops;
-+
-+      return 0;
-+}
-+
-+static ssize_t ath_pktlog_read(struct file *file, char __user *userbuf,
-+                             size_t count, loff_t *ppos)
-+{
-+      size_t bufhdr_size;
-+      size_t nbytes = 0, ret_val = 0;
-+      int rem_len;
-+      int start_offset, end_offset;
-+      int fold_offset, ppos_data, cur_rd_offset;
-+      struct ath_softc *sc = file->private_data;
-+      struct ath_pktlog *pktlog_info = &sc->pktlog.pktlog;
-+      struct ath_pktlog_buf *log_buf = pktlog_info->pktlog_buf;
-+
-+      if (log_buf == NULL)
-+              return 0;
-+
-+      bufhdr_size = sizeof(log_buf->bufhdr);
-+
-+      /* copy valid log entries from circular buffer into user space */
-+      rem_len = count;
-+
-+      nbytes = 0;
-+
-+      if (*ppos < bufhdr_size) {
-+              nbytes = min((int) (bufhdr_size -  *ppos), rem_len);
-+              if (copy_to_user(userbuf,
-+                  ((char *) &log_buf->bufhdr) + *ppos, nbytes))
-+                      return -EFAULT;
-+              rem_len -= nbytes;
-+              ret_val += nbytes;
-+      }
-+
-+      start_offset = log_buf->rd_offset;
-+
-+      if ((rem_len == 0) || (start_offset < 0))
-+              goto read_done;
-+
-+      fold_offset = -1;
-+      cur_rd_offset = start_offset;
-+
-+      /* Find the last offset and fold-offset if the buffer is folded */
-+      do {
-+              struct ath_pktlog_hdr *log_hdr;
-+              int log_data_offset;
-+
-+              log_hdr =
-+                      (struct ath_pktlog_hdr *) (log_buf->log_data +
-+                                                      cur_rd_offset);
-+
-+              log_data_offset = cur_rd_offset + sizeof(struct ath_pktlog_hdr);
-+
-+              if ((fold_offset == -1)
-+                              && ((pktlog_info->pktlog_buf_size -
-+                                  log_data_offset) <= log_hdr->size))
-+                      fold_offset = log_data_offset - 1;
-+
-+              PKTLOG_MOV_RD_IDX(cur_rd_offset, log_buf,
-+                                pktlog_info->pktlog_buf_size);
-+
-+              if ((fold_offset == -1) && (cur_rd_offset == 0)
-+                              && (cur_rd_offset != log_buf->wr_offset))
-+                      fold_offset = log_data_offset + log_hdr->size - 1;
-+
-+              end_offset = log_data_offset + log_hdr->size - 1;
-+      } while (cur_rd_offset != log_buf->wr_offset);
-+
-+      ppos_data = *ppos + ret_val - bufhdr_size + start_offset;
-+
-+      if (fold_offset == -1) {
-+              if (ppos_data > end_offset)
-+                      goto read_done;
-+
-+              nbytes = min(rem_len, end_offset - ppos_data + 1);
-+              if (copy_to_user(userbuf + ret_val,
-+                               log_buf->log_data + ppos_data, nbytes))
-+                      return -EFAULT;
-+              ret_val += nbytes;
-+              rem_len -= nbytes;
-+      } else {
-+              if (ppos_data <= fold_offset) {
-+                      nbytes = min(rem_len, fold_offset - ppos_data + 1);
-+                      if (copy_to_user(userbuf + ret_val,
-+                                              log_buf->log_data + ppos_data,
-+                                              nbytes))
-+                              return -EFAULT;
-+                      ret_val += nbytes;
-+                      rem_len -= nbytes;
-+              }
-+
-+              if (rem_len == 0)
-+                      goto read_done;
-+
-+              ppos_data =
-+                      *ppos + ret_val - (bufhdr_size +
-+                                      (fold_offset - start_offset + 1));
-+
-+              if (ppos_data <= end_offset) {
-+                      nbytes = min(rem_len, end_offset - ppos_data + 1);
-+                      if (copy_to_user(userbuf + ret_val, log_buf->log_data
-+                                       + ppos_data,
-+                                       nbytes))
-+                              return -EFAULT;
-+                      ret_val += nbytes;
-+                      rem_len -= nbytes;
-+              }
-+      }
-+
-+read_done:
-+              *ppos += ret_val;
-+
-+              return ret_val;
-+}
-+
-+static const struct file_operations fops_pktlog_dump = {
-+      .read = ath_pktlog_read,
-+      .mmap = ath_pktlog_mmap,
-+      .open = ath9k_debugfs_open
-+};
-+
-+static ssize_t write_pktlog_start(struct file *file, const char __user *ubuf,
-+                                 size_t count, loff_t *ppos)
-+{
-+      struct ath_softc *sc = file->private_data;
-+      struct ath_pktlog *pktlog = &sc->pktlog.pktlog;
-+      char buf[32];
-+      int buf_size;
-+      int start_pktlog, err;
-+
-+      buf_size = min(count, sizeof(buf) - 1);
-+      if (copy_from_user(buf, ubuf, buf_size))
-+              return -EFAULT;
-+
-+      sscanf(buf, "%d", &start_pktlog);
-+      if (start_pktlog) {
-+              if (pktlog->pktlog_buf != NULL)
-+                      ath_pktlog_release(pktlog);
-+
-+              err = ath_alloc_pktlog_buf(sc);
-+              if (err != 0)
-+                      return err;
-+
-+              ath_init_pktlog_buf(pktlog);
-+              pktlog->pktlog_buf->rd_offset = -1;
-+              pktlog->pktlog_buf->wr_offset = 0;
-+              sc->is_pkt_logging = 1;
-+      } else {
-+              sc->is_pkt_logging = 0;
-+      }
-+
-+      sc->sc_ah->is_pkt_logging = sc->is_pkt_logging;
-+      return count;
-+}
-+
-+static ssize_t read_pktlog_start(struct file *file, char __user *ubuf,
-+                                size_t count, loff_t *ppos)
-+{
-+      char buf[32];
-+      struct ath_softc *sc = file->private_data;
-+      int len = 0;
-+
-+      len = scnprintf(buf, sizeof(buf) - len, "%d", sc->is_pkt_logging);
-+      return simple_read_from_buffer(ubuf, count, ppos, buf, len);
-+}
-+
-+static const struct file_operations fops_pktlog_start = {
-+      .read = read_pktlog_start,
-+      .write = write_pktlog_start,
-+      .open = ath9k_debugfs_open
-+};
-+
-+static ssize_t pktlog_size_write(struct file *file, const char __user *ubuf,
-+                               size_t count, loff_t *ppos)
-+{
-+      struct ath_softc *sc = file->private_data;
-+      char buf[32];
-+      u32 pktlog_size;
-+      int buf_size;
-+
-+      buf_size = min(count, sizeof(buf) - 1);
-+      if (copy_from_user(buf, ubuf, buf_size))
-+              return -EFAULT;
-+
-+      sscanf(buf, "%d", &pktlog_size);
-+
-+      if (pktlog_size == sc->pktlog.pktlog.pktlog_buf_size)
-+              return count;
-+
-+      if (sc->is_pkt_logging) {
-+              printk(KERN_DEBUG "Stop packet logging before"
-+                      " changing the pktlog size \n");
-+              return -EINVAL;
-+      }
-+
-+      sc->pktlog.pktlog.pktlog_buf_size = pktlog_size;
-+
-+      return count;
-+}
-+
-+static ssize_t pktlog_size_read(struct file *file, char __user *ubuf,
-+                              size_t count, loff_t *ppos)
-+{
-+      char buf[32];
-+      struct ath_softc *sc = file->private_data;
-+      int len = 0;
-+
-+      len = scnprintf(buf, sizeof(buf) - len, "%ul",
-+                          sc->pktlog.pktlog.pktlog_buf_size);
-+      return simple_read_from_buffer(ubuf, count, ppos, buf, len);
-+}
-+
-+static const struct file_operations fops_pktlog_size = {
-+      .read = pktlog_size_read,
-+      .write = pktlog_size_write,
-+      .open = ath9k_debugfs_open
-+};
-+
-+static ssize_t pktlog_filter_write(struct file *file, const char __user *ubuf,
-+                                 size_t count, loff_t *ppos)
-+{
-+      char buf[32];
-+      struct ath_softc *sc = file->private_data;
-+      u32 filter;
-+      int buf_count;
-+
-+      buf_count = min(count, sizeof(buf) - 1);
-+      if (copy_from_user(buf, ubuf, buf_count))
-+              return -EFAULT;
-+
-+      if (sscanf(buf, "%x", &filter))
-+              sc->pktlog.pktlog.pktlog_filter = filter;
-+      else
-+              sc->pktlog.pktlog.pktlog_filter = 0;
-+
-+      return count;
-+}
-+
-+static ssize_t  pktlog_filter_read(struct file *file, char __user *ubuf,
-+                                 size_t count, loff_t *ppos)
-+{
-+      char buf[32];
-+      struct ath_softc *sc = file->private_data;
-+      int len = 0;
-+
-+      len = scnprintf(buf, sizeof(buf) - len, "%ul",
-+                          sc->pktlog.pktlog.pktlog_filter);
-+
-+      return simple_read_from_buffer(ubuf, count, ppos, buf, len);
-+}
-+
-+static const struct file_operations fops_pktlog_filter = {
-+      .read = pktlog_filter_read,
-+      .write = pktlog_filter_write,
-+      .open = ath9k_debugfs_open
-+};
-+
-+void ath_pktlog_txctl(struct ath_softc *sc, struct ath_buf *bf)
-+{
-+      struct ath_pktlog_txctl *tx_log;
-+      struct ath_pktlog *pl_info;
-+      struct ieee80211_hdr *hdr;
-+      struct ath_desc_info desc_info;
-+      int i;
-+      u32 *ds_words, flags = 0;
-+
-+      pl_info = &sc->pktlog.pktlog;
-+
-+      if ((pl_info->pktlog_filter & ATH_PKTLOG_TX) == 0 ||
-+          bf->bf_mpdu == NULL || !sc->is_pkt_logging)
-+              return;
-+
-+      flags |= (((sc->sc_ah->hw_version.macRev <<
-+                      PHFLAGS_MACREV_SFT) & PHFLAGS_MACREV_MASK) |
-+                      ((sc->sc_ah->hw_version.macVersion << PHFLAGS_MACVERSION_SFT)
-+                      & PHFLAGS_MACVERSION_MASK));
-+
-+      tx_log = (struct ath_pktlog_txctl *)ath_pktlog_getbuf(pl_info,
-+                      PKTLOG_TYPE_TXCTL, sizeof(*tx_log), flags);
-+
-+      memset(tx_log, 0, sizeof(*tx_log));
-+
-+      hdr = (struct ieee80211_hdr *) bf->bf_mpdu->data;
-+      tx_log->framectrl = hdr->frame_control;
-+      tx_log->seqctrl   = hdr->seq_ctrl;
-+
-+      if (ieee80211_has_tods(tx_log->framectrl)) {
-+              tx_log->bssid_tail = (hdr->addr1[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr1[ETH_ALEN - 1]);
-+              tx_log->sa_tail    = (hdr->addr2[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr2[ETH_ALEN - 1]);
-+              tx_log->da_tail    = (hdr->addr3[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr3[ETH_ALEN - 1]);
-+      } else if (ieee80211_has_fromds(tx_log->framectrl)) {
-+              tx_log->bssid_tail = (hdr->addr2[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr2[ETH_ALEN - 1]);
-+              tx_log->sa_tail    = (hdr->addr3[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr3[ETH_ALEN - 1]);
-+              tx_log->da_tail    = (hdr->addr1[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr1[ETH_ALEN - 1]);
-+      } else {
-+              tx_log->bssid_tail = (hdr->addr3[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr3[ETH_ALEN - 1]);
-+              tx_log->sa_tail    = (hdr->addr2[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr2[ETH_ALEN - 1]);
-+              tx_log->da_tail    = (hdr->addr1[ETH_ALEN - 2] << 8) |
-+                                   (hdr->addr1[ETH_ALEN - 1]);
-+      }
-+
-+      ath9k_hw_get_descinfo(sc->sc_ah, &desc_info);
-+
-+      ds_words = (u32 *)(bf->bf_desc) + desc_info.txctl_offset;
-+      for (i = 0; i < desc_info.txctl_numwords; i++)
-+              tx_log->txdesc_ctl[i] = ds_words[i];
-+}
-+
-+void ath_pktlog_txstatus(struct ath_softc *sc, void *ds)
-+{
-+      struct ath_pktlog_txstatus *tx_log;
-+      struct ath_pktlog *pl_info;
-+      struct ath_desc_info desc_info;
-+      int i;
-+      u32 *ds_words, flags = 0;
-+
-+      pl_info = &sc->pktlog.pktlog;
-+
-+      if ((pl_info->pktlog_filter & ATH_PKTLOG_TX) == 0 ||
-+          !sc->is_pkt_logging)
-+              return;
-+
-+      flags |= (((sc->sc_ah->hw_version.macRev <<
-+                PHFLAGS_MACREV_SFT) & PHFLAGS_MACREV_MASK) |
-+                ((sc->sc_ah->hw_version.macVersion << PHFLAGS_MACVERSION_SFT)
-+                & PHFLAGS_MACVERSION_MASK));
-+      tx_log = (struct ath_pktlog_txstatus *)ath_pktlog_getbuf(pl_info,
-+                      PKTLOG_TYPE_TXSTATUS, sizeof(*tx_log), flags);
-+
-+      memset(tx_log, 0, sizeof(*tx_log));
-+
-+      ath9k_hw_get_descinfo(sc->sc_ah, &desc_info);
-+
-+      ds_words = (u32 *)(ds) + desc_info.txstatus_offset;
-+
-+      for (i = 0; i < desc_info.txstatus_numwords; i++)
-+              tx_log->txdesc_status[i] = ds_words[i];
-+}
-+
-+void ath_pktlog_rx(struct ath_softc *sc, void *desc, struct sk_buff *skb)
-+{
-+      struct ath_pktlog_rx *rx_log;
-+      struct ath_pktlog *pl_info;
-+      struct ieee80211_hdr *hdr;
-+      struct ath_desc_info desc_info;
-+      int i;
-+      u32 *ds_words, flags = 0;
-+
-+      pl_info = &sc->pktlog.pktlog;
-+
-+      if ((pl_info->pktlog_filter & ATH_PKTLOG_RX) == 0 ||
-+          !sc->is_pkt_logging)
-+              return;
-+
-+      flags |= (((sc->sc_ah->hw_version.macRev <<
-+                PHFLAGS_MACREV_SFT) & PHFLAGS_MACREV_MASK) |
-+                ((sc->sc_ah->hw_version.macVersion <<
-+               PHFLAGS_MACVERSION_SFT) & PHFLAGS_MACVERSION_MASK));
-+
-+      rx_log = (struct ath_pktlog_rx *)ath_pktlog_getbuf(pl_info, PKTLOG_TYPE_RX,
-+                      sizeof(*rx_log), flags);
-+
-+      memset(rx_log, 0, sizeof(*rx_log));
-+
-+      if (skb->len > sizeof(struct ieee80211_hdr)) {
-+              hdr = (struct ieee80211_hdr *) skb->data;
-+              rx_log->framectrl = hdr->frame_control;
-+              rx_log->seqctrl   = hdr->seq_ctrl;
-+
-+              if (ieee80211_has_tods(rx_log->framectrl)) {
-+                      rx_log->bssid_tail = (hdr->addr1[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr1[ETH_ALEN - 1]);
-+                      rx_log->sa_tail    = (hdr->addr2[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr2[ETH_ALEN - 1]);
-+                      rx_log->da_tail    = (hdr->addr3[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr3[ETH_ALEN - 1]);
-+              } else if (ieee80211_has_fromds(rx_log->framectrl)) {
-+                      rx_log->bssid_tail = (hdr->addr2[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr2[ETH_ALEN - 1]);
-+                      rx_log->sa_tail    = (hdr->addr3[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr3[ETH_ALEN - 1]);
-+                      rx_log->da_tail    = (hdr->addr1[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr1[ETH_ALEN - 1]);
-+              } else {
-+                      rx_log->bssid_tail = (hdr->addr3[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr3[ETH_ALEN - 1]);
-+                      rx_log->sa_tail    = (hdr->addr2[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr2[ETH_ALEN - 1]);
-+                      rx_log->da_tail    = (hdr->addr1[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr1[ETH_ALEN - 1]);
-+              }
-+      } else {
-+              hdr = (struct ieee80211_hdr *) skb->data;
-+
-+              if (ieee80211_is_ctl(hdr->frame_control)) {
-+                      rx_log->framectrl = hdr->frame_control;
-+                      rx_log->da_tail = (hdr->addr1[ETH_ALEN - 2] << 8) |
-+                                           (hdr->addr1[ETH_ALEN - 1]);
-+                      if (skb->len < sizeof(struct ieee80211_rts)) {
-+                              rx_log->sa_tail = 0;
-+                      } else {
-+                              rx_log->sa_tail = (hdr->addr2[ETH_ALEN - 2]
-+                                                << 8) |
-+                                                (hdr->addr2[ETH_ALEN - 1]);
-+                      }
-+              } else {
-+                      rx_log->framectrl = 0xFFFF;
-+                      rx_log->da_tail = 0;
-+                      rx_log->sa_tail = 0;
-+              }
-+
-+              rx_log->seqctrl   = 0;
-+              rx_log->bssid_tail = 0;
-+      }
-+
-+      ath9k_hw_get_descinfo(sc->sc_ah, &desc_info);
-+
-+      ds_words = (u32 *)(desc) + desc_info.rxstatus_offset;
-+
-+      for (i = 0; i < desc_info.rxstatus_numwords; i++)
-+              rx_log->rxdesc_status[i] = ds_words[i];
-+}
-+
-+void ath9k_pktlog_rc(struct ath_softc *sc, struct ath_rate_priv *ath_rc_priv,
-+                   int8_t ratecode, u8 rate, int8_t is_probing, u16 ac)
-+{
-+      struct ath_pktlog_rcfind *rcf_log;
-+      struct ath_pktlog *pl_info;
-+      u32 flags = 0;
-+
-+      pl_info = &sc->pktlog.pktlog;
-+
-+      if ((pl_info->pktlog_filter & ATH_PKTLOG_RCFIND) == 0 ||
-+          !sc->is_pkt_logging)
-+              return;
-+
-+      flags |= (((sc->sc_ah->hw_version.macRev <<
-+               PHFLAGS_MACREV_SFT) & PHFLAGS_MACREV_MASK) |
-+               ((sc->sc_ah->hw_version.macVersion <<
-+               PHFLAGS_MACVERSION_SFT) & PHFLAGS_MACVERSION_MASK));
-+      rcf_log = (struct ath_pktlog_rcfind *)ath_pktlog_getbuf(pl_info,
-+                PKTLOG_TYPE_RCFIND, sizeof(*rcf_log), flags);
-+
-+      rcf_log->rate = rate;
-+      rcf_log->rateCode = ratecode;
-+      rcf_log->rcProbeRate = is_probing ? ath_rc_priv->probe_rate : 0;
-+      rcf_log->isProbing = is_probing;
-+      rcf_log->ac = ac;
-+      rcf_log->rcRateMax = ath_rc_priv->rate_max_phy;
-+      rcf_log->rcRateTableSize = ath_rc_priv->rate_table_size;
-+}
-+
-+void ath9k_pktlog_rcupdate(struct ath_softc *sc, struct ath_rate_priv *ath_rc_priv, u8 tx_rate,
-+                         u8 rate_code, u8 xretries, u8 retries, int8_t rssi, u16 ac)
-+{
-+      struct ath_pktlog_rcupdate *rcu_log;
-+      struct ath_pktlog *pl_info;
-+      int i;
-+      u32 flags = 0;
-+
-+      pl_info = &sc->pktlog.pktlog;
-+
-+      if ((pl_info->pktlog_filter & ATH_PKTLOG_RCUPDATE) == 0 ||
-+          !sc->is_pkt_logging)
-+              return;
-+
-+      flags |= (((sc->sc_ah->hw_version.macRev <<
-+               PHFLAGS_MACREV_SFT) & PHFLAGS_MACREV_MASK) |
-+               ((sc->sc_ah->hw_version.macVersion <<
-+               PHFLAGS_MACVERSION_SFT) & PHFLAGS_MACVERSION_MASK));
-+      rcu_log = (struct ath_pktlog_rcupdate *)ath_pktlog_getbuf(pl_info,
-+                                              PKTLOG_TYPE_RCUPDATE,
-+                                              sizeof(*rcu_log), flags);
-+
-+      memset(rcu_log, 0, sizeof(*rcu_log));
-+
-+      rcu_log->txRate = tx_rate;
-+      rcu_log->rateCode = rate_code;
-+      rcu_log->Xretries = xretries;
-+      rcu_log->retries = retries;
-+      rcu_log->rssiAck = rssi;
-+      rcu_log->ac = ac;
-+      rcu_log->rcProbeRate = ath_rc_priv->probe_rate;
-+      rcu_log->rcRateMax = ath_rc_priv->rate_max_phy;
-+
-+      for (i = 0; i < RATE_TABLE_SIZE; i++) {
-+              rcu_log->rcPer[i] = ath_rc_priv->per[i];
-+      }
-+}
-+
-+void ath9k_pktlog_txcomplete(struct ath_softc *sc, struct list_head *bf_head,
-+                           struct ath_buf *bf, struct ath_buf *bf_last)
-+{
-+      struct log_tx ;
-+      struct ath_buf *tbf;
-+
-+      list_for_each_entry(tbf, bf_head, list)
-+              ath_pktlog_txctl(sc, tbf);
-+
-+      if (bf->bf_next == NULL && bf_last->bf_stale)
-+              ath_pktlog_txctl(sc, bf_last);
-+}
-+
-+void ath9k_pktlog_txctrl(struct ath_softc *sc, struct list_head *bf_head, struct ath_buf *lastbf)
-+{
-+      struct log_tx ;
-+      struct ath_buf *tbf;
-+
-+      list_for_each_entry(tbf, bf_head, list)
-+              ath_pktlog_txctl(sc, tbf);
-+
-+      /* log the last descriptor. */
-+      ath_pktlog_txctl(sc, lastbf);
-+}
-+
-+static void pktlog_init(struct ath_softc *sc)
-+{
-+      spin_lock_init(&sc->pktlog.pktlog.pktlog_lock);
-+      sc->pktlog.pktlog.pktlog_buf_size = ATH_DEBUGFS_PKTLOG_SIZE_DEFAULT;
-+      sc->pktlog.pktlog.pktlog_buf = NULL;
-+      sc->pktlog.pktlog.pktlog_filter = 0;
-+}
-+
-+int ath9k_init_pktlog(struct ath_softc *sc)
-+{
-+      sc->pktlog.debugfs_pktlog = debugfs_create_dir("pktlog",
-+                      sc->debug.debugfs_phy);
-+      if (!sc->pktlog.debugfs_pktlog)
-+              goto err;
-+
-+      sc->pktlog.pktlog_start = debugfs_create_file("pktlog_start",
-+                      S_IRUGO | S_IWUSR,
-+                      sc->pktlog.debugfs_pktlog,
-+                      sc, &fops_pktlog_start);
-+      if (!sc->pktlog.pktlog_start)
-+              goto err;
-+
-+      sc->pktlog.pktlog_size = debugfs_create_file("pktlog_size",
-+                      S_IRUGO | S_IWUSR,
-+                      sc->pktlog.debugfs_pktlog,
-+                      sc, &fops_pktlog_size);
-+      if (!sc->pktlog.pktlog_size)
-+              goto err;
-+
-+      sc->pktlog.pktlog_filter = debugfs_create_file("pktlog_filter",
-+                      S_IRUGO | S_IWUSR,
-+                      sc->pktlog.debugfs_pktlog,
-+                      sc, &fops_pktlog_filter);
-+      if (!sc->pktlog.pktlog_filter)
-+              goto err;
-+
-+      sc->pktlog.pktlog_dump = debugfs_create_file("pktlog_dump",
-+                      S_IRUGO,
-+                      sc->pktlog.debugfs_pktlog,
-+                      sc, &fops_pktlog_dump);
-+      if (!sc->pktlog.pktlog_dump)
-+              goto err;
-+
-+      pktlog_init(sc);
-+
-+      return 0;
-+
-+err:
-+      return -ENOMEM;
-+}
-+
-+void ath9k_deinit_pktlog(struct ath_softc *sc)
-+{
-+      struct ath_pktlog *pktlog = &sc->pktlog.pktlog;
-+
-+      if (pktlog->pktlog_buf != NULL)
-+              ath_pktlog_release(pktlog);
-+
-+      debugfs_remove(sc->pktlog.pktlog_start);
-+      debugfs_remove(sc->pktlog.pktlog_size);
-+      debugfs_remove(sc->pktlog.pktlog_filter);
-+      debugfs_remove(sc->pktlog.pktlog_dump);
-+      debugfs_remove(sc->pktlog.debugfs_pktlog);
-+}
---- /dev/null
-+++ b/drivers/net/wireless/ath/ath9k/pktlog.h
-@@ -0,0 +1,235 @@
-+#ifndef PKTLOG_H
-+#define PKTLOG_H
-+
-+#ifdef CONFIG_ATH9K_PKTLOG
-+#define CUR_PKTLOG_VER          10010  /* Packet log version */
-+#define PKTLOG_MAGIC_NUM        7735225
-+#define ATH_PKTLOG_TX         0x000000001
-+#define ATH_PKTLOG_RX         0x000000002
-+#define ATH_PKTLOG_RCFIND     0x000000004
-+#define ATH_PKTLOG_RCUPDATE   0x000000008
-+
-+#define ATH_DEBUGFS_PKTLOG_SIZE_DEFAULT (1024 * 1024)
-+#define ATH_PKTLOG_FILTER_DEFAULT (ATH_PKTLOG_TX | ATH_PKTLOG_RX |    \
-+              ATH_PKTLOG_RCFIND | ATH_PKTLOG_RCUPDATE)
-+
-+#define PHFLAGS_MACVERSION_MASK 0x00ff0000
-+#define PHFLAGS_MACVERSION_SFT  16
-+#define PHFLAGS_MACREV_MASK 0xff0  /* MAC revision */
-+#define PHFLAGS_MACREV_SFT  4
-+
-+struct ath_pktlog_hdr {
-+      u32 flags;
-+      u16 log_type; /* Type of log information foll this header */
-+      int16_t size; /* Size of variable length log information in bytes */
-+      u32 timestamp;
-+}  __packed;
-+
-+/* Types of packet log events */
-+#define PKTLOG_TYPE_TXCTL    0
-+#define PKTLOG_TYPE_TXSTATUS 1
-+#define PKTLOG_TYPE_RX       2
-+#define PKTLOG_TYPE_RCFIND   3
-+#define PKTLOG_TYPE_RCUPDATE 4
-+
-+#define PKTLOG_MAX_TXCTL_WORDS 12
-+#define PKTLOG_MAX_TXSTATUS_WORDS 10
-+#define PKTLOG_MAX_PROTO_WORDS  16
-+
-+struct ath_pktlog_txctl {
-+      __le16 framectrl;       /* frame control field from header */
-+      __le16 seqctrl;         /* frame control field from header */
-+      u16 bssid_tail;      /* last two octets of bssid */
-+      u16 sa_tail;         /* last two octets of SA */
-+      u16 da_tail;         /* last two octets of DA */
-+      u16 resvd;
-+      u32 txdesc_ctl[PKTLOG_MAX_TXCTL_WORDS];     /* Tx descriptor words */
-+      unsigned long proto_hdr;   /* protocol header (variable length!) */
-+      int32_t misc[0]; /* Can be used for HT specific or other misc info */
-+}  __packed;
-+
-+struct ath_pktlog_txstatus {
-+      /* Tx descriptor status words */
-+      u32 txdesc_status[PKTLOG_MAX_TXSTATUS_WORDS];
-+      int32_t misc[0]; /* Can be used for HT specific or other misc info */
-+}  __packed;
-+
-+#define PKTLOG_MAX_RXSTATUS_WORDS 11
-+
-+struct ath_pktlog_rx {
-+      u16 framectrl;       /* frame control field from header */
-+      u16 seqctrl;         /* sequence control field */
-+      u16 bssid_tail;      /* last two octets of bssid */
-+      u16 sa_tail;         /* last two octets of SA */
-+      u16 da_tail;         /* last two octets of DA */
-+      u16 resvd;
-+      u32 rxdesc_status[PKTLOG_MAX_RXSTATUS_WORDS];  /* Rx descriptor words */
-+      unsigned long proto_hdr;   /* protocol header (variable length!) */
-+      int32_t misc[0];    /* Can be used for HT specific or other misc info */
-+}  __packed;
-+
-+struct ath_pktlog_rcfind {
-+      u8 rate;
-+      u8 rateCode;
-+      s8 rcRssiLast;
-+      s8 rcRssiLastPrev;
-+      s8 rcRssiLastPrev2;
-+      s8 rssiReduce;
-+      u8 rcProbeRate;
-+      s8 isProbing;
-+      s8 primeInUse;
-+      s8 currentPrimeState;
-+      u8 rcRateTableSize;
-+      u8 rcRateMax;
-+      u8 ac;
-+      int32_t misc[0]; /* Can be used for HT specific or other misc info */
-+}  __packed;
-+
-+struct ath_pktlog_rcupdate {
-+      u8 txRate;
-+      u8 rateCode;
-+      s8 rssiAck;
-+      u8 Xretries;
-+      u8 retries;
-+      s8 rcRssiLast;
-+      s8 rcRssiLastLkup;
-+      s8 rcRssiLastPrev;
-+      s8 rcRssiLastPrev2;
-+      u8 rcProbeRate;
-+      u8 rcRateMax;
-+      s8 useTurboPrime;
-+      s8 currentBoostState;
-+      u8 rcHwMaxRetryRate;
-+      u8 ac;
-+      u8 resvd[2];
-+      s8 rcRssiThres[RATE_TABLE_SIZE];
-+      u8 rcPer[RATE_TABLE_SIZE];
-+      u8 resv2[RATE_TABLE_SIZE + 5];
-+      int32_t misc[0]; /* Can be used for HT specific or other misc info */
-+};
-+
-+#define TXCTL_OFFSET(ah)      (AR_SREV_9300_20_OR_LATER(ah) ? 11 : 2)
-+#define TXCTL_NUMWORDS(ah)    (AR_SREV_5416_20_OR_LATER(ah) ? 12 : 8)
-+#define TXSTATUS_OFFSET(ah)   (AR_SREV_9300_20_OR_LATER(ah) ? 2 : 14)
-+#define TXSTATUS_NUMWORDS(ah) (AR_SREV_9300_20_OR_LATER(ah) ? 7 : 10)
-+
-+#define RXCTL_OFFSET(ah)      (AR_SREV_9300_20_OR_LATER(ah) ? 0 : 3)
-+#define RXCTL_NUMWORDS(ah)    (AR_SREV_9300_20_OR_LATER(ah) ? 0 : 1)
-+#define RXSTATUS_OFFSET(ah)   (AR_SREV_9300_20_OR_LATER(ah) ? 1 : 4)
-+#define RXSTATUS_NUMWORDS(ah) (AR_SREV_9300_20_OR_LATER(ah) ? 11 : 9)
-+
-+struct ath_desc_info {
-+      u8 txctl_offset;
-+      u8 txctl_numwords;
-+      u8 txstatus_offset;
-+      u8 txstatus_numwords;
-+      u8 rxctl_offset;
-+      u8 rxctl_numwords;
-+      u8 rxstatus_offset;
-+      u8 rxstatus_numwords;
-+};
-+
-+#define PKTLOG_MOV_RD_IDX(_rd_offset, _log_buf, _log_size)  \
-+      do { \
-+              if ((_rd_offset + sizeof(struct ath_pktlog_hdr) + \
-+                  ((struct ath_pktlog_hdr *)((_log_buf)->log_data + \
-+                          (_rd_offset)))->size) <= _log_size) { \
-+                      _rd_offset = ((_rd_offset) + \
-+                                      sizeof(struct ath_pktlog_hdr) + \
-+                                      ((struct ath_pktlog_hdr *) \
-+                                       ((_log_buf)->log_data + \
-+                                        (_rd_offset)))->size); \
-+              } else { \
-+                      _rd_offset = ((struct ath_pktlog_hdr *) \
-+                                      ((_log_buf)->log_data +  \
-+                                       (_rd_offset)))->size;  \
-+              } \
-+              (_rd_offset) = (((_log_size) - (_rd_offset)) >= \
-+                              sizeof(struct ath_pktlog_hdr)) ? \
-+              _rd_offset : 0; \
-+      } while (0);
-+
-+struct ath_pktlog_bufhdr {
-+      u32 magic_num;  /* Used by post processing scripts */
-+      u32 version;    /* Set to CUR_PKTLOG_VER */
-+};
-+
-+struct ath_pktlog_buf {
-+      struct ath_pktlog_bufhdr bufhdr;
-+      int32_t rd_offset;
-+      int32_t wr_offset;
-+      char log_data[0];
-+};
-+
-+struct ath_pktlog {
-+      struct ath_pktlog_buf *pktlog_buf;
-+      u32 pktlog_filter;
-+      u32 pktlog_buf_size;           /* Size of buffer in bytes */
-+      spinlock_t pktlog_lock;
-+};
-+
-+struct ath_pktlog_debugfs {
-+      struct dentry *debugfs_pktlog;
-+      struct dentry *pktlog_enable;
-+      struct dentry *pktlog_start;
-+      struct dentry *pktlog_filter;
-+      struct dentry *pktlog_size;
-+      struct dentry *pktlog_dump;
-+      struct ath_pktlog pktlog;
-+};
-+
-+void ath_pktlog_txctl(struct ath_softc *sc, struct ath_buf *bf);
-+void ath_pktlog_txstatus(struct ath_softc *sc, void *ds);
-+void ath_pktlog_rx(struct ath_softc *sc, void *ds, struct sk_buff *skb);
-+void ath9k_pktlog_rc(struct ath_softc *sc, struct ath_rate_priv *ath_rc_priv,
-+              int8_t ratecode, u8 rate, int8_t is_probing, u16 ac);
-+void ath9k_pktlog_rcupdate(struct ath_softc *sc,
-+                         struct ath_rate_priv *ath_rc_priv, u8 tx_rate,
-+                         u8 rate_code, u8 xretries, u8 retries, int8_t rssi,
-+                         u16 ac);
-+void ath9k_pktlog_txcomplete(struct ath_softc *sc ,struct list_head *bf_head,
-+                           struct ath_buf *bf, struct ath_buf *bf_last);
-+void ath9k_pktlog_txctrl(struct ath_softc *sc, struct list_head *bf_head,
-+                       struct ath_buf *lastbf);
-+int ath9k_init_pktlog(struct ath_softc *sc);
-+void ath9k_deinit_pktlog(struct ath_softc *sc);
-+#else /* CONFIG_ATH9K_PKTLOG */
-+static inline void ath_pktlog_txstatus(struct ath_softc *sc, void *ds)
-+{
-+}
-+
-+static inline void ath_pktlog_rx(struct ath_softc *sc, void *ds,
-+                               struct sk_buff *skb)
-+{
-+}
-+
-+static inline void ath9k_pktlog_rc(struct ath_softc *sc,
-+                                 struct ath_rate_priv *ath_rc_priv,
-+                                 int8_t ratecode, u8 rate,
-+                                 int8_t is_probing, u16 ac)
-+{
-+}
-+
-+static inline void ath9k_pktlog_rcupdate(struct ath_softc *sc,
-+                                       struct ath_rate_priv *ath_rc_priv,
-+                                       u8 tx_rate, u8 rate_code,
-+                                       u8 xretries, u8 retries,
-+                                       int8_t rssi, u16 ac)
-+{
-+}
-+
-+static inline void ath9k_pktlog_txcomplete(struct ath_softc *sc,
-+                                         struct list_head *bf_head,
-+                                         struct ath_buf *bf,
-+                                         struct ath_buf *bf_last)
-+{
-+}
-+
-+static inline void ath9k_pktlog_txctrl(struct ath_softc *sc,
-+                                     struct list_head *bf_head,
-+                                     struct ath_buf *lastbf)
-+{
-+}
-+#endif /* CONFIG_ATH9K_PKTLOG */
-+
-+#endif
---- a/drivers/net/wireless/ath/ath9k/rc.c
-+++ b/drivers/net/wireless/ath/ath9k/rc.c
-@@ -40,73 +40,75 @@ static const struct ath_rate_table ar541
-               { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
-                       29300, 7, 108, 4, 7, 7, 7, 7 },
-               { VALID_2040, VALID_2040, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
--                      6400, 0, 0, 0, 8, 24, 8, 24 },
-+                      6400, 0, 0, 0, 8, 25, 8, 25 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
--                      12700, 1, 1, 2, 9, 25, 9, 25 },
-+                      12700, 1, 1, 2, 9, 26, 9, 26 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
--                      18800, 2, 2, 2, 10, 26, 10, 26 },
-+                      18800, 2, 2, 2, 10, 27, 10, 27 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
--                      25000, 3, 3, 4, 11, 27, 11, 27 },
-+                      25000, 3, 3, 4, 11, 28, 11, 28 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
--                      36700, 4, 4, 4, 12, 28, 12, 28 },
-+                      36700, 4, 4, 4, 12, 29, 12, 29 },
-               { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
--                      48100, 5, 5, 4, 13, 29, 13, 29 },
-+                      48100, 5, 5, 4, 13, 30, 13, 30 },
-               { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
--                      53500, 6, 6, 4, 14, 30, 14, 30 },
-+                      53500, 6, 6, 4, 14, 31, 14, 31 },
-               { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
--                      59000, 7, 7, 4, 15, 31, 15, 32 },
-+                      59000, 7, 7, 4, 15, 32, 15, 33 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
--                      12700, 8, 8, 3, 16, 33, 16, 33 },
-+                      12700, 8, 8, 3, 16, 34, 16, 34 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
--                      24800, 9, 9, 2, 17, 34, 17, 34 },
-+                      24800, 9, 9, 2, 17, 35, 17, 35 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
--                      36600, 10, 10, 2, 18, 35, 18, 35 },
-+                      36600, 10, 10, 2, 18, 36, 18, 36 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
--                      48100, 11, 11, 4, 19, 36, 19, 36 },
-+                      48100, 11, 11, 4, 19, 37, 19, 37 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
--                      69500, 12, 12, 4, 20, 37, 20, 37 },
-+                      69500, 12, 12, 4, 20, 38, 20, 38 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
--                      89500, 13, 13, 4, 21, 38, 21, 38 },
-+                      89500, 13, 13, 4, 21, 39, 21, 39 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
--                      98900, 14, 14, 4, 22, 39, 22, 39 },
-+                      98900, 14, 14, 4, 22, 40, 22, 40 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
--                      108300, 15, 15, 4, 23, 40, 23, 41 },
-+                      108300, 15, 15, 4, 23, 41, 24, 42 },
-+              { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS_HGI, 144400, /* 144.4 Mb */
-+                      12000, 15, 15, 4, 23, 41, 24, 42 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
--                      13200, 0, 0, 0, 8, 24, 24, 24 },
-+                      13200, 0, 0, 0, 8, 25, 25, 25 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
--                      25900, 1, 1, 2, 9, 25, 25, 25 },
-+                      25900, 1, 1, 2, 9, 26, 26, 26 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
--                      38600, 2, 2, 2, 10, 26, 26, 26 },
-+                      38600, 2, 2, 2, 10, 27, 27, 27 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
--                      49800, 3, 3, 4, 11, 27, 27, 27 },
-+                      49800, 3, 3, 4, 11, 28, 28, 28 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
--                      72200, 4, 4, 4, 12, 28, 28, 28 },
-+                      72200, 4, 4, 4, 12, 29, 29, 29 },
-               { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
--                      92900, 5, 5, 4, 13, 29, 29, 29 },
-+                      92900, 5, 5, 4, 13, 30, 30, 30 },
-               { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
--                      102700, 6, 6, 4, 14, 30, 30, 30 },
-+                      102700, 6, 6, 4, 14, 31, 31, 31 },
-               { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
--                      112000, 7, 7, 4, 15, 31, 32, 32 },
-+                      112000, 7, 7, 4, 15, 32, 33, 33 },
-               { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
--                      122000, 7, 7, 4, 15, 31, 32, 32 },
-+                      122000, 7, 7, 4, 15, 32, 33, 33 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
--                      25800, 8, 8, 0, 16, 33, 33, 33 },
-+                      25800, 8, 8, 0, 16, 34, 34, 34 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
--                      49800, 9, 9, 2, 17, 34, 34, 34 },
-+                      49800, 9, 9, 2, 17, 35, 35, 35 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
--                      71900, 10, 10, 2, 18, 35, 35, 35 },
-+                      71900, 10, 10, 2, 18, 36, 36, 36 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
--                      92500, 11, 11, 4, 19, 36, 36, 36 },
-+                      92500, 11, 11, 4, 19, 37, 37, 37 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
--                      130300, 12, 12, 4, 20, 37, 37, 37 },
-+                      130300, 12, 12, 4, 20, 38, 38, 38 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
--                      162800, 13, 13, 4, 21, 38, 38, 38 },
-+                      162800, 13, 13, 4, 21, 39, 39, 39 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
--                      178200, 14, 14, 4, 22, 39, 39, 39 },
-+                      178200, 14, 14, 4, 22, 40, 40, 40 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
--                      192100, 15, 15, 4, 23, 40, 41, 41 },
-+                      192100, 15, 15, 4, 23, 41, 42, 42 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
--                      207000, 15, 15, 4, 23, 40, 41, 41 },
-+                      207000, 15, 15, 4, 23, 41, 42, 42 },
-       },
-       50,  /* probe interval */
-       WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
-@@ -144,73 +146,75 @@ static const struct ath_rate_table ar541
-               { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
-                       30900, 11, 108, 8, 11, 11, 11, 11 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
--                      6400, 0, 0, 4, 12, 28, 12, 28 },
-+                      6400, 0, 0, 4, 12, 29, 12, 29 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
--                      12700, 1, 1, 6, 13, 29, 13, 29 },
-+                      12700, 1, 1, 6, 13, 30, 13, 30 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
--                      18800, 2, 2, 6, 14, 30, 14, 30 },
-+                      18800, 2, 2, 6, 14, 31, 14, 31 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
--                      25000, 3, 3, 8, 15, 31, 15, 31 },
-+                      25000, 3, 3, 8, 15, 32, 15, 32 },
-               { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
--                      36700, 4, 4, 8, 16, 32, 16, 32 },
-+                      36700, 4, 4, 8, 16, 33, 16, 33 },
-               { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
--                      48100, 5, 5, 8, 17, 33, 17, 33 },
-+                      48100, 5, 5, 8, 17, 34, 17, 34 },
-               { INVALID,  VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
--                      53500, 6, 6, 8, 18, 34, 18, 34 },
-+                      53500, 6, 6, 8, 18, 35, 18, 35 },
-               { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
--                      59000, 7, 7, 8, 19, 35, 19, 36 },
-+                      59000, 7, 7, 8, 19, 36, 19, 37 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
--                      12700, 8, 8, 4, 20, 37, 20, 37 },
-+                      12700, 8, 8, 4, 20, 38, 20, 38 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
--                      24800, 9, 9, 6, 21, 38, 21, 38 },
-+                      24800, 9, 9, 6, 21, 39, 21, 39 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
--                      36600, 10, 10, 6, 22, 39, 22, 39 },
-+                      36600, 10, 10, 6, 22, 40, 22, 40 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
--                      48100, 11, 11, 8, 23, 40, 23, 40 },
-+                      48100, 11, 11, 8, 23, 41, 23, 41 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
--                      69500, 12, 12, 8, 24, 41, 24, 41 },
-+                      69500, 12, 12, 8, 24, 42, 24, 42 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
--                      89500, 13, 13, 8, 25, 42, 25, 42 },
-+                      89500, 13, 13, 8, 25, 43, 25, 43 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
--                      98900, 14, 14, 8, 26, 43, 26, 44 },
-+                      98900, 14, 14, 8, 26, 44, 26, 44 },
-               { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
--                      108300, 15, 15, 8, 27, 44, 27, 45 },
-+                      108300, 15, 15, 8, 27, 45, 28, 46 },
-+              { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS_HGI, 144400, /* 130 Mb */
-+                      120000, 15, 15, 8, 27, 45, 28, 46 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
--                      13200, 0, 0, 8, 12, 28, 28, 28 },
-+                      13200, 0, 0, 8, 12, 29, 29, 29 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
--                      25900, 1, 1, 8, 13, 29, 29, 29 },
-+                      25900, 1, 1, 8, 13, 30, 30, 30 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
--                      38600, 2, 2, 8, 14, 30, 30, 30 },
-+                      38600, 2, 2, 8, 14, 31, 31, 31 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
--                      49800, 3, 3, 8,  15, 31, 31, 31 },
-+                      49800, 3, 3, 8,  15, 32, 32, 32 },
-               { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
--                      72200, 4, 4, 8, 16, 32, 32, 32 },
-+                      72200, 4, 4, 8, 16, 33, 33, 33 },
-               { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
--                      92900, 5, 5, 8, 17, 33, 33, 33 },
-+                      92900, 5, 5, 8, 17, 34, 34, 34 },
-               { INVALID,  VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
--                      102700, 6, 6, 8, 18, 34, 34, 34 },
-+                      102700, 6, 6, 8, 18, 35, 35, 35 },
-               { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
--                      112000, 7, 7, 8, 19, 35, 36, 36 },
-+                      112000, 7, 7, 8, 19, 36, 37, 37 },
-               { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
--                      122000, 7, 7, 8, 19, 35, 36, 36 },
-+                      122000, 7, 7, 8, 19, 36, 37, 37 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
--                      25800, 8, 8, 8, 20, 37, 37, 37 },
-+                      25800, 8, 8, 8, 20, 38, 38, 38 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
--                      49800, 9, 9, 8, 21, 38, 38, 38 },
-+                      49800, 9, 9, 8, 21, 39, 39, 39 },
-               { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
--                      71900, 10, 10, 8, 22, 39, 39, 39 },
-+                      71900, 10, 10, 8, 22, 40, 40, 40 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
--                      92500, 11, 11, 8, 23, 40, 40, 40 },
-+                      92500, 11, 11, 8, 23, 41, 41, 41 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
--                      130300, 12, 12, 8, 24, 41, 41, 41 },
-+                      130300, 12, 12, 8, 24, 42, 42, 42 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
--                      162800, 13, 13, 8, 25, 42, 42, 42 },
-+                      162800, 13, 13, 8, 25, 43, 43, 43 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
--                      178200, 14, 14, 8, 26, 43, 43, 43 },
-+                      178200, 14, 14, 8, 26, 44, 44, 44 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
--                      192100, 15, 15, 8, 27, 44, 45, 45 },
-+                      192100, 15, 15, 8, 27, 45, 46, 46 },
-               { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
--                      207000, 15, 15, 8, 27, 44, 45, 45 },
-+                      207000, 15, 15, 8, 27, 45, 46, 46 },
-       },
-       50,  /* probe interval */
-       WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
-@@ -510,7 +514,7 @@ static u8 ath_rc_setvalid_htrates(struct
- static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
-                                struct ath_rate_priv *ath_rc_priv,
-                                const struct ath_rate_table *rate_table,
--                               int *is_probing)
-+                               int *is_probing, u16 ac)
- {
-       u32 best_thruput, this_thruput, now_msec;
-       u8 rate, next_rate, best_rate, maxindex, minindex;
-@@ -598,6 +602,8 @@ static u8 ath_rc_get_highest_rix(struct 
- 
-       rate = ath_rc_priv->valid_rate_index[0];
- 
-+      ath9k_pktlog_rc(sc, ath_rc_priv,  rate_table->info[rate].ratecode,
-+                    rate, *is_probing, ac);
-       return rate;
- }
- 
-@@ -689,7 +695,7 @@ static void ath_get_rate(void *priv, str
-       try_per_rate = 4;
- 
-       rate_table = sc->cur_rate_table;
--      rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe);
-+      rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe, skb_get_queue_mapping(skb));
- 
-       /*
-        * If we're in HT mode and both us and our peer supports LDPC.
-@@ -929,7 +935,8 @@ static bool ath_rc_update_per(struct ath
- static void ath_rc_update_ht(struct ath_softc *sc,
-                            struct ath_rate_priv *ath_rc_priv,
-                            struct ieee80211_tx_info *tx_info,
--                           int tx_rate, int xretries, int retries)
-+                           int tx_rate, int xretries, int retries,
-+                           u16 ac)
- {
-       u32 now_msec = jiffies_to_msecs(jiffies);
-       int rate;
-@@ -998,6 +1005,9 @@ static void ath_rc_update_ht(struct ath_
-       ath_debug_stat_retries(sc, tx_rate, xretries, retries,
-                              ath_rc_priv->per[tx_rate]);
- 
-+      ath9k_pktlog_rcupdate(sc, ath_rc_priv, tx_rate,
-+                      rate_table->info[tx_rate].ratecode,
-+                      xretries, retries, tx_info->status.ack_signal, ac);
- }
- 
- static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
-@@ -1025,7 +1035,8 @@ static int ath_rc_get_rateindex(const st
- static void ath_rc_tx_status(struct ath_softc *sc,
-                            struct ath_rate_priv *ath_rc_priv,
-                            struct ieee80211_tx_info *tx_info,
--                           int final_ts_idx, int xretries, int long_retry)
-+                           int final_ts_idx, int xretries, int long_retry,
-+                           u16 ac)
- {
-       const struct ath_rate_table *rate_table;
-       struct ieee80211_tx_rate *rates = tx_info->status.rates;
-@@ -1054,7 +1065,7 @@ static void ath_rc_tx_status(struct ath_
-                               rix = ath_rc_get_rateindex(rate_table, &rates[i]);
-                               ath_rc_update_ht(sc, ath_rc_priv, tx_info,
-                                               rix, xretries ? 1 : 2,
--                                              rates[i].count);
-+                                              rates[i].count, ac);
-                       }
-               }
-       } else {
-@@ -1076,7 +1087,7 @@ static void ath_rc_tx_status(struct ath_
-               return;
- 
-       rix = ath_rc_get_rateindex(rate_table, &rates[i]);
--      ath_rc_update_ht(sc, ath_rc_priv, tx_info, rix, xretries, long_retry);
-+      ath_rc_update_ht(sc, ath_rc_priv, tx_info, rix, xretries, long_retry, ac);
- }
- 
- static const
-@@ -1193,7 +1204,7 @@ static void ath_rc_init(struct ath_softc
- }
- 
- static u8 ath_rc_build_ht_caps(struct ath_softc *sc, struct ieee80211_sta *sta,
--                             bool is_cw40, bool is_sgi40)
-+                             bool is_cw40, bool is_sgi)
- {
-       u8 caps = 0;
- 
-@@ -1206,8 +1217,9 @@ static u8 ath_rc_build_ht_caps(struct at
-               }
-               if (is_cw40)
-                       caps |= WLAN_RC_40_FLAG;
--              if (is_sgi40)
-+              if (is_sgi)
-                       caps |= WLAN_RC_SGI_FLAG;
-+
-       }
- 
-       return caps;
-@@ -1272,7 +1284,8 @@ static void ath_tx_status(void *priv, st
-               tx_status = 1;
- 
-       ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status,
--                       (is_underrun) ? sc->hw->max_rate_tries : long_retry);
-+                       (is_underrun) ? sc->hw->max_rate_tries : long_retry,
-+                       skb_get_queue_mapping(skb));
- 
-       /* Check if aggregation has to be enabled for this tid */
-       if (conf_is_ht(&sc->hw->conf) &&
-@@ -1300,7 +1313,7 @@ static void ath_rate_init(void *priv, st
-       struct ath_softc *sc = priv;
-       struct ath_rate_priv *ath_rc_priv = priv_sta;
-       const struct ath_rate_table *rate_table;
--      bool is_cw40, is_sgi40;
-+      bool is_cw40, is_sgi = false;
-       int i, j = 0;
- 
-       for (i = 0; i < sband->n_bitrates; i++) {
-@@ -1323,7 +1336,11 @@ static void ath_rate_init(void *priv, st
-       }
- 
-       is_cw40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40;
--      is_sgi40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40;
-+
-+      if (is_cw40)
-+              is_sgi = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40;
-+      else if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_SGI_20)
-+              is_sgi = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20;
- 
-       /* Choose rate table first */
- 
-@@ -1336,7 +1353,7 @@ static void ath_rate_init(void *priv, st
-               rate_table = hw_rate_table[sc->cur_rate_mode];
-       }
- 
--      ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta, is_cw40, is_sgi40);
-+      ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta, is_cw40, is_sgi);
-       ath_rc_init(sc, priv_sta, sband, sta, rate_table);
- }
- 
-@@ -1347,10 +1364,10 @@ static void ath_rate_update(void *priv, 
-       struct ath_softc *sc = priv;
-       struct ath_rate_priv *ath_rc_priv = priv_sta;
-       const struct ath_rate_table *rate_table = NULL;
--      bool oper_cw40 = false, oper_sgi40;
-+      bool oper_cw40 = false, oper_sgi;
-       bool local_cw40 = (ath_rc_priv->ht_cap & WLAN_RC_40_FLAG) ?
-               true : false;
--      bool local_sgi40 = (ath_rc_priv->ht_cap & WLAN_RC_SGI_FLAG) ?
-+      bool local_sgi = (ath_rc_priv->ht_cap & WLAN_RC_SGI_FLAG) ?
-               true : false;
- 
-       /* FIXME: Handle AP mode later when we support CWM */
-@@ -1363,15 +1380,21 @@ static void ath_rate_update(void *priv, 
-                   oper_chan_type == NL80211_CHAN_HT40PLUS)
-                       oper_cw40 = true;
- 
--              oper_sgi40 = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
--                      true : false;
-+              if (oper_cw40)
-+                      oper_sgi = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
-+                                 true : false;
-+              else if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_SGI_20)
-+                      oper_sgi = (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
-+                                 true : false;
-+              else
-+                      oper_sgi = false;
- 
--              if ((local_cw40 != oper_cw40) || (local_sgi40 != oper_sgi40)) {
-+              if ((local_cw40 != oper_cw40) || (local_sgi != oper_sgi)) {
-                       rate_table = ath_choose_rate_table(sc, sband->band,
-                                                  sta->ht_cap.ht_supported,
-                                                  oper_cw40);
-                       ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta,
--                                                 oper_cw40, oper_sgi40);
-+                                                 oper_cw40, oper_sgi);
-                       ath_rc_init(sc, priv_sta, sband, sta, rate_table);
- 
-                       ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_CONFIG,
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -700,12 +700,16 @@ static bool ath_edma_get_buffers(struct 
-       bf = SKB_CB_ATHBUF(skb);
-       BUG_ON(!bf);
- 
--      dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
-+      dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
-                               common->rx_bufsize, DMA_FROM_DEVICE);
- 
-       ret = ath9k_hw_process_rxdesc_edma(ah, NULL, skb->data);
--      if (ret == -EINPROGRESS)
-+      if (ret == -EINPROGRESS) {
-+              /*let device gain the buffer again*/
-+              dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
-+                              common->rx_bufsize, DMA_FROM_DEVICE);
-               return false;
-+      }
- 
-       __skb_unlink(skb, &rx_edma->rx_fifo);
-       if (ret == -EINVAL) {
-@@ -814,13 +818,266 @@ static struct ath_buf *ath_get_next_rx_b
-        * 1. accessing the frame
-        * 2. requeueing the same buffer to h/w
-        */
--      dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
-+      dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr,
-                       common->rx_bufsize,
-                       DMA_FROM_DEVICE);
- 
-       return bf;
- }
- 
-+/* Assumes you've already done the endian to CPU conversion */
-+static bool ath9k_rx_accept(struct ath_common *common,
-+                          struct ieee80211_hdr *hdr,
-+                          struct ieee80211_rx_status *rxs,
-+                          struct ath_rx_status *rx_stats,
-+                          bool *decrypt_error)
-+{
-+      struct ath_hw *ah = common->ah;
-+      __le16 fc;
-+      u8 rx_status_len = ah->caps.rx_status_len;
-+
-+      fc = hdr->frame_control;
-+
-+      if (!rx_stats->rs_datalen)
-+              return false;
-+        /*
-+         * rs_status follows rs_datalen so if rs_datalen is too large
-+         * we can take a hint that hardware corrupted it, so ignore
-+         * those frames.
-+         */
-+      if (rx_stats->rs_datalen > (common->rx_bufsize - rx_status_len))
-+              return false;
-+
-+      /*
-+       * rs_more indicates chained descriptors which can be used
-+       * to link buffers together for a sort of scatter-gather
-+       * operation.
-+       * reject the frame, we don't support scatter-gather yet and
-+       * the frame is probably corrupt anyway
-+       */
-+      if (rx_stats->rs_more)
-+              return false;
-+
-+      /*
-+       * The rx_stats->rs_status will not be set until the end of the
-+       * chained descriptors so it can be ignored if rs_more is set. The
-+       * rs_more will be false at the last element of the chained
-+       * descriptors.
-+       */
-+      if (rx_stats->rs_status != 0) {
-+              if (rx_stats->rs_status & ATH9K_RXERR_CRC)
-+                      rxs->flag |= RX_FLAG_FAILED_FCS_CRC;
-+              if (rx_stats->rs_status & ATH9K_RXERR_PHY)
-+                      return false;
-+
-+              if (rx_stats->rs_status & ATH9K_RXERR_DECRYPT) {
-+                      *decrypt_error = true;
-+              } else if (rx_stats->rs_status & ATH9K_RXERR_MIC) {
-+                      if (ieee80211_is_ctl(fc))
-+                              /*
-+                               * Sometimes, we get invalid
-+                               * MIC failures on valid control frames.
-+                               * Remove these mic errors.
-+                               */
-+                              rx_stats->rs_status &= ~ATH9K_RXERR_MIC;
-+                      else
-+                              rxs->flag |= RX_FLAG_MMIC_ERROR;
-+              }
-+              /*
-+               * Reject error frames with the exception of
-+               * decryption and MIC failures. For monitor mode,
-+               * we also ignore the CRC error.
-+               */
-+              if (ah->opmode == NL80211_IFTYPE_MONITOR) {
-+                      if (rx_stats->rs_status &
-+                          ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC |
-+                            ATH9K_RXERR_CRC))
-+                              return false;
-+              } else {
-+                      if (rx_stats->rs_status &
-+                          ~(ATH9K_RXERR_DECRYPT | ATH9K_RXERR_MIC)) {
-+                              return false;
-+                      }
-+              }
-+      }
-+      return true;
-+}
-+
-+static int ath9k_process_rate(struct ath_common *common,
-+                            struct ieee80211_hw *hw,
-+                            struct ath_rx_status *rx_stats,
-+                            struct ieee80211_rx_status *rxs)
-+{
-+      struct ieee80211_supported_band *sband;
-+      enum ieee80211_band band;
-+      unsigned int i = 0;
-+
-+      band = hw->conf.channel->band;
-+      sband = hw->wiphy->bands[band];
-+
-+      if (rx_stats->rs_rate & 0x80) {
-+              /* HT rate */
-+              rxs->flag |= RX_FLAG_HT;
-+              if (rx_stats->rs_flags & ATH9K_RX_2040)
-+                      rxs->flag |= RX_FLAG_40MHZ;
-+              if (rx_stats->rs_flags & ATH9K_RX_GI)
-+                      rxs->flag |= RX_FLAG_SHORT_GI;
-+              rxs->rate_idx = rx_stats->rs_rate & 0x7f;
-+              return 0;
-+      }
-+
-+      for (i = 0; i < sband->n_bitrates; i++) {
-+              if (sband->bitrates[i].hw_value == rx_stats->rs_rate) {
-+                      rxs->rate_idx = i;
-+                      return 0;
-+              }
-+              if (sband->bitrates[i].hw_value_short == rx_stats->rs_rate) {
-+                      rxs->flag |= RX_FLAG_SHORTPRE;
-+                      rxs->rate_idx = i;
-+                      return 0;
-+              }
-+      }
-+
-+      /*
-+       * No valid hardware bitrate found -- we should not get here
-+       * because hardware has already validated this frame as OK.
-+       */
-+      ath_print(common, ATH_DBG_XMIT, "unsupported hw bitrate detected "
-+                "0x%02x using 1 Mbit\n", rx_stats->rs_rate);
-+
-+      return -EINVAL;
-+}
-+
-+static void ath9k_process_rssi(struct ath_common *common,
-+                             struct ieee80211_hw *hw,
-+                             struct ieee80211_hdr *hdr,
-+                             struct ath_rx_status *rx_stats)
-+{
-+      struct ath_hw *ah = common->ah;
-+      struct ieee80211_sta *sta;
-+      struct ath_node *an;
-+      int last_rssi = ATH_RSSI_DUMMY_MARKER;
-+      __le16 fc;
-+
-+      fc = hdr->frame_control;
-+
-+      rcu_read_lock();
-+      /*
-+       * XXX: use ieee80211_find_sta! This requires quite a bit of work
-+       * under the current ath9k virtual wiphy implementation as we have
-+       * no way of tying a vif to wiphy. Typically vifs are attached to
-+       * at least one sdata of a wiphy on mac80211 but with ath9k virtual
-+       * wiphy you'd have to iterate over every wiphy and each sdata.
-+       */
-+      sta = ieee80211_find_sta_by_hw(hw, hdr->addr2);
-+      if (sta) {
-+              an = (struct ath_node *) sta->drv_priv;
-+              if (rx_stats->rs_rssi != ATH9K_RSSI_BAD &&
-+                 !rx_stats->rs_moreaggr)
-+                      ATH_RSSI_LPF(an->last_rssi, rx_stats->rs_rssi);
-+              last_rssi = an->last_rssi;
-+      }
-+      rcu_read_unlock();
-+
-+      if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-+              rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
-+                                            ATH_RSSI_EP_MULTIPLIER);
-+      if (rx_stats->rs_rssi < 0)
-+              rx_stats->rs_rssi = 0;
-+
-+      /* Update Beacon RSSI, this is used by ANI. */
-+      if (ieee80211_is_beacon(fc))
-+              ah->stats.avgbrssi = rx_stats->rs_rssi;
-+}
-+
-+/*
-+ * For Decrypt or Demic errors, we only mark packet status here and always push
-+ * up the frame up to let mac80211 handle the actual error case, be it no
-+ * decryption key or real decryption error. This let us keep statistics there.
-+ */
-+static int ath9k_rx_skb_preprocess(struct ath_common *common,
-+                                 struct ieee80211_hw *hw,
-+                                 struct ieee80211_hdr *hdr,
-+                                 struct ath_rx_status *rx_stats,
-+                                 struct ieee80211_rx_status *rx_status,
-+                                 bool *decrypt_error)
-+{
-+      struct ath_hw *ah = common->ah;
-+
-+      memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
-+
-+      /*
-+       * everything but the rate is checked here, the rate check is done
-+       * separately to avoid doing two lookups for a rate for each frame.
-+       */
-+      if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error))
-+              return -EINVAL;
-+
-+      ath9k_process_rssi(common, hw, hdr, rx_stats);
-+
-+      if (ath9k_process_rate(common, hw, rx_stats, rx_status))
-+              return -EINVAL;
-+
-+      rx_status->mactime = ath9k_hw_extend_tsf(ah, rx_stats->rs_tstamp);
-+      rx_status->band = hw->conf.channel->band;
-+      rx_status->freq = hw->conf.channel->center_freq;
-+      rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
-+      rx_status->antenna = rx_stats->rs_antenna;
-+      rx_status->flag |= RX_FLAG_TSFT;
-+
-+      return 0;
-+}
-+
-+static void ath9k_rx_skb_postprocess(struct ath_common *common,
-+                                   struct sk_buff *skb,
-+                                   struct ath_rx_status *rx_stats,
-+                                   struct ieee80211_rx_status *rxs,
-+                                   bool decrypt_error)
-+{
-+      struct ath_hw *ah = common->ah;
-+      struct ieee80211_hdr *hdr;
-+      int hdrlen, padpos, padsize;
-+      u8 keyix;
-+      __le16 fc;
-+
-+      /* see if any padding is done by the hw and remove it */
-+      hdr = (struct ieee80211_hdr *) skb->data;
-+      hdrlen = ieee80211_get_hdrlen_from_skb(skb);
-+      fc = hdr->frame_control;
-+      padpos = ath9k_cmn_padpos(hdr->frame_control);
-+
-+      /* The MAC header is padded to have 32-bit boundary if the
-+       * packet payload is non-zero. The general calculation for
-+       * padsize would take into account odd header lengths:
-+       * padsize = (4 - padpos % 4) % 4; However, since only
-+       * even-length headers are used, padding can only be 0 or 2
-+       * bytes and we can optimize this a bit. In addition, we must
-+       * not try to remove padding from short control frames that do
-+       * not have payload. */
-+      padsize = padpos & 3;
-+      if (padsize && skb->len>=padpos+padsize+FCS_LEN) {
-+              memmove(skb->data + padsize, skb->data, padpos);
-+              skb_pull(skb, padsize);
-+      }
-+
-+      keyix = rx_stats->rs_keyix;
-+
-+      if (!(keyix == ATH9K_RXKEYIX_INVALID) && !decrypt_error &&
-+          ieee80211_has_protected(fc)) {
-+              rxs->flag |= RX_FLAG_DECRYPTED;
-+      } else if (ieee80211_has_protected(fc)
-+                 && !decrypt_error && skb->len >= hdrlen + 4) {
-+              keyix = skb->data[hdrlen + 3] >> 6;
-+
-+              if (test_bit(keyix, common->keymap))
-+                      rxs->flag |= RX_FLAG_DECRYPTED;
-+      }
-+      if (ah->sw_mgmt_crypto &&
-+          (rxs->flag & RX_FLAG_DECRYPTED) &&
-+          ieee80211_is_mgmt(fc))
-+              /* Use software decrypt for management frames. */
-+              rxs->flag &= ~RX_FLAG_DECRYPTED;
-+}
- 
- int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
- {
-@@ -829,6 +1086,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
-       struct ieee80211_rx_status *rxs;
-       struct ath_hw *ah = sc->sc_ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-+      u32 *rx_desc = NULL;
-       /*
-        * The hw can techncically differ from common->hw when using ath9k
-        * virtual wiphy so to account for that we iterate over the active
-@@ -842,6 +1100,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
-       enum ath9k_rx_qtype qtype;
-       bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
-       int dma_type;
-+      u8 rx_status_len = ah->caps.rx_status_len;
- 
-       if (edma)
-               dma_type = DMA_FROM_DEVICE;
-@@ -869,7 +1128,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
-               if (!skb)
-                       continue;
- 
--              hdr = (struct ieee80211_hdr *) skb->data;
-+              hdr = (struct ieee80211_hdr *) (skb->data + rx_status_len);
-               rxs =  IEEE80211_SKB_RXCB(skb);
- 
-               hw = ath_get_virt_hw(sc, hdr);
-@@ -883,8 +1142,8 @@ int ath_rx_tasklet(struct ath_softc *sc,
-               if (flush)
-                       goto requeue;
- 
--              retval = ath9k_cmn_rx_skb_preprocess(common, hw, skb, &rs,
--                                                   rxs, &decrypt_error);
-+              retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
-+                                               rxs, &decrypt_error);
-               if (retval)
-                       goto requeue;
- 
-@@ -905,11 +1164,23 @@ int ath_rx_tasklet(struct ath_softc *sc,
-                                dma_type);
- 
-               skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
--              if (ah->caps.rx_status_len)
-+              if (ah->caps.rx_status_len) {
-+                      rx_desc = kzalloc(ah->caps.rx_status_len, GFP_ATOMIC);
-+                      if (rx_desc == NULL)
-+                              BUG_ON(1);
-+                      memcpy(rx_desc, skb->data, ah->caps.rx_status_len);
-                       skb_pull(skb, ah->caps.rx_status_len);
-+              }
-+
-+              ath9k_rx_skb_postprocess(common, skb, &rs,
-+                                       rxs, decrypt_error);
- 
--              ath9k_cmn_rx_skb_postprocess(common, skb, &rs,
--                                           rxs, decrypt_error);
-+              if (rx_desc) {
-+                      ath_pktlog_rx(sc, (void *) rx_desc, skb);
-+                      kfree(rx_desc);
-+              } else {
-+                      ath_pktlog_rx(sc, bf->bf_desc, skb);
-+              }
- 
-               /* We will now give hardware our shiny new allocated skb */
-               bf->bf_mpdu = requeue_skb;
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -222,6 +222,7 @@
- 
- #define AR_ISR_S2              0x008c
- #define AR_ISR_S2_QCU_TXURN    0x000003FF
-+#define AR_ISR_S2_BB_WATCHDOG  0x00010000
- #define AR_ISR_S2_CST          0x00400000
- #define AR_ISR_S2_GTT          0x00800000
- #define AR_ISR_S2_TIM          0x01000000
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -418,6 +418,8 @@ static void ath_tx_complete_aggr(struct 
-                       list_move_tail(&bf->list, &bf_head);
-               }
- 
-+              ath9k_pktlog_txcomplete(sc, &bf_head, bf, bf_last);
-+
-               if (!txpending) {
-                       /*
-                        * complete the acked-ones/xretried ones; update
-@@ -1728,6 +1730,8 @@ static int ath_tx_setup_buffer(struct ie
-       } else
-               bf->bf_isnullfunc = false;
- 
-+      bf->bf_tx_aborted = false;
-+
-       return 0;
- }
- 
-@@ -1989,7 +1993,7 @@ static int ath_tx_num_badfrms(struct ath
-       int nbad = 0;
-       int isaggr = 0;
- 
--      if (bf->bf_tx_aborted)
-+      if (bf->bf_lastbf->bf_tx_aborted)
-               return 0;
- 
-       isaggr = bf_isaggr(bf);
-@@ -2115,7 +2119,7 @@ static void ath_tx_processq(struct ath_s
-               ds = lastbf->bf_desc;
- 
-               memset(&ts, 0, sizeof(ts));
--              status = ath9k_hw_txprocdesc(ah, ds, &ts);
-+              status = ath9k_hw_txprocdesc(ah, ds, &ts, NULL);
-               if (status == -EINPROGRESS) {
-                       spin_unlock_bh(&txq->axq_lock);
-                       break;
-@@ -2165,10 +2169,14 @@ static void ath_tx_processq(struct ath_s
-                       ath_tx_rc_status(bf, &ts, 0, txok, true);
-               }
- 
--              if (bf_isampdu(bf))
-+              if (bf_isampdu(bf)) {
-                       ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok);
--              else
-+              } else {
-+                      ath9k_pktlog_txctrl(sc, &bf_head, lastbf);
-                       ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, txok, 0);
-+              }
-+
-+              ath_pktlog_txstatus(sc, lastbf->bf_desc);
- 
-               ath_wake_mac80211_queue(sc, txq);
- 
-@@ -2240,9 +2248,11 @@ void ath_tx_edma_tasklet(struct ath_soft
-       struct list_head bf_head;
-       int status;
-       int txok;
-+      u32 txs_desc[9];
- 
-       for (;;) {
--              status = ath9k_hw_txprocdesc(ah, NULL, (void *)&txs);
-+              status = ath9k_hw_txprocdesc(ah, NULL, (void *)&txs,
-+                                           (void *) txs_desc);
-               if (status == -EINPROGRESS)
-                       break;
-               if (status == -EIO) {
-@@ -2277,6 +2287,17 @@ void ath_tx_edma_tasklet(struct ath_soft
- 
-               txok = !(txs.ts_status & ATH9K_TXERR_MASK);
- 
-+              /*
-+               * Make sure null func frame is acked before configuring
-+               * hw into ps mode.
-+               */
-+              if (bf->bf_isnullfunc && txok) {
-+                      if ((sc->ps_flags & PS_ENABLED))
-+                              ath9k_enable_ps(sc);
-+                      else
-+                              sc->ps_flags |= PS_NULLFUNC_COMPLETED;
-+              }
-+
-               if (!bf_isampdu(bf)) {
-                       bf->bf_retries = txs.ts_longretry;
-                       if (txs.ts_status & ATH9K_TXERR_XRETRY)
-@@ -2284,14 +2305,18 @@ void ath_tx_edma_tasklet(struct ath_soft
-                       ath_tx_rc_status(bf, &txs, 0, txok, true);
-               }
- 
--              if (bf_isampdu(bf))
-+              if (bf_isampdu(bf)) {
-                       ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, txok);
--              else
-+              } else {
-+                      ath9k_pktlog_txctrl(sc, &bf_head, lastbf);
-                       ath_tx_complete_buf(sc, bf, txq, &bf_head,
-                                           &txs, txok, 0);
-+              }
- 
-               ath_wake_mac80211_queue(sc, txq);
- 
-+              ath_pktlog_txstatus(sc, txs_desc);
-+
-               spin_lock_bh(&txq->axq_lock);
-               if (!list_empty(&txq->txq_fifo_pending)) {
-                       INIT_LIST_HEAD(&bf_head);
---- a/net/mac80211/Kconfig
-+++ b/net/mac80211/Kconfig
-@@ -33,6 +33,13 @@ config MAC80211_RC_MINSTREL
-       ---help---
-         This option enables the 'minstrel' TX rate control algorithm
- 
-+config MAC80211_RC_MINSTREL_HT
-+      bool "Minstrel 802.11n support" if EMBEDDED
-+      depends on MAC80211_RC_MINSTREL
-+      default y
-+      ---help---
-+        This option enables the 'minstrel_ht' TX rate control algorithm
-+
- choice
-       prompt "Default rate control algorithm"
-       depends on MAC80211_HAS_RC
---- a/net/mac80211/Makefile
-+++ b/net/mac80211/Makefile
-@@ -51,7 +51,11 @@ rc80211_pid-$(CONFIG_MAC80211_DEBUGFS) +
- rc80211_minstrel-y := rc80211_minstrel.o
- rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += rc80211_minstrel_debugfs.o
- 
-+rc80211_minstrel_ht-y := rc80211_minstrel_ht.o
-+rc80211_minstrel_ht-$(CONFIG_MAC80211_DEBUGFS) += rc80211_minstrel_ht_debugfs.o
-+
- mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc80211_pid-y)
- mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)
-+mac80211-$(CONFIG_MAC80211_RC_MINSTREL_HT) += $(rc80211_minstrel_ht-y)
- 
- ccflags-y += -D__CHECK_ENDIAN__
---- a/net/mac80211/main.c
-+++ b/net/mac80211/main.c
-@@ -710,6 +710,10 @@ static int __init ieee80211_init(void)
-       if (ret)
-               return ret;
- 
-+      ret = rc80211_minstrel_ht_init();
-+      if (ret)
-+              goto err_minstrel;
-+
-       ret = rc80211_pid_init();
-       if (ret)
-               goto err_pid;
-@@ -722,6 +726,8 @@ static int __init ieee80211_init(void)
-  err_netdev:
-       rc80211_pid_exit();
-  err_pid:
-+      rc80211_minstrel_ht_exit();
-+ err_minstrel:
-       rc80211_minstrel_exit();
- 
-       return ret;
-@@ -730,6 +736,7 @@ static int __init ieee80211_init(void)
- static void __exit ieee80211_exit(void)
- {
-       rc80211_pid_exit();
-+      rc80211_minstrel_ht_exit();
-       rc80211_minstrel_exit();
- 
-       /*
---- a/net/mac80211/rate.h
-+++ b/net/mac80211/rate.h
-@@ -147,5 +147,18 @@ static inline void rc80211_minstrel_exit
- }
- #endif
- 
-+#ifdef CONFIG_MAC80211_RC_MINSTREL_HT
-+extern int rc80211_minstrel_ht_init(void);
-+extern void rc80211_minstrel_ht_exit(void);
-+#else
-+static inline int rc80211_minstrel_ht_init(void)
-+{
-+      return 0;
-+}
-+static inline void rc80211_minstrel_ht_exit(void)
-+{
-+}
-+#endif
-+
- 
- #endif /* IEEE80211_RATE_H */
---- /dev/null
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -0,0 +1,824 @@
-+/*
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#include <linux/netdevice.h>
-+#include <linux/types.h>
-+#include <linux/skbuff.h>
-+#include <linux/debugfs.h>
-+#include <linux/random.h>
-+#include <linux/ieee80211.h>
-+#include <net/mac80211.h>
-+#include "rate.h"
-+#include "rc80211_minstrel.h"
-+#include "rc80211_minstrel_ht.h"
-+
-+#define AVG_PKT_SIZE  1200
-+#define SAMPLE_COLUMNS        10
-+#define EWMA_LEVEL            75
-+
-+/* Number of bits for an average sized packet */
-+#define MCS_NBITS (AVG_PKT_SIZE << 3)
-+
-+/* Number of symbols for a packet with (bps) bits per symbol */
-+#define MCS_NSYMS(bps) ((MCS_NBITS + (bps) - 1) / (bps))
-+
-+/* Transmission time for a packet containing (syms) symbols */
-+#define MCS_SYMBOL_TIME(sgi, syms)                                    \
-+      (sgi ?                                                          \
-+        ((syms) * 18 + 4) / 5 :       /* syms * 3.6 us */             \
-+        (syms) << 2                   /* syms * 4 us */               \
-+      )
-+
-+/* Transmit duration for the raw data part of an average sized packet */
-+#define MCS_DURATION(streams, sgi, bps) MCS_SYMBOL_TIME(sgi, MCS_NSYMS((streams) * (bps)))
-+
-+/* MCS rate information for an MCS group */
-+#define MCS_GROUP(_streams, _sgi, _ht40) {                            \
-+      .streams = _streams,                                            \
-+      .flags =                                                        \
-+              (_sgi ? IEEE80211_TX_RC_SHORT_GI : 0) |                 \
-+              (_ht40 ? IEEE80211_TX_RC_40_MHZ_WIDTH : 0),             \
-+      .duration = {                                                   \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 54 : 26),          \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 108 : 52),         \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 162 : 78),         \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 216 : 104),        \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 324 : 156),        \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 432 : 208),        \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 486 : 234),        \
-+              MCS_DURATION(_streams, _sgi, _ht40 ? 540 : 260)         \
-+      }                                                               \
-+}
-+
-+/*
-+ * To enable sufficiently targeted rate sampling, MCS rates are divided into
-+ * groups, based on the number of streams and flags (HT40, SGI) that they
-+ * use.
-+ */
-+const struct mcs_group minstrel_mcs_groups[] = {
-+      MCS_GROUP(1, 0, 0),
-+      MCS_GROUP(2, 0, 0),
-+#if MINSTREL_MAX_STREAMS >= 3
-+      MCS_GROUP(3, 0, 0),
-+#endif
-+
-+      MCS_GROUP(1, 1, 0),
-+      MCS_GROUP(2, 1, 0),
-+#if MINSTREL_MAX_STREAMS >= 3
-+      MCS_GROUP(3, 1, 0),
-+#endif
-+
-+      MCS_GROUP(1, 0, 1),
-+      MCS_GROUP(2, 0, 1),
-+#if MINSTREL_MAX_STREAMS >= 3
-+      MCS_GROUP(3, 0, 1),
-+#endif
-+
-+      MCS_GROUP(1, 1, 1),
-+      MCS_GROUP(2, 1, 1),
-+#if MINSTREL_MAX_STREAMS >= 3
-+      MCS_GROUP(3, 1, 1),
-+#endif
-+};
-+
-+static u8 sample_table[SAMPLE_COLUMNS][MCS_GROUP_RATES];
-+
-+/*
-+ * Perform EWMA (Exponentially Weighted Moving Average) calculation
-+ */
-+static int
-+minstrel_ewma(int old, int new, int weight)
-+{
-+      return (new * (100 - weight) + old * weight) / 100;
-+}
-+
-+/*
-+ * Look up an MCS group index based on mac80211 rate information
-+ */
-+static int
-+minstrel_ht_get_group_idx(struct ieee80211_tx_rate *rate)
-+{
-+      int streams = (rate->idx / MCS_GROUP_RATES) + 1;
-+      u32 flags = IEEE80211_TX_RC_SHORT_GI | IEEE80211_TX_RC_40_MHZ_WIDTH;
-+      int i;
-+
-+      for (i = 0; i < ARRAY_SIZE(minstrel_mcs_groups); i++) {
-+              if (minstrel_mcs_groups[i].streams != streams)
-+                      continue;
-+              if (minstrel_mcs_groups[i].flags != (rate->flags & flags))
-+                      continue;
-+
-+              return i;
-+      }
-+
-+      WARN_ON(1);
-+      return 0;
-+}
-+
-+static inline struct minstrel_rate_stats *
-+minstrel_get_ratestats(struct minstrel_ht_sta *mi, int index)
-+{
-+      return &mi->groups[index / MCS_GROUP_RATES].rates[index % MCS_GROUP_RATES];
-+}
-+
-+
-+/*
-+ * Recalculate success probabilities and counters for a rate using EWMA
-+ */
-+static void
-+minstrel_calc_rate_ewma(struct minstrel_priv *mp, struct minstrel_rate_stats *mr)
-+{
-+      if (unlikely(mr->attempts > 0)) {
-+              mr->sample_skipped = 0;
-+              mr->cur_prob = MINSTREL_FRAC(mr->success, mr->attempts);
-+              if (!mr->att_hist)
-+                      mr->probability = mr->cur_prob;
-+              else
-+                      mr->probability = minstrel_ewma(mr->probability,
-+                              mr->cur_prob, EWMA_LEVEL);
-+              mr->att_hist += mr->attempts;
-+              mr->succ_hist += mr->success;
-+      } else {
-+              mr->sample_skipped++;
-+      }
-+      mr->last_success = mr->success;
-+      mr->last_attempts = mr->attempts;
-+      mr->success = 0;
-+      mr->attempts = 0;
-+}
-+
-+/*
-+ * Calculate throughput based on the average A-MPDU length, taking into account
-+ * the expected number of retransmissions and their expected length
-+ */
-+static void
-+minstrel_ht_calc_tp(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
-+                    int group, int rate)
-+{
-+      struct minstrel_rate_stats *mr;
-+      unsigned int usecs;
-+
-+      mr = &mi->groups[group].rates[rate];
-+
-+      if (mr->probability < MINSTREL_FRAC(1, 10)) {
-+              mr->cur_tp = 0;
-+              return;
-+      }
-+
-+      usecs = mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len);
-+      usecs += minstrel_mcs_groups[group].duration[rate];
-+      mr->cur_tp = MINSTREL_TRUNC((1000000 / usecs) * mr->probability);
-+}
-+
-+/*
-+ * Update rate statistics and select new primary rates
-+ *
-+ * Rules for rate selection:
-+ *  - max_prob_rate must use only one stream, as a tradeoff between delivery
-+ *    probability and throughput during strong fluctuations
-+ *  - as long as the max prob rate has a probability of more than 3/4, pick
-+ *    higher throughput rates, even if the probablity is a bit lower
-+ */
-+static void
-+minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
-+{
-+      struct minstrel_mcs_group_data *mg;
-+      struct minstrel_rate_stats *mr;
-+      int cur_prob, cur_prob_tp, cur_tp, cur_tp2;
-+      int group, i, index;
-+
-+      if (mi->ampdu_packets > 0) {
-+              mi->avg_ampdu_len = minstrel_ewma(mi->avg_ampdu_len,
-+                      MINSTREL_FRAC(mi->ampdu_len, mi->ampdu_packets), EWMA_LEVEL);
-+              mi->ampdu_len = 0;
-+              mi->ampdu_packets = 0;
-+      }
-+
-+      mi->sample_slow = 0;
-+      mi->sample_count = 0;
-+      mi->max_tp_rate = 0;
-+      mi->max_tp_rate2 = 0;
-+      mi->max_prob_rate = 0;
-+
-+      for (group = 0; group < ARRAY_SIZE(minstrel_mcs_groups); group++) {
-+              cur_prob = 0;
-+              cur_prob_tp = 0;
-+              cur_tp = 0;
-+              cur_tp2 = 0;
-+
-+              mg = &mi->groups[group];
-+              if (!mg->supported)
-+                      continue;
-+
-+              mg->max_tp_rate = 0;
-+              mg->max_tp_rate2 = 0;
-+              mg->max_prob_rate = 0;
-+              mi->sample_count++;
-+
-+              for (i = 0; i < MCS_GROUP_RATES; i++) {
-+                      if (!(mg->supported & BIT(i)))
-+                              continue;
-+
-+                      mr = &mg->rates[i];
-+                      mr->retry_updated = false;
-+                      index = MCS_GROUP_RATES * group + i;
-+                      minstrel_calc_rate_ewma(mp, mr);
-+                      minstrel_ht_calc_tp(mp, mi, group, i);
-+
-+                      if (!mr->cur_tp)
-+                              continue;
-+
-+                      /* ignore the lowest rate of each single-stream group */
-+                      if (!i && minstrel_mcs_groups[group].streams == 1)
-+                              continue;
-+
-+                      if ((mr->cur_tp > cur_prob_tp && mr->probability >
-+                           MINSTREL_FRAC(3, 4)) || mr->probability > cur_prob) {
-+                              mg->max_prob_rate = index;
-+                              cur_prob = mr->probability;
-+                      }
-+
-+                      if (mr->cur_tp > cur_tp) {
-+                              swap(index, mg->max_tp_rate);
-+                              cur_tp = mr->cur_tp;
-+                              mr = minstrel_get_ratestats(mi, index);
-+                      }
-+
-+                      if (index >= mg->max_tp_rate)
-+                              continue;
-+
-+                      if (mr->cur_tp > cur_tp2) {
-+                              mg->max_tp_rate2 = index;
-+                              cur_tp2 = mr->cur_tp;
-+                      }
-+              }
-+      }
-+
-+      /* try to sample up to half of the availble rates during each interval */
-+      mi->sample_count *= 4;
-+
-+      cur_prob = 0;
-+      cur_prob_tp = 0;
-+      cur_tp = 0;
-+      cur_tp2 = 0;
-+      for (group = 0; group < ARRAY_SIZE(minstrel_mcs_groups); group++) {
-+              mg = &mi->groups[group];
-+              if (!mg->supported)
-+                      continue;
-+
-+              mr = minstrel_get_ratestats(mi, mg->max_prob_rate);
-+              if (cur_prob_tp < mr->cur_tp &&
-+                  minstrel_mcs_groups[group].streams == 1) {
-+                      mi->max_prob_rate = mg->max_prob_rate;
-+                      cur_prob = mr->cur_prob;
-+              }
-+
-+              mr = minstrel_get_ratestats(mi, mg->max_tp_rate);
-+              if (cur_tp < mr->cur_tp) {
-+                      mi->max_tp_rate = mg->max_tp_rate;
-+                      cur_tp = mr->cur_tp;
-+              }
-+
-+              mr = minstrel_get_ratestats(mi, mg->max_tp_rate2);
-+              if (cur_tp2 < mr->cur_tp) {
-+                      mi->max_tp_rate2 = mg->max_tp_rate2;
-+                      cur_tp2 = mr->cur_tp;
-+              }
-+      }
-+
-+      mi->stats_update = jiffies;
-+}
-+
-+static bool
-+minstrel_ht_txstat_valid(struct ieee80211_tx_rate *rate)
-+{
-+      if (!rate->count)
-+              return false;
-+
-+      if (rate->idx < 0)
-+              return false;
-+
-+      return !!(rate->flags & IEEE80211_TX_RC_MCS);
-+}
-+
-+static void
-+minstrel_next_sample_idx(struct minstrel_ht_sta *mi)
-+{
-+      struct minstrel_mcs_group_data *mg;
-+
-+      for (;;) {
-+              mi->sample_group++;
-+              mi->sample_group %= ARRAY_SIZE(minstrel_mcs_groups);
-+              mg = &mi->groups[mi->sample_group];
-+
-+              if (!mg->supported)
-+                      continue;
-+
-+              if (++mg->index >= MCS_GROUP_RATES) {
-+                      mg->index = 0;
-+                      if (++mg->column >= ARRAY_SIZE(sample_table))
-+                              mg->column = 0;
-+              }
-+              break;
-+      }
-+}
-+
-+static void
-+minstrel_downgrade_rate(struct minstrel_ht_sta *mi, int *idx, bool primary)
-+{
-+      int group, orig_group;
-+
-+      orig_group = group = *idx / MCS_GROUP_RATES;
-+      while (group > 0) {
-+              group--;
-+
-+              if (!mi->groups[group].supported)
-+                      continue;
-+
-+              if (minstrel_mcs_groups[group].streams >
-+                  minstrel_mcs_groups[orig_group].streams)
-+                      continue;
-+
-+              if (primary)
-+                      *idx = mi->groups[group].max_tp_rate;
-+              else
-+                      *idx = mi->groups[group].max_tp_rate2;
-+              break;
-+      }
-+}
-+
-+static void
-+minstrel_aggr_check(struct minstrel_priv *mp, struct ieee80211_sta *pubsta, struct sk_buff *skb)
-+{
-+      struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-+      struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
-+      u16 tid;
-+
-+      if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
-+              return;
-+
-+      if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE)))
-+              return;
-+
-+      tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
-+      if (likely(sta->ampdu_mlme.tid_state_tx[tid] != HT_AGG_STATE_IDLE))
-+              return;
-+
-+      ieee80211_start_tx_ba_session(pubsta, tid);
-+}
-+
-+static void
-+minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
-+                      struct ieee80211_sta *sta, void *priv_sta,
-+                      struct sk_buff *skb)
-+{
-+      struct minstrel_ht_sta_priv *msp = priv_sta;
-+      struct minstrel_ht_sta *mi = &msp->ht;
-+      struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+      struct ieee80211_tx_rate *ar = info->status.rates;
-+      struct minstrel_rate_stats *rate, *rate2;
-+      struct minstrel_priv *mp = priv;
-+      bool last = false;
-+      int group;
-+      int i = 0;
-+
-+      if (!msp->is_ht)
-+              return mac80211_minstrel.tx_status(priv, sband, sta, &msp->legacy, skb);
-+
-+      /* This packet was aggregated but doesn't carry status info */
-+      if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
-+          !(info->flags & IEEE80211_TX_STAT_AMPDU))
-+              return;
-+
-+      if (!info->status.ampdu_len) {
-+              info->status.ampdu_ack_len = 1;
-+              info->status.ampdu_len = 1;
-+      }
-+
-+      mi->ampdu_packets++;
-+      mi->ampdu_len += info->status.ampdu_len;
-+
-+      if (!mi->sample_wait && !mi->sample_tries && mi->sample_count > 0) {
-+              mi->sample_wait = 4 + 2 * MINSTREL_TRUNC(mi->avg_ampdu_len);
-+              mi->sample_tries = 3;
-+              mi->sample_count--;
-+      }
-+
-+      if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) {
-+              mi->sample_packets += info->status.ampdu_len;
-+              minstrel_next_sample_idx(mi);
-+      }
-+
-+      for (i = 0; !last; i++) {
-+              last = (i == IEEE80211_TX_MAX_RATES - 1) ||
-+                     !minstrel_ht_txstat_valid(&ar[i + 1]);
-+
-+              if (!minstrel_ht_txstat_valid(&ar[i]))
-+                      break;
-+
-+              group = minstrel_ht_get_group_idx(&ar[i]);
-+              rate = &mi->groups[group].rates[ar[i].idx % 8];
-+
-+              if (last && (info->flags & IEEE80211_TX_STAT_ACK))
-+                      rate->success += info->status.ampdu_ack_len;
-+
-+              rate->attempts += ar[i].count * info->status.ampdu_len;
-+      }
-+
-+      /*
-+       * check for sudden death of spatial multiplexing,
-+       * downgrade to a lower number of streams if necessary.
-+       */
-+      rate = minstrel_get_ratestats(mi, mi->max_tp_rate);
-+      if (rate->attempts > 30 &&
-+          MINSTREL_FRAC(rate->success, rate->attempts) <
-+          MINSTREL_FRAC(20, 100))
-+              minstrel_downgrade_rate(mi, &mi->max_tp_rate, true);
-+
-+      rate2 = minstrel_get_ratestats(mi, mi->max_tp_rate2);
-+      if (rate->attempts > 30 &&
-+          MINSTREL_FRAC(rate->success, rate->attempts) <
-+          MINSTREL_FRAC(20, 100))
-+              minstrel_downgrade_rate(mi, &mi->max_tp_rate2, false);
-+
-+      if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
-+              minstrel_ht_update_stats(mp, mi);
-+              minstrel_aggr_check(mp, sta, skb);
-+      }
-+}
-+
-+static void
-+minstrel_calc_retransmit(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
-+                         int index)
-+{
-+      struct minstrel_rate_stats *mr;
-+      const struct mcs_group *group;
-+      unsigned int tx_time, tx_time_rtscts, tx_time_data;
-+      unsigned int cw = mp->cw_min;
-+      unsigned int t_slot = 9; /* FIXME */
-+      unsigned int ampdu_len = MINSTREL_TRUNC(mi->avg_ampdu_len);
-+
-+      mr = minstrel_get_ratestats(mi, index);
-+      if (mr->probability < MINSTREL_FRAC(1, 10)) {
-+              mr->retry_count = 1;
-+              mr->retry_count_rtscts = 1;
-+              return;
-+      }
-+
-+      mr->retry_count = 2;
-+      mr->retry_count_rtscts = 2;
-+      mr->retry_updated = true;
-+
-+      group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
-+      tx_time_data = group->duration[index % MCS_GROUP_RATES] * ampdu_len;
-+      tx_time = 2 * (t_slot + mi->overhead + tx_time_data);
-+      tx_time_rtscts = 2 * (t_slot + mi->overhead_rtscts + tx_time_data);
-+      do {
-+              cw = (cw << 1) | 1;
-+              cw = min(cw, mp->cw_max);
-+              tx_time += cw + t_slot + mi->overhead;
-+              tx_time_rtscts += cw + t_slot + mi->overhead_rtscts;
-+              if (tx_time_rtscts < mp->segment_size)
-+                      mr->retry_count_rtscts++;
-+      } while ((tx_time < mp->segment_size) &&
-+               (++mr->retry_count < mp->max_retry));
-+}
-+
-+
-+static void
-+minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
-+                     struct ieee80211_tx_rate *rate, int index,
-+                     struct ieee80211_tx_rate_control *txrc,
-+                     bool sample, bool rtscts)
-+{
-+      const struct mcs_group *group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
-+      struct minstrel_rate_stats *mr;
-+
-+      mr = minstrel_get_ratestats(mi, index);
-+      if (!mr->retry_updated)
-+              minstrel_calc_retransmit(mp, mi, index);
-+
-+      if (mr->probability < MINSTREL_FRAC(20, 100))
-+              rate->count = 2;
-+      else if (rtscts)
-+              rate->count = mr->retry_count_rtscts;
-+      else
-+              rate->count = mr->retry_count;
-+
-+      rate->flags = IEEE80211_TX_RC_MCS | group->flags;
-+      if (txrc->short_preamble)
-+              rate->flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE;
-+      if (txrc->rts || rtscts)
-+              rate->flags |= IEEE80211_TX_RC_USE_RTS_CTS;
-+      rate->idx = index % MCS_GROUP_RATES + (group->streams - 1) * MCS_GROUP_RATES;
-+}
-+
-+static inline int
-+minstrel_get_duration(int index)
-+{
-+      const struct mcs_group *group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
-+      return group->duration[index % MCS_GROUP_RATES];
-+}
-+
-+static int
-+minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
-+{
-+      struct minstrel_rate_stats *mr;
-+      struct minstrel_mcs_group_data *mg;
-+      int sample_idx = 0;
-+
-+      if (mi->sample_wait > 0) {
-+              mi->sample_wait--;
-+              return -1;
-+      }
-+
-+      if (!mi->sample_tries)
-+              return -1;
-+
-+      mi->sample_tries--;
-+      mg = &mi->groups[mi->sample_group];
-+      sample_idx = sample_table[mg->column][mg->index];
-+      mr = &mg->rates[sample_idx];
-+      sample_idx += mi->sample_group * MCS_GROUP_RATES;
-+
-+      /*
-+       * When not using MRR, do not sample if the probability is already
-+       * higher than 95% to avoid wasting airtime
-+       */
-+      if (!mp->has_mrr && (mr->probability > MINSTREL_FRAC(95, 100)))
-+              goto next;
-+
-+      /*
-+       * Make sure that lower rates get sampled only occasionally,
-+       * if the link is working perfectly.
-+       */
-+      if (minstrel_get_duration(sample_idx) >
-+          minstrel_get_duration(mi->max_tp_rate)) {
-+              if (mr->sample_skipped < 10)
-+                      goto next;
-+
-+              if (mi->sample_slow++ > 2)
-+                      goto next;
-+      }
-+
-+      return sample_idx;
-+
-+next:
-+      minstrel_next_sample_idx(mi);
-+      return -1;
-+}
-+
-+static void
-+minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
-+                     struct ieee80211_tx_rate_control *txrc)
-+{
-+      struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
-+      struct ieee80211_tx_rate *ar = info->status.rates;
-+      struct minstrel_ht_sta_priv *msp = priv_sta;
-+      struct minstrel_ht_sta *mi = &msp->ht;
-+      struct minstrel_priv *mp = priv;
-+      int sample_idx;
-+
-+      if (rate_control_send_low(sta, priv_sta, txrc))
-+              return;
-+
-+      if (!msp->is_ht)
-+              return mac80211_minstrel.get_rate(priv, sta, &msp->legacy, txrc);
-+
-+      info->flags |= mi->tx_flags;
-+      sample_idx = minstrel_get_sample_rate(mp, mi);
-+      if (sample_idx >= 0) {
-+              minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx,
-+                      txrc, true, false);
-+              minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate,
-+                      txrc, false, true);
-+              info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
-+      } else {
-+              minstrel_ht_set_rate(mp, mi, &ar[0], mi->max_tp_rate,
-+                      txrc, false, false);
-+              minstrel_ht_set_rate(mp, mi, &ar[1], mi->max_tp_rate2,
-+                      txrc, false, true);
-+      }
-+      minstrel_ht_set_rate(mp, mi, &ar[2], mi->max_prob_rate, txrc, false, true);
-+
-+      ar[3].count = 0;
-+      ar[3].idx = -1;
-+
-+      mi->total_packets++;
-+
-+      /* wraparound */
-+      if (mi->total_packets == ~0) {
-+              mi->total_packets = 0;
-+              mi->sample_packets = 0;
-+      }
-+}
-+
-+static void
-+minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,
-+                        struct ieee80211_sta *sta, void *priv_sta,
-+                      enum nl80211_channel_type oper_chan_type)
-+{
-+      struct minstrel_priv *mp = priv;
-+      struct minstrel_ht_sta_priv *msp = priv_sta;
-+      struct minstrel_ht_sta *mi = &msp->ht;
-+      struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
-+      struct ieee80211_local *local = hw_to_local(mp->hw);
-+      u16 sta_cap = sta->ht_cap.cap;
-+      int ack_dur;
-+      int stbc;
-+      int i;
-+
-+      /* fall back to the old minstrel for legacy stations */
-+      if (sta && !sta->ht_cap.ht_supported) {
-+              msp->is_ht = false;
-+              memset(&msp->legacy, 0, sizeof(msp->legacy));
-+              msp->legacy.r = msp->ratelist;
-+              msp->legacy.sample_table = msp->sample_table;
-+              return mac80211_minstrel.rate_init(priv, sband, sta, &msp->legacy);
-+      }
-+
-+      BUILD_BUG_ON(ARRAY_SIZE(minstrel_mcs_groups) !=
-+              MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS);
-+
-+      msp->is_ht = true;
-+      memset(mi, 0, sizeof(*mi));
-+      mi->stats_update = jiffies;
-+
-+      ack_dur = ieee80211_frame_duration(local, 10, 60, 1, 1);
-+      mi->overhead = ieee80211_frame_duration(local, 0, 60, 1, 1) + ack_dur;
-+      mi->overhead_rtscts = mi->overhead + 2 * ack_dur;
-+
-+      mi->avg_ampdu_len = MINSTREL_FRAC(1, 1);
-+
-+      /* When using MRR, sample more on the first attempt, without delay */
-+      if (mp->has_mrr) {
-+              mi->sample_count = 16;
-+              mi->sample_wait = 0;
-+      } else {
-+              mi->sample_count = 8;
-+              mi->sample_wait = 8;
-+      }
-+      mi->sample_tries = 4;
-+
-+      stbc = (sta_cap & IEEE80211_HT_CAP_RX_STBC) >>
-+              IEEE80211_HT_CAP_RX_STBC_SHIFT;
-+      mi->tx_flags |= stbc << IEEE80211_TX_CTL_STBC_SHIFT;
-+
-+      if (sta_cap & IEEE80211_HT_CAP_LDPC_CODING)
-+              mi->tx_flags |= IEEE80211_TX_CTL_LDPC;
-+
-+      if (oper_chan_type != NL80211_CHAN_HT40MINUS &&
-+          oper_chan_type != NL80211_CHAN_HT40PLUS)
-+              sta_cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-+
-+      for (i = 0; i < ARRAY_SIZE(mi->groups); i++) {
-+              u16 req = 0;
-+
-+              mi->groups[i].supported = 0;
-+              if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI) {
-+                      if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-+                              req |= IEEE80211_HT_CAP_SGI_40;
-+                      else
-+                              req |= IEEE80211_HT_CAP_SGI_20;
-+              }
-+
-+              if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-+                      req |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-+
-+              if ((sta_cap & req) != req)
-+                      continue;
-+
-+              mi->groups[i].supported =
-+                      mcs->rx_mask[minstrel_mcs_groups[i].streams - 1];
-+      }
-+}
-+
-+static void
-+minstrel_ht_rate_init(void *priv, struct ieee80211_supported_band *sband,
-+                      struct ieee80211_sta *sta, void *priv_sta)
-+{
-+      struct minstrel_priv *mp = priv;
-+
-+      minstrel_ht_update_caps(priv, sband, sta, priv_sta, mp->hw->conf.channel_type);
-+}
-+
-+static void
-+minstrel_ht_rate_update(void *priv, struct ieee80211_supported_band *sband,
-+                        struct ieee80211_sta *sta, void *priv_sta,
-+                        u32 changed, enum nl80211_channel_type oper_chan_type)
-+{
-+      minstrel_ht_update_caps(priv, sband, sta, priv_sta, oper_chan_type);
-+}
-+
-+static void *
-+minstrel_ht_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp)
-+{
-+      struct ieee80211_supported_band *sband;
-+      struct minstrel_ht_sta_priv *msp;
-+      struct minstrel_priv *mp = priv;
-+      struct ieee80211_hw *hw = mp->hw;
-+      int max_rates = 0;
-+      int i;
-+
-+      for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
-+              sband = hw->wiphy->bands[i];
-+              if (sband && sband->n_bitrates > max_rates)
-+                      max_rates = sband->n_bitrates;
-+      }
-+
-+      msp = kzalloc(sizeof(struct minstrel_ht_sta), gfp);
-+      if (!msp)
-+              return NULL;
-+
-+      msp->ratelist = kzalloc(sizeof(struct minstrel_rate) * max_rates, gfp);
-+      if (!msp->ratelist)
-+              goto error;
-+
-+      msp->sample_table = kmalloc(SAMPLE_COLUMNS * max_rates, gfp);
-+      if (!msp->sample_table)
-+              goto error1;
-+
-+      return msp;
-+
-+error1:
-+      kfree(msp->sample_table);
-+error:
-+      kfree(msp);
-+      return NULL;
-+}
-+
-+static void
-+minstrel_ht_free_sta(void *priv, struct ieee80211_sta *sta, void *priv_sta)
-+{
-+      struct minstrel_ht_sta_priv *msp = priv_sta;
-+
-+      kfree(msp->sample_table);
-+      kfree(msp->ratelist);
-+      kfree(msp);
-+}
-+
-+static void *
-+minstrel_ht_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
-+{
-+      return mac80211_minstrel.alloc(hw, debugfsdir);
-+}
-+
-+static void
-+minstrel_ht_free(void *priv)
-+{
-+      mac80211_minstrel.free(priv);
-+}
-+
-+static struct rate_control_ops mac80211_minstrel_ht = {
-+      .name = "minstrel_ht",
-+      .tx_status = minstrel_ht_tx_status,
-+      .get_rate = minstrel_ht_get_rate,
-+      .rate_init = minstrel_ht_rate_init,
-+      .rate_update = minstrel_ht_rate_update,
-+      .alloc_sta = minstrel_ht_alloc_sta,
-+      .free_sta = minstrel_ht_free_sta,
-+      .alloc = minstrel_ht_alloc,
-+      .free = minstrel_ht_free,
-+#ifdef CONFIG_MAC80211_DEBUGFS
-+      .add_sta_debugfs = minstrel_ht_add_sta_debugfs,
-+      .remove_sta_debugfs = minstrel_ht_remove_sta_debugfs,
-+#endif
-+};
-+
-+
-+static void
-+init_sample_table(void)
-+{
-+      int col, i, new_idx;
-+      u8 rnd[MCS_GROUP_RATES];
-+
-+      memset(sample_table, 0xff, sizeof(sample_table));
-+      for (col = 0; col < SAMPLE_COLUMNS; col++) {
-+              for (i = 0; i < MCS_GROUP_RATES; i++) {
-+                      get_random_bytes(rnd, sizeof(rnd));
-+                      new_idx = (i + rnd[i]) % MCS_GROUP_RATES;
-+
-+                      while (sample_table[col][new_idx] != 0xff)
-+                              new_idx = (new_idx + 1) % MCS_GROUP_RATES;
-+
-+                      sample_table[col][new_idx] = i;
-+              }
-+      }
-+}
-+
-+int __init
-+rc80211_minstrel_ht_init(void)
-+{
-+      init_sample_table();
-+      return ieee80211_rate_control_register(&mac80211_minstrel_ht);
-+}
-+
-+void
-+rc80211_minstrel_ht_exit(void)
-+{
-+      ieee80211_rate_control_unregister(&mac80211_minstrel_ht);
-+}
---- /dev/null
-+++ b/net/mac80211/rc80211_minstrel_ht.h
-@@ -0,0 +1,128 @@
-+/*
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#ifndef __RC_MINSTREL_HT_H
-+#define __RC_MINSTREL_HT_H
-+
-+/*
-+ * The number of streams can be changed to 2 to reduce code
-+ * size and memory footprint.
-+ */
-+#define MINSTREL_MAX_STREAMS  3
-+#define MINSTREL_STREAM_GROUPS        4
-+
-+/* scaled fraction values */
-+#define MINSTREL_SCALE        16
-+#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / div)
-+#define MINSTREL_TRUNC(val) ((val) >> MINSTREL_SCALE)
-+
-+#define MCS_GROUP_RATES       8
-+
-+struct mcs_group {
-+      u32 flags;
-+      unsigned int streams;
-+      unsigned int duration[MCS_GROUP_RATES];
-+};
-+
-+struct minstrel_rate_stats {
-+      /* current / last sampling period attempts/success counters */
-+      unsigned int attempts, last_attempts;
-+      unsigned int success, last_success;
-+
-+      /* total attempts/success counters */
-+      u64 att_hist, succ_hist;
-+
-+      /* current throughput */
-+      unsigned int cur_tp;
-+
-+      /* packet delivery probabilities */
-+      unsigned int cur_prob, probability;
-+
-+      /* maximum retry counts */
-+      unsigned int retry_count;
-+      unsigned int retry_count_rtscts;
-+
-+      bool retry_updated;
-+      u8 sample_skipped;
-+};
-+
-+struct minstrel_mcs_group_data {
-+      u8 index;
-+      u8 column;
-+
-+      /* bitfield of supported MCS rates of this group */
-+      u8 supported;
-+
-+      /* selected primary rates */
-+      unsigned int max_tp_rate;
-+      unsigned int max_tp_rate2;
-+      unsigned int max_prob_rate;
-+
-+      /* MCS rate statistics */
-+      struct minstrel_rate_stats rates[MCS_GROUP_RATES];
-+};
-+
-+struct minstrel_ht_sta {
-+      /* ampdu length (average, per sampling interval) */
-+      unsigned int ampdu_len;
-+      unsigned int ampdu_packets;
-+
-+      /* ampdu length (EWMA) */
-+      unsigned int avg_ampdu_len;
-+
-+      /* best throughput rate */
-+      unsigned int max_tp_rate;
-+
-+      /* second best throughput rate */
-+      unsigned int max_tp_rate2;
-+
-+      /* best probability rate */
-+      unsigned int max_prob_rate;
-+
-+      /* time of last status update */
-+      unsigned long stats_update;
-+
-+      /* overhead time in usec for each frame */
-+      unsigned int overhead;
-+      unsigned int overhead_rtscts;
-+
-+      unsigned int total_packets;
-+      unsigned int sample_packets;
-+
-+      /* tx flags to add for frames for this sta */
-+      u32 tx_flags;
-+
-+      u8 sample_wait;
-+      u8 sample_tries;
-+      u8 sample_count;
-+      u8 sample_slow;
-+
-+      /* current MCS group to be sampled */
-+      u8 sample_group;
-+
-+      /* MCS rate group info and statistics */
-+      struct minstrel_mcs_group_data groups[MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS];
-+};
-+
-+struct minstrel_ht_sta_priv {
-+      union {
-+              struct minstrel_ht_sta ht;
-+              struct minstrel_sta_info legacy;
-+      };
-+#ifdef CONFIG_MAC80211_DEBUGFS
-+      struct dentry *dbg_stats;
-+#endif
-+      void *ratelist;
-+      void *sample_table;
-+      bool is_ht;
-+};
-+
-+void minstrel_ht_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
-+void minstrel_ht_remove_sta_debugfs(void *priv, void *priv_sta);
-+
-+#endif
---- /dev/null
-+++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c
-@@ -0,0 +1,120 @@
-+/*
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#include <linux/netdevice.h>
-+#include <linux/types.h>
-+#include <linux/skbuff.h>
-+#include <linux/debugfs.h>
-+#include <linux/ieee80211.h>
-+#include <net/mac80211.h>
-+#include "rc80211_minstrel.h"
-+#include "rc80211_minstrel_ht.h"
-+
-+extern const struct mcs_group minstrel_mcs_groups[];
-+
-+static int
-+minstrel_ht_stats_open(struct inode *inode, struct file *file)
-+{
-+      struct minstrel_ht_sta_priv *msp = inode->i_private;
-+      struct minstrel_ht_sta *mi = &msp->ht;
-+      struct minstrel_debugfs_info *ms;
-+      unsigned int i, j, tp, prob, eprob;
-+      char *p;
-+      int ret;
-+
-+      if (!msp->is_ht) {
-+              inode->i_private = &msp->legacy;
-+              ret = minstrel_stats_open(inode, file);
-+              inode->i_private = msp;
-+              return ret;
-+      }
-+
-+      ms = kmalloc(sizeof(*ms) + 8192, GFP_KERNEL);
-+      if (!ms)
-+              return -ENOMEM;
-+
-+      file->private_data = ms;
-+      p = ms->buf;
-+      p += sprintf(p, "type      rate     throughput  ewma prob   this prob  "
-+                      "this succ/attempt   success    attempts\n");
-+      for (i = 0; i < MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS; i++) {
-+              char htmode = '2';
-+              char gimode = 'L';
-+
-+              if (!mi->groups[i].supported)
-+                      continue;
-+
-+              if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-+                      htmode = '4';
-+              if (minstrel_mcs_groups[i].flags & IEEE80211_TX_RC_SHORT_GI)
-+                      gimode = 'S';
-+
-+              for (j = 0; j < MCS_GROUP_RATES; j++) {
-+                      struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
-+                      int idx = i * MCS_GROUP_RATES + j;
-+
-+                      if (!(mi->groups[i].supported & BIT(j)))
-+                              continue;
-+
-+                      p += sprintf(p, "HT%c0/%cGI ", htmode, gimode);
-+
-+                      *(p++) = (idx == mi->max_tp_rate) ? 'T' : ' ';
-+                      *(p++) = (idx == mi->max_tp_rate2) ? 't' : ' ';
-+                      *(p++) = (idx == mi->max_prob_rate) ? 'P' : ' ';
-+                      p += sprintf(p, "MCS%-2u", (minstrel_mcs_groups[i].streams - 1) *
-+                                      MCS_GROUP_RATES + j);
-+
-+                      tp = mr->cur_tp / 10;
-+                      prob = MINSTREL_TRUNC(mr->cur_prob * 1000);
-+                      eprob = MINSTREL_TRUNC(mr->probability * 1000);
-+
-+                      p += sprintf(p, "  %6u.%1u   %6u.%1u   %6u.%1u        "
-+                                      "%3u(%3u)   %8llu    %8llu\n",
-+                                      tp / 10, tp % 10,
-+                                      eprob / 10, eprob % 10,
-+                                      prob / 10, prob % 10,
-+                                      mr->last_success,
-+                                      mr->last_attempts,
-+                                      (unsigned long long)mr->succ_hist,
-+                                      (unsigned long long)mr->att_hist);
-+              }
-+      }
-+      p += sprintf(p, "\nTotal packet count::    ideal %d      "
-+                      "lookaround %d\n",
-+                      max(0, (int) mi->total_packets - (int) mi->sample_packets),
-+                      mi->sample_packets);
-+      p += sprintf(p, "Average A-MPDU length: %d.%d\n",
-+              MINSTREL_TRUNC(mi->avg_ampdu_len),
-+              MINSTREL_TRUNC(mi->avg_ampdu_len * 10) % 10);
-+      ms->len = p - ms->buf;
-+
-+      return 0;
-+}
-+
-+static const struct file_operations minstrel_ht_stat_fops = {
-+      .owner = THIS_MODULE,
-+      .open = minstrel_ht_stats_open,
-+      .read = minstrel_stats_read,
-+      .release = minstrel_stats_release,
-+};
-+
-+void
-+minstrel_ht_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir)
-+{
-+      struct minstrel_ht_sta_priv *msp = priv_sta;
-+
-+      msp->dbg_stats = debugfs_create_file("rc_stats", S_IRUGO, dir, msp,
-+                      &minstrel_ht_stat_fops);
-+}
-+
-+void
-+minstrel_ht_remove_sta_debugfs(void *priv, void *priv_sta)
-+{
-+      struct minstrel_ht_sta_priv *msp = priv_sta;
-+
-+      debugfs_remove(msp->dbg_stats);
-+}

diff --git a/package/mac80211/patches/510-ath9k_use_minstrel.patch b/package/mac80211/patches/510-ath9k_use_minstrel.patch
deleted file mode 100644 (file)
index 4dd81ce..0000000
--- a/package/mac80211/patches/510-ath9k_use_minstrel.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -689,7 +689,11 @@ void ath9k_set_hw_capab(struct ath_softc
-       hw->sta_data_size = sizeof(struct ath_node);
-       hw->vif_data_size = sizeof(struct ath_vif);
- 
-+#ifdef ATH9K_USE_MINSTREL
-+      hw->rate_control_algorithm = "minstrel_ht";
-+#else
-       hw->rate_control_algorithm = "ath9k_rate_control";
-+#endif
- 
-       if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes))
-               hw->wiphy->bands[IEEE80211_BAND_2GHZ] =

diff --git a/package/mac80211/patches/510-pending_work.patch b/package/mac80211/patches/510-pending_work.patch
new file mode 100644 (file)
index 0000000..d52eaa4
--- /dev/null
+++ b/package/mac80211/patches/510-pending_work.patch
@@ -0,0 +1,1893 @@
+--- a/drivers/net/wireless/ath/ath9k/Makefile
++++ b/drivers/net/wireless/ath/ath9k/Makefile
+@@ -32,7 +32,8 @@ ath9k_hw-y:= \
+               mac.o \
+               ar9002_mac.o \
+               ar9003_mac.o \
+-              ar9003_eeprom.o
++              ar9003_eeprom.o \
++              ar9003_paprd.o
+ 
+ obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o
+ 
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+@@ -67,6 +67,7 @@ static const struct ar9300_eeprom ar9300
+                 * bit2 - enable fastClock - enabled
+                 * bit3 - enable doubling - enabled
+                 * bit4 - enable internal regulator - disabled
++                * bit5 - enable pa predistortion - disabled
+                 */
+               .miscConfiguration = 0, /* bit0 - turn down drivestrength */
+               .eepromWriteEnableGpio = 3,
+@@ -129,9 +130,11 @@ static const struct ar9300_eeprom ar9300
+               .txEndToRxOn = 0x2,
+               .txFrameToXpaOn = 0xe,
+               .thresh62 = 28,
+-              .futureModal = { /* [32] */
++              .papdRateMaskHt20 = LE32(0x80c080),
++              .papdRateMaskHt40 = LE32(0x80c080),
++              .futureModal = {
+                       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+-                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
++                      0, 0, 0, 0, 0, 0, 0, 0
+               },
+        },
+       .calFreqPier2G = {
+@@ -326,9 +329,11 @@ static const struct ar9300_eeprom ar9300
+               .txEndToRxOn = 0x2,
+               .txFrameToXpaOn = 0xe,
+               .thresh62 = 28,
++              .papdRateMaskHt20 = LE32(0xf0e0e0),
++              .papdRateMaskHt40 = LE32(0xf0e0e0),
+               .futureModal = {
+                       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+-                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
++                      0, 0, 0, 0, 0, 0, 0, 0
+               },
+        },
+       .calFreqPier5G = {
+@@ -644,6 +649,8 @@ static u32 ath9k_hw_ar9300_get_eeprom(st
+               return (pBase->featureEnable & 0x10) >> 4;
+       case EEP_SWREG:
+               return le32_to_cpu(pBase->swreg);
++      case EEP_PAPRD:
++              return !!(pBase->featureEnable & BIT(5));
+       default:
+               return 0;
+       }
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+@@ -234,7 +234,9 @@ struct ar9300_modal_eep_header {
+       u8 txEndToRxOn;
+       u8 txFrameToXpaOn;
+       u8 thresh62;
+-      u8 futureModal[32];
++      __le32 papdRateMaskHt20;
++      __le32 papdRateMaskHt40;
++      u8 futureModal[24];
+ } __packed;
+ 
+ struct ar9300_cal_data_per_freq_op_loop {
+--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+@@ -470,6 +470,14 @@ static void ar9003_hw_set11n_virtualmore
+               ads->ctl11 &= ~AR_VirtMoreFrag;
+ }
+ 
++void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains)
++{
++      struct ar9003_txc *ads = ds;
++
++      ads->ctl12 |= SM(chains, AR_PAPRDChainMask);
++}
++EXPORT_SYMBOL(ar9003_hw_set_paprd_txdesc);
++
+ void ar9003_hw_attach_mac_ops(struct ath_hw *hw)
+ {
+       struct ath_hw_ops *ops = ath9k_hw_ops(hw);
+--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
+@@ -40,6 +40,10 @@
+ 
+ #define AR_Not_Sounding       0x20000000
+ 
++/* ctl 12 */
++#define AR_PAPRDChainMask     0x00000e00
++#define AR_PAPRDChainMask_S   9
++
+ #define MAP_ISR_S2_CST          6
+ #define MAP_ISR_S2_GTT          6
+ #define MAP_ISR_S2_TIM          3
+--- /dev/null
++++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+@@ -0,0 +1,713 @@
++/*
++ * Copyright (c) 2010 Atheros Communications Inc.
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include "hw.h"
++#include "ar9003_phy.h"
++
++void ar9003_paprd_enable(struct ath_hw *ah, bool val)
++{
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
++                    AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B1,
++                    AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B2,
++                    AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
++}
++EXPORT_SYMBOL(ar9003_paprd_enable);
++
++static void ar9003_paprd_setup_single_table(struct ath_hw *ah)
++{
++      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
++      struct ar9300_modal_eep_header *hdr;
++      const u32 ctrl0[3] = {
++              AR_PHY_PAPRD_CTRL0_B0,
++              AR_PHY_PAPRD_CTRL0_B1,
++              AR_PHY_PAPRD_CTRL0_B2
++      };
++      const u32 ctrl1[3] = {
++              AR_PHY_PAPRD_CTRL1_B0,
++              AR_PHY_PAPRD_CTRL1_B1,
++              AR_PHY_PAPRD_CTRL1_B2
++      };
++      u32 am_mask, ht40_mask;
++      int i;
++
++      if (ah->curchan && IS_CHAN_5GHZ(ah->curchan))
++              hdr = &eep->modalHeader5G;
++      else
++              hdr = &eep->modalHeader2G;
++
++      am_mask = le32_to_cpu(hdr->papdRateMaskHt20);
++      ht40_mask = le32_to_cpu(hdr->papdRateMaskHt40);
++
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK, am_mask);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK, am_mask);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK, ht40_mask);
++
++      for (i = 0; i < 3; i++) {
++              REG_RMW_FIELD(ah, ctrl0[i],
++                            AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK, 1);
++              REG_RMW_FIELD(ah, ctrl1[i],
++                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE, 1);
++              REG_RMW_FIELD(ah, ctrl1[i],
++                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE, 1);
++              REG_RMW_FIELD(ah, ctrl1[i],
++                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
++              REG_RMW_FIELD(ah, ctrl1[i],
++                            AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK, 181);
++              REG_RMW_FIELD(ah, ctrl1[i],
++                            AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT, 361);
++              REG_RMW_FIELD(ah, ctrl1[i],
++                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
++              REG_RMW_FIELD(ah, ctrl0[i],
++                            AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH, 3);
++      }
++
++      ar9003_paprd_enable(ah, false);
++
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
++                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP, 0x30);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
++                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE, 1);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
++                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE, 1);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
++                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE, 0);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
++                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE, 0);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
++                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING, 28);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
++                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE, 1);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL2,
++                    AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN, 147);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN, 4);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN, 4);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES, 7);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL, 1);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP, -6);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE,
++                    -15);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE, 1);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
++                    AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA, 0);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
++                    AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR, 400);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
++                    AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES,
++                    100);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_0_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 261376);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_1_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 248079);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_2_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 233759);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_3_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 220464);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_4_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 208194);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_5_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 196949);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_6_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 185706);
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_7_B0,
++                    AR_PHY_PAPRD_PRE_POST_SCALING, 175487);
++}
++
++static void ar9003_paprd_get_gain_table(struct ath_hw *ah)
++{
++      u32 *entry = ah->paprd_gain_table_entries;
++      u8 *index = ah->paprd_gain_table_index;
++      u32 reg = AR_PHY_TXGAIN_TABLE;
++      int i;
++
++      memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
++      memset(index, 0, sizeof(ah->paprd_gain_table_index));
++
++      for (i = 0; i < 32; i++) {
++              entry[i] = REG_READ(ah, reg);
++              index[i] = (entry[i] >> 24) & 0xff;
++              reg += 4;
++      }
++}
++
++static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
++                                          int target_power)
++{
++      int olpc_gain_delta = 0;
++      int alpha_therm, alpha_volt;
++      int therm_cal_value, volt_cal_value;
++      int therm_value, volt_value;
++      int thermal_gain_corr, voltage_gain_corr;
++      int desired_scale, desired_gain = 0;
++      u32 reg;
++
++      REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
++                  AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
++      desired_scale = REG_READ_FIELD(ah, AR_PHY_TPC_12,
++                                     AR_PHY_TPC_12_DESIRED_SCALE_HT40_5);
++      alpha_therm = REG_READ_FIELD(ah, AR_PHY_TPC_19,
++                                   AR_PHY_TPC_19_ALPHA_THERM);
++      alpha_volt = REG_READ_FIELD(ah, AR_PHY_TPC_19,
++                                  AR_PHY_TPC_19_ALPHA_VOLT);
++      therm_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
++                                       AR_PHY_TPC_18_THERM_CAL_VALUE);
++      volt_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
++                                      AR_PHY_TPC_18_VOLT_CAL_VALUE);
++      therm_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
++                                   AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE);
++      volt_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
++                                  AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE);
++
++      if (chain == 0)
++              reg = AR_PHY_TPC_11_B0;
++      else if (chain == 1)
++              reg = AR_PHY_TPC_11_B1;
++      else
++              reg = AR_PHY_TPC_11_B2;
++
++      olpc_gain_delta = REG_READ_FIELD(ah, reg,
++                                       AR_PHY_TPC_11_OLPC_GAIN_DELTA);
++
++      if (olpc_gain_delta >= 128)
++              olpc_gain_delta = olpc_gain_delta - 256;
++
++      thermal_gain_corr = (alpha_therm * (therm_value - therm_cal_value) +
++                           (256 / 2)) / 256;
++      voltage_gain_corr = (alpha_volt * (volt_value - volt_cal_value) +
++                           (128 / 2)) / 128;
++      desired_gain = target_power - olpc_gain_delta - thermal_gain_corr -
++          voltage_gain_corr + desired_scale;
++
++      return desired_gain;
++}
++
++static void ar9003_tx_force_gain(struct ath_hw *ah, unsigned int gain_index)
++{
++      int selected_gain_entry, txbb1dbgain, txbb6dbgain, txmxrgain;
++      int padrvgnA, padrvgnB, padrvgnC, padrvgnD;
++      u32 *gain_table_entries = ah->paprd_gain_table_entries;
++
++      selected_gain_entry = gain_table_entries[gain_index];
++      txbb1dbgain = selected_gain_entry & 0x7;
++      txbb6dbgain = (selected_gain_entry >> 3) & 0x3;
++      txmxrgain = (selected_gain_entry >> 5) & 0xf;
++      padrvgnA = (selected_gain_entry >> 9) & 0xf;
++      padrvgnB = (selected_gain_entry >> 13) & 0xf;
++      padrvgnC = (selected_gain_entry >> 17) & 0xf;
++      padrvgnD = (selected_gain_entry >> 21) & 0x3;
++
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN, txbb1dbgain);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN, txbb6dbgain);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN, txmxrgain);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA, padrvgnA);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB, padrvgnB);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC, padrvgnC);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND, padrvgnD);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL, 0);
++      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
++                    AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN, 0);
++      REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCED_DAC_GAIN, 0);
++      REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCE_DAC_GAIN, 0);
++}
++
++static inline int find_expn(int num)
++{
++      return fls(num) - 1;
++}
++
++static inline int find_proper_scale(int expn, int N)
++{
++      return (expn > N) ? expn - 10 : 0;
++}
++
++#define NUM_BIN 23
++
++static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)
++{
++      unsigned int thresh_accum_cnt;
++      int x_est[NUM_BIN + 1], Y[NUM_BIN + 1], theta[NUM_BIN + 1];
++      int PA_in[NUM_BIN + 1];
++      int B1_tmp[NUM_BIN + 1], B2_tmp[NUM_BIN + 1];
++      unsigned int B1_abs_max, B2_abs_max;
++      int max_index, scale_factor;
++      int y_est[NUM_BIN + 1];
++      int x_est_fxp1_nonlin, x_tilde[NUM_BIN + 1];
++      unsigned int x_tilde_abs;
++      int G_fxp, Y_intercept, order_x_by_y, M, I, L, sum_y_sqr, sum_y_quad;
++      int Q_x, Q_B1, Q_B2, beta_raw, alpha_raw, scale_B;
++      int Q_scale_B, Q_beta, Q_alpha, alpha, beta, order_1, order_2;
++      int order1_5x, order2_3x, order1_5x_rem, order2_3x_rem;
++      int y5, y3, tmp;
++      int theta_low_bin = 0;
++      int i;
++
++      /* disregard any bin that contains <= 16 samples */
++      thresh_accum_cnt = 16;
++      scale_factor = 5;
++      max_index = 0;
++      memset(theta, 0, sizeof(theta));
++      memset(x_est, 0, sizeof(x_est));
++      memset(Y, 0, sizeof(Y));
++      memset(y_est, 0, sizeof(y_est));
++      memset(x_tilde, 0, sizeof(x_tilde));
++
++      for (i = 0; i < NUM_BIN; i++) {
++              s32 accum_cnt, accum_tx, accum_rx, accum_ang;
++
++              /* number of samples */
++              accum_cnt = data_L[i] & 0xffff;
++
++              if (accum_cnt <= thresh_accum_cnt)
++                      continue;
++
++              /* sum(tx amplitude) */
++              accum_tx = ((data_L[i] >> 16) & 0xffff) |
++                  ((data_U[i] & 0x7ff) << 16);
++
++              /* sum(rx amplitude distance to lower bin edge) */
++              accum_rx = ((data_U[i] >> 11) & 0x1f) |
++                  ((data_L[i + 23] & 0xffff) << 5);
++
++              /* sum(angles) */
++              accum_ang = ((data_L[i + 23] >> 16) & 0xffff) |
++                  ((data_U[i + 23] & 0x7ff) << 16);
++
++              accum_tx <<= scale_factor;
++              accum_rx <<= scale_factor;
++              x_est[i + 1] = (((accum_tx + accum_cnt) / accum_cnt) + 32) >>
++                  scale_factor;
++
++              Y[i + 1] = ((((accum_rx + accum_cnt) / accum_cnt) + 32) >>
++                          scale_factor) + (1 << scale_factor) * max_index + 16;
++
++              if (accum_ang >= (1 << 26))
++                      accum_ang -= 1 << 27;
++
++              theta[i + 1] = ((accum_ang * (1 << scale_factor)) + accum_cnt) /
++                  accum_cnt;
++
++              max_index++;
++      }
++
++      /*
++       * Find average theta of first 5 bin and all of those to same value.
++       * Curve is linear at that range.
++       */
++      for (i = 1; i < 6; i++)
++              theta_low_bin += theta[i];
++
++      theta_low_bin = theta_low_bin / 5;
++      for (i = 1; i < 6; i++)
++              theta[i] = theta_low_bin;
++
++      /* Set values at origin */
++      theta[0] = theta_low_bin;
++      for (i = 0; i <= max_index; i++)
++              theta[i] -= theta_low_bin;
++
++      x_est[0] = 0;
++      Y[0] = 0;
++      scale_factor = 8;
++
++      /* low signal gain */
++      if (x_est[6] == x_est[3])
++              return false;
++
++      G_fxp =
++          (((Y[6] - Y[3]) * 1 << scale_factor) +
++           (x_est[6] - x_est[3])) / (x_est[6] - x_est[3]);
++
++      Y_intercept =
++          (G_fxp * (x_est[0] - x_est[3]) +
++           (1 << scale_factor)) / (1 << scale_factor) + Y[3];
++
++      for (i = 0; i <= max_index; i++)
++              y_est[i] = Y[i] - Y_intercept;
++
++      for (i = 0; i <= 3; i++) {
++              y_est[i] = i * 32;
++
++              /* prevent division by zero */
++              if (G_fxp == 0)
++                      return false;
++
++              x_est[i] = ((y_est[i] * 1 << scale_factor) + G_fxp) / G_fxp;
++      }
++
++      x_est_fxp1_nonlin =
++          x_est[max_index] - ((1 << scale_factor) * y_est[max_index] +
++                              G_fxp) / G_fxp;
++
++      order_x_by_y =
++          (x_est_fxp1_nonlin + y_est[max_index]) / y_est[max_index];
++
++      if (order_x_by_y == 0)
++              M = 10;
++      else if (order_x_by_y == 1)
++              M = 9;
++      else
++              M = 8;
++
++      I = (max_index > 15) ? 7 : max_index >> 1;
++      L = max_index - I;
++      scale_factor = 8;
++      sum_y_sqr = 0;
++      sum_y_quad = 0;
++      x_tilde_abs = 0;
++
++      for (i = 0; i <= L; i++) {
++              unsigned int y_sqr;
++              unsigned int y_quad;
++              unsigned int tmp_abs;
++
++              /* prevent division by zero */
++              if (y_est[i + I] == 0)
++                      return false;
++
++              x_est_fxp1_nonlin =
++                  x_est[i + I] - ((1 << scale_factor) * y_est[i + I] +
++                                  G_fxp) / G_fxp;
++
++              x_tilde[i] =
++                  (x_est_fxp1_nonlin * (1 << M) + y_est[i + I]) / y_est[i +
++                                                                        I];
++              x_tilde[i] =
++                  (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
++              x_tilde[i] =
++                  (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
++              y_sqr =
++                  (y_est[i + I] * y_est[i + I] +
++                   (scale_factor * scale_factor)) / (scale_factor *
++                                                     scale_factor);
++              tmp_abs = abs(x_tilde[i]);
++              if (tmp_abs > x_tilde_abs)
++                      x_tilde_abs = tmp_abs;
++
++              y_quad = y_sqr * y_sqr;
++              sum_y_sqr = sum_y_sqr + y_sqr;
++              sum_y_quad = sum_y_quad + y_quad;
++              B1_tmp[i] = y_sqr * (L + 1);
++              B2_tmp[i] = y_sqr;
++      }
++
++      B1_abs_max = 0;
++      B2_abs_max = 0;
++      for (i = 0; i <= L; i++) {
++              int abs_val;
++
++              B1_tmp[i] -= sum_y_sqr;
++              B2_tmp[i] = sum_y_quad - sum_y_sqr * B2_tmp[i];
++
++              abs_val = abs(B1_tmp[i]);
++              if (abs_val > B1_abs_max)
++                      B1_abs_max = abs_val;
++
++              abs_val = abs(B2_tmp[i]);
++              if (abs_val > B2_abs_max)
++                      B2_abs_max = abs_val;
++      }
++
++      Q_x = find_proper_scale(find_expn(x_tilde_abs), 10);
++      Q_B1 = find_proper_scale(find_expn(B1_abs_max), 10);
++      Q_B2 = find_proper_scale(find_expn(B2_abs_max), 10);
++
++      beta_raw = 0;
++      alpha_raw = 0;
++      for (i = 0; i <= L; i++) {
++              x_tilde[i] = x_tilde[i] / (1 << Q_x);
++              B1_tmp[i] = B1_tmp[i] / (1 << Q_B1);
++              B2_tmp[i] = B2_tmp[i] / (1 << Q_B2);
++              beta_raw = beta_raw + B1_tmp[i] * x_tilde[i];
++              alpha_raw = alpha_raw + B2_tmp[i] * x_tilde[i];
++      }
++
++      scale_B =
++          ((sum_y_quad / scale_factor) * (L + 1) -
++           (sum_y_sqr / scale_factor) * sum_y_sqr) * scale_factor;
++
++      Q_scale_B = find_proper_scale(find_expn(abs(scale_B)), 10);
++      scale_B = scale_B / (1 << Q_scale_B);
++      Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
++      Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
++      beta_raw = beta_raw / (1 << Q_beta);
++      alpha_raw = alpha_raw / (1 << Q_alpha);
++      alpha = (alpha_raw << 10) / scale_B;
++      beta = (beta_raw << 10) / scale_B;
++      order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B;
++      order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B;
++      order1_5x = order_1 / 5;
++      order2_3x = order_2 / 3;
++      order1_5x_rem = order_1 - 5 * order1_5x;
++      order2_3x_rem = order_2 - 3 * order2_3x;
++
++      for (i = 0; i < PAPRD_TABLE_SZ; i++) {
++              tmp = i * 32;
++              y5 = ((beta * tmp) >> 6) >> order1_5x;
++              y5 = (y5 * tmp) >> order1_5x;
++              y5 = (y5 * tmp) >> order1_5x;
++              y5 = (y5 * tmp) >> order1_5x;
++              y5 = (y5 * tmp) >> order1_5x;
++              y5 = y5 >> order1_5x_rem;
++              y3 = (alpha * tmp) >> order2_3x;
++              y3 = (y3 * tmp) >> order2_3x;
++              y3 = (y3 * tmp) >> order2_3x;
++              y3 = y3 >> order2_3x_rem;
++              PA_in[i] = y5 + y3 + (256 * tmp) / G_fxp;
++
++              if (i >= 2) {
++                      tmp = PA_in[i] - PA_in[i - 1];
++                      if (tmp < 0)
++                              PA_in[i] =
++                                  PA_in[i - 1] + (PA_in[i - 1] -
++                                                  PA_in[i - 2]);
++              }
++
++              PA_in[i] = (PA_in[i] < 1400) ? PA_in[i] : 1400;
++      }
++
++      beta_raw = 0;
++      alpha_raw = 0;
++
++      for (i = 0; i <= L; i++) {
++              int theta_tilde =
++                  ((theta[i + I] << M) + y_est[i + I]) / y_est[i + I];
++              theta_tilde =
++                  ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
++              theta_tilde =
++                  ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
++              beta_raw = beta_raw + B1_tmp[i] * theta_tilde;
++              alpha_raw = alpha_raw + B2_tmp[i] * theta_tilde;
++      }
++
++      Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
++      Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
++      beta_raw = beta_raw / (1 << Q_beta);
++      alpha_raw = alpha_raw / (1 << Q_alpha);
++
++      alpha = (alpha_raw << 10) / scale_B;
++      beta = (beta_raw << 10) / scale_B;
++      order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B + 5;
++      order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B + 5;
++      order1_5x = order_1 / 5;
++      order2_3x = order_2 / 3;
++      order1_5x_rem = order_1 - 5 * order1_5x;
++      order2_3x_rem = order_2 - 3 * order2_3x;
++
++      for (i = 0; i < PAPRD_TABLE_SZ; i++) {
++              int PA_angle;
++
++              /* pa_table[4] is calculated from PA_angle for i=5 */
++              if (i == 4)
++                      continue;
++
++              tmp = i * 32;
++              if (beta > 0)
++                      y5 = (((beta * tmp - 64) >> 6) -
++                            (1 << order1_5x)) / (1 << order1_5x);
++              else
++                      y5 = ((((beta * tmp - 64) >> 6) +
++                             (1 << order1_5x)) / (1 << order1_5x));
++
++              y5 = (y5 * tmp) / (1 << order1_5x);
++              y5 = (y5 * tmp) / (1 << order1_5x);
++              y5 = (y5 * tmp) / (1 << order1_5x);
++              y5 = (y5 * tmp) / (1 << order1_5x);
++              y5 = y5 / (1 << order1_5x_rem);
++
++              if (beta > 0)
++                      y3 = (alpha * tmp -
++                            (1 << order2_3x)) / (1 << order2_3x);
++              else
++                      y3 = (alpha * tmp +
++                            (1 << order2_3x)) / (1 << order2_3x);
++              y3 = (y3 * tmp) / (1 << order2_3x);
++              y3 = (y3 * tmp) / (1 << order2_3x);
++              y3 = y3 / (1 << order2_3x_rem);
++
++              if (i < 4) {
++                      PA_angle = 0;
++              } else {
++                      PA_angle = y5 + y3;
++                      if (PA_angle < -150)
++                              PA_angle = -150;
++                      else if (PA_angle > 150)
++                              PA_angle = 150;
++              }
++
++              pa_table[i] = ((PA_in[i] & 0x7ff) << 11) + (PA_angle & 0x7ff);
++              if (i == 5) {
++                      PA_angle = (PA_angle + 2) >> 1;
++                      pa_table[i - 1] = ((PA_in[i - 1] & 0x7ff) << 11) +
++                          (PA_angle & 0x7ff);
++              }
++      }
++
++      *gain = G_fxp;
++      return true;
++}
++
++void ar9003_paprd_populate_single_table(struct ath_hw *ah,
++                                      struct ath9k_channel *chan, int chain)
++{
++      u32 *paprd_table_val = chan->pa_table[chain];
++      u32 small_signal_gain = chan->small_signal_gain[chain];
++      u32 training_power;
++      u32 reg = 0;
++      int i;
++
++      training_power =
++          REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
++                         AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
++      training_power -= 4;
++
++      if (chain == 0)
++              reg = AR_PHY_PAPRD_MEM_TAB_B0;
++      else if (chain == 1)
++              reg = AR_PHY_PAPRD_MEM_TAB_B1;
++      else if (chain == 2)
++              reg = AR_PHY_PAPRD_MEM_TAB_B2;
++
++      for (i = 0; i < PAPRD_TABLE_SZ; i++) {
++              REG_WRITE(ah, reg, paprd_table_val[i]);
++              reg = reg + 4;
++      }
++
++      if (chain == 0)
++              reg = AR_PHY_PA_GAIN123_B0;
++      else if (chain == 1)
++              reg = AR_PHY_PA_GAIN123_B1;
++      else
++              reg = AR_PHY_PA_GAIN123_B2;
++
++      REG_RMW_FIELD(ah, reg, AR_PHY_PA_GAIN123_PA_GAIN1, small_signal_gain);
++
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B0,
++                    AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
++                    training_power);
++
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B1,
++                    AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
++                    training_power);
++
++      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B2,
++                    AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
++                    training_power);
++}
++EXPORT_SYMBOL(ar9003_paprd_populate_single_table);
++
++int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain)
++{
++
++      unsigned int i, desired_gain, gain_index;
++      unsigned int train_power;
++
++      train_power = REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
++                                   AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
++
++      train_power = train_power - 4;
++
++      desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
++
++      gain_index = 0;
++      for (i = 0; i < 32; i++) {
++              if (ah->paprd_gain_table_index[i] >= desired_gain)
++                      break;
++              gain_index++;
++      }
++
++      ar9003_tx_force_gain(ah, gain_index);
++
++      REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
++                      AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
++
++      return 0;
++}
++EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);
++
++int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
++                            int chain)
++{
++      u16 *small_signal_gain = &chan->small_signal_gain[chain];
++      u32 *pa_table = chan->pa_table[chain];
++      u32 *data_L, *data_U;
++      int i, status = 0;
++      u32 *buf;
++      u32 reg;
++
++      memset(chan->pa_table[chain], 0, sizeof(chan->pa_table[chain]));
++
++      buf = kmalloc(2 * 48 * sizeof(u32), GFP_ATOMIC);
++      if (!buf)
++              return -ENOMEM;
++
++      data_L = &buf[0];
++      data_U = &buf[48];
++
++      REG_CLR_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
++                  AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
++
++      reg = AR_PHY_CHAN_INFO_TAB_0;
++      for (i = 0; i < 48; i++)
++              data_L[i] = REG_READ(ah, reg + (i << 2));
++
++      REG_SET_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
++                  AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
++
++      for (i = 0; i < 48; i++)
++              data_U[i] = REG_READ(ah, reg + (i << 2));
++
++      if (!create_pa_curve(data_L, data_U, pa_table, small_signal_gain))
++              status = -2;
++
++      REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
++                  AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
++
++      kfree(buf);
++
++      return status;
++}
++EXPORT_SYMBOL(ar9003_paprd_create_curve);
++
++int ar9003_paprd_init_table(struct ath_hw *ah)
++{
++      ar9003_paprd_setup_single_table(ah);
++      ar9003_paprd_get_gain_table(ah);
++      return 0;
++}
++EXPORT_SYMBOL(ar9003_paprd_init_table);
++
++bool ar9003_paprd_is_done(struct ath_hw *ah)
++{
++      return !!REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1,
++                              AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
++}
++EXPORT_SYMBOL(ar9003_paprd_is_done);
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+@@ -451,7 +451,11 @@
+ #define AR_PHY_TSTDAC            (AR_SM_BASE + 0x168)
+ 
+ #define AR_PHY_CHAN_STATUS       (AR_SM_BASE + 0x16c)
+-#define AR_PHY_CHAN_INFO_MEMORY  (AR_SM_BASE + 0x170)
++
++#define AR_PHY_CHAN_INFO_MEMORY                               (AR_SM_BASE + 0x170)
++#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ   0x00000008
++#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ_S 3
++
+ #define AR_PHY_CHNINFO_NOISEPWR  (AR_SM_BASE + 0x174)
+ #define AR_PHY_CHNINFO_GAINDIFF  (AR_SM_BASE + 0x178)
+ #define AR_PHY_CHNINFO_FINETIM   (AR_SM_BASE + 0x17c)
+@@ -467,17 +471,63 @@
+ #define AR_PHY_PWRTX_MAX         (AR_SM_BASE + 0x1f0)
+ #define AR_PHY_POWER_TX_SUB      (AR_SM_BASE + 0x1f4)
+ 
+-#define AR_PHY_TPC_4_B0          (AR_SM_BASE + 0x204)
+-#define AR_PHY_TPC_5_B0          (AR_SM_BASE + 0x208)
+-#define AR_PHY_TPC_6_B0          (AR_SM_BASE + 0x20c)
+-#define AR_PHY_TPC_11_B0         (AR_SM_BASE + 0x220)
+-#define AR_PHY_TPC_18            (AR_SM_BASE + 0x23c)
+-#define AR_PHY_TPC_19            (AR_SM_BASE + 0x240)
++#define AR_PHY_TPC_1                          (AR_SM_BASE + 0x1f8)
++#define AR_PHY_TPC_1_FORCED_DAC_GAIN          0x0000003e
++#define AR_PHY_TPC_1_FORCED_DAC_GAIN_S                1
++#define AR_PHY_TPC_1_FORCE_DAC_GAIN           0x00000001
++#define AR_PHY_TPC_1_FORCE_DAC_GAIN_S         0
++
++#define AR_PHY_TPC_4_B0                               (AR_SM_BASE + 0x204)
++#define AR_PHY_TPC_5_B0                               (AR_SM_BASE + 0x208)
++#define AR_PHY_TPC_6_B0                               (AR_SM_BASE + 0x20c)
++
++#define AR_PHY_TPC_11_B0                      (AR_SM_BASE + 0x220)
++#define AR_PHY_TPC_11_B1                      (AR_SM1_BASE + 0x220)
++#define AR_PHY_TPC_11_B2                      (AR_SM2_BASE + 0x220)
++#define AR_PHY_TPC_11_OLPC_GAIN_DELTA         0x00ff0000
++#define AR_PHY_TPC_11_OLPC_GAIN_DELTA_S               16
++
++#define AR_PHY_TPC_12                         (AR_SM_BASE + 0x224)
++#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5    0x3e000000
++#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5_S  25
++
++#define AR_PHY_TPC_18                         (AR_SM_BASE + 0x23c)
++#define AR_PHY_TPC_18_THERM_CAL_VALUE           0x000000ff
++#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
++#define AR_PHY_TPC_18_VOLT_CAL_VALUE          0x0000ff00
++#define AR_PHY_TPC_18_VOLT_CAL_VALUE_S                8
++
++#define AR_PHY_TPC_19                         (AR_SM_BASE + 0x240)
++#define AR_PHY_TPC_19_ALPHA_VOLT              0x001f0000
++#define AR_PHY_TPC_19_ALPHA_VOLT_S            16
++#define AR_PHY_TPC_19_ALPHA_THERM             0xff
++#define AR_PHY_TPC_19_ALPHA_THERM_S           0
++
++#define AR_PHY_TX_FORCED_GAIN                         (AR_SM_BASE + 0x258)
++#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN           0x00000001
++#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN_S         0
++#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN      0x0000000e
++#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN_S    1
++#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN      0x00000030
++#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN_S    4
++#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN                0x000003c0
++#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN_S      6
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA         0x00003c00
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA_S               10
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB         0x0003c000
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB_S               14
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC         0x003c0000
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC_S               18
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND         0x00c00000
++#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND_S               22
++#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL               0x01000000
++#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL_S     24
+ 
+-#define AR_PHY_TX_FORCED_GAIN    (AR_SM_BASE + 0x258)
+ 
+ #define AR_PHY_PDADC_TAB_0       (AR_SM_BASE + 0x280)
+ 
++#define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
++
+ #define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + 0x448)
+ #define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + 0x440)
+ #define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + 0x48c)
+@@ -490,7 +540,17 @@
+ #define AR_PHY_ONLY_WARMRESET       (AR_SM_BASE + 0x5d0)
+ #define AR_PHY_ONLY_CTL             (AR_SM_BASE + 0x5d4)
+ #define AR_PHY_ECO_CTRL             (AR_SM_BASE + 0x5dc)
+-#define AR_PHY_BB_THERM_ADC_1       (AR_SM_BASE + 0x248)
++
++#define AR_PHY_BB_THERM_ADC_1                         (AR_SM_BASE + 0x248)
++#define AR_PHY_BB_THERM_ADC_1_INIT_THERM              0x000000ff
++#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S            0
++
++#define AR_PHY_BB_THERM_ADC_4                         (AR_SM_BASE + 0x254)
++#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE      0x000000ff
++#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE_S    0
++#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE               0x0000ff00
++#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE_S     8
++
+ 
+ #define AR_PHY_65NM_CH0_SYNTH4      0x1608c
+ #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   0x00000002
+@@ -660,17 +720,9 @@
+ #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE      0x00003fff
+ #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE_S    0
+ 
+-#define AR_PHY_TPC_18_THERM_CAL_VALUE           0xff
+-#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
+-#define AR_PHY_TPC_19_ALPHA_THERM               0xff
+-#define AR_PHY_TPC_19_ALPHA_THERM_S             0
+-
+ #define AR_PHY_65NM_CH0_RXTX4_THERM_ON          0x10000000
+ #define AR_PHY_65NM_CH0_RXTX4_THERM_ON_S        28
+ 
+-#define AR_PHY_BB_THERM_ADC_1_INIT_THERM        0x000000ff
+-#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S      0
+-
+ /*
+  * Channel 1 Register Map
+  */
+@@ -842,6 +894,144 @@
+ 
+ #define AR_PHY_WATCHDOG_STATUS_CLR         0x00000008
+ 
++/*
++ * PAPRD registers
++ */
++#define AR_PHY_XPA_TIMING_CTL         (AR_SM_BASE + 0x64)
++
++#define AR_PHY_PAPRD_AM2AM            (AR_CHAN_BASE + 0xe4)
++#define AR_PHY_PAPRD_AM2AM_MASK               0x01ffffff
++#define AR_PHY_PAPRD_AM2AM_MASK_S     0
++
++#define AR_PHY_PAPRD_AM2PM            (AR_CHAN_BASE + 0xe8)
++#define AR_PHY_PAPRD_AM2PM_MASK               0x01ffffff
++#define AR_PHY_PAPRD_AM2PM_MASK_S     0
++
++#define AR_PHY_PAPRD_HT40             (AR_CHAN_BASE + 0xec)
++#define AR_PHY_PAPRD_HT40_MASK                0x01ffffff
++#define AR_PHY_PAPRD_HT40_MASK_S      0
++
++#define AR_PHY_PAPRD_CTRL0_B0                         (AR_CHAN_BASE + 0xf0)
++#define AR_PHY_PAPRD_CTRL0_B1                         (AR_CHAN1_BASE + 0xf0)
++#define AR_PHY_PAPRD_CTRL0_B2                         (AR_CHAN2_BASE + 0xf0)
++#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE                       0x00000001
++#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE_S             0
++#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK      0x00000002
++#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK_S    1
++#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH            0xf8000000
++#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH_S          27
++
++#define AR_PHY_PAPRD_CTRL1_B0                         (AR_CHAN_BASE + 0xf4)
++#define AR_PHY_PAPRD_CTRL1_B1                         (AR_CHAN1_BASE + 0xf4)
++#define AR_PHY_PAPRD_CTRL1_B2                         (AR_CHAN2_BASE + 0xf4)
++#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA               0x00000001
++#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA_S     0
++#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE      0x00000002
++#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE_S    1
++#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE      0x00000004
++#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE_S    2
++#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL   0x000001f8
++#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL_S 3
++#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK    0x0001fe00
++#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK_S  9
++#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT               0x0ffe0000
++#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT_S     17
++
++#define AR_PHY_PAPRD_TRAINER_CNTL1                            (AR_SM_BASE + 0x490)
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE   0x00000001
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE_S 0
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING     0x0000007e
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING_S   1
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE     0x00000100
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE_S   8
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE  0x00000200
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE_S        9
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE     0x00000400
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE_S   10
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE         0x00000800
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE_S               11
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP           0x0003f000
++#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP_S         12
++
++#define AR_PHY_PAPRD_TRAINER_CNTL2                            (AR_SM_BASE + 0x494)
++#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN   0xFFFFFFFF
++#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN_S 0
++
++#define AR_PHY_PAPRD_TRAINER_CNTL3                            (AR_SM_BASE + 0x498)
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE  0x0000003f
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE_S        0
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP                0x00000fc0
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP_S      6
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL  0x0001f000
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL_S        12
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES   0x000e0000
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES_S 17
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN   0x00f00000
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN_S 20
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN     0x0f000000
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN_S   24
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE   0x20000000
++#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE_S 29
++
++#define AR_PHY_PAPRD_TRAINER_CNTL4                            (AR_SM_BASE + 0x49c)
++#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES 0x03ff0000
++#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES_S       16
++#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA      0x0000f000
++#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA_S    12
++#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR          0x00000fff
++#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR_S                0
++
++#define AR_PHY_PAPRD_PRE_POST_SCALE_0_B0                      (AR_CHAN_BASE + 0x100)
++#define AR_PHY_PAPRD_PRE_POST_SCALE_1_B0                      (AR_CHAN_BASE + 0x104)
++#define AR_PHY_PAPRD_PRE_POST_SCALE_2_B0                      (AR_CHAN_BASE + 0x108)
++#define AR_PHY_PAPRD_PRE_POST_SCALE_3_B0                      (AR_CHAN_BASE + 0x10c)
++#define AR_PHY_PAPRD_PRE_POST_SCALE_4_B0                      (AR_CHAN_BASE + 0x110)
++#define AR_PHY_PAPRD_PRE_POST_SCALE_5_B0                      (AR_CHAN_BASE + 0x114)
++#define AR_PHY_PAPRD_PRE_POST_SCALE_6_B0                      (AR_CHAN_BASE + 0x118)
++#define AR_PHY_PAPRD_PRE_POST_SCALE_7_B0                      (AR_CHAN_BASE + 0x11c)
++#define AR_PHY_PAPRD_PRE_POST_SCALING                         0x3FFFF
++#define AR_PHY_PAPRD_PRE_POST_SCALING_S                               0
++
++#define AR_PHY_PAPRD_TRAINER_STAT1                            (AR_SM_BASE + 0x4a0)
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE           0x00000001
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE_S         0
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE     0x00000002
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE_S   1
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR             0x00000004
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR_S           2
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE         0x00000008
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE_S               3
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX          0x000001f0
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX_S                4
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR             0x0001fe00
++#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR_S           9
++
++#define AR_PHY_PAPRD_TRAINER_STAT2                            (AR_SM_BASE + 0x4a4)
++#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL             0x0000ffff
++#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL_S           0
++#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX           0x001f0000
++#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX_S         16
++#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX             0x00600000
++#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX_S           21
++
++#define AR_PHY_PAPRD_TRAINER_STAT3                            (AR_SM_BASE + 0x4a8)
++#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT    0x000fffff
++#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT_S  0
++
++#define AR_PHY_PAPRD_MEM_TAB_B0                       (AR_CHAN_BASE + 0x120)
++#define AR_PHY_PAPRD_MEM_TAB_B1                       (AR_CHAN1_BASE + 0x120)
++#define AR_PHY_PAPRD_MEM_TAB_B2                       (AR_CHAN2_BASE + 0x120)
++
++#define AR_PHY_PA_GAIN123_B0                  (AR_CHAN_BASE + 0xf8)
++#define AR_PHY_PA_GAIN123_B1                  (AR_CHAN1_BASE + 0xf8)
++#define AR_PHY_PA_GAIN123_B2                  (AR_CHAN2_BASE + 0xf8)
++#define AR_PHY_PA_GAIN123_PA_GAIN1            0x3FF
++#define AR_PHY_PA_GAIN123_PA_GAIN1_S          0
++
++#define AR_PHY_POWERTX_RATE5                  (AR_SM_BASE + 0x1d0)
++#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0    0x3F
++#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0_S  0
++
+ void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
+ 
+ #endif  /* AR9003_PHY_H */
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -20,6 +20,7 @@
+ #include <linux/etherdevice.h>
+ #include <linux/device.h>
+ #include <linux/leds.h>
++#include <linux/completion.h>
+ 
+ #include "debug.h"
+ #include "common.h"
+@@ -194,6 +195,7 @@ enum ATH_AGGR_STATUS {
+ 
+ #define ATH_TXFIFO_DEPTH 8
+ struct ath_txq {
++      int axq_class;
+       u32 axq_qnum;
+       u32 *axq_link;
+       struct list_head axq_q;
+@@ -206,7 +208,6 @@ struct ath_txq {
+       struct list_head txq_fifo_pending;
+       u8 txq_headidx;
+       u8 txq_tailidx;
+-      int pending_frames;
+ };
+ 
+ struct ath_atx_ac {
+@@ -224,6 +225,7 @@ struct ath_buf_state {
+       int bfs_tidno;
+       int bfs_retries;
+       u8 bf_type;
++      u8 bfs_paprd;
+       u32 bfs_keyix;
+       enum ath9k_key_type bfs_keytype;
+ };
+@@ -244,7 +246,6 @@ struct ath_buf {
+       struct ath_buf_state bf_state;
+       dma_addr_t bf_dmacontext;
+       struct ath_wiphy *aphy;
+-      struct ath_txq *txq;
+ };
+ 
+ struct ath_atx_tid {
+@@ -281,6 +282,7 @@ struct ath_tx_control {
+       struct ath_txq *txq;
+       int if_id;
+       enum ath9k_internal_frame_type frame_type;
++      u8 paprd;
+ };
+ 
+ #define ATH_TX_ERROR        0x01
+@@ -290,11 +292,12 @@ struct ath_tx_control {
+ struct ath_tx {
+       u16 seq_no;
+       u32 txqsetup;
+-      int hwq_map[ATH9K_WME_AC_VO+1];
++      int hwq_map[WME_NUM_AC];
+       spinlock_t txbuflock;
+       struct list_head txbuf;
+       struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
+       struct ath_descdma txdma;
++      int pending_frames[WME_NUM_AC];
+ };
+ 
+ struct ath_rx_edma {
+@@ -421,6 +424,7 @@ int ath_beaconq_config(struct ath_softc 
+ #define ATH_LONG_CALINTERVAL      30000   /* 30 seconds */
+ #define ATH_RESTART_CALINTERVAL   1200000 /* 20 minutes */
+ 
++void ath_paprd_calibrate(struct work_struct *work);
+ void ath_ani_calibrate(unsigned long data);
+ 
+ /**********/
+@@ -553,6 +557,9 @@ struct ath_softc {
+       spinlock_t sc_serial_rw;
+       spinlock_t sc_pm_lock;
+       struct mutex mutex;
++      struct work_struct paprd_work;
++      struct completion paprd_complete;
++      int paprd_txok;
+ 
+       u32 intrstatus;
+       u32 sc_flags; /* SC_OP_* */
+@@ -613,7 +620,6 @@ struct ath_wiphy {
+ 
+ void ath9k_tasklet(unsigned long data);
+ int ath_reset(struct ath_softc *sc, bool retry_tx);
+-int ath_get_hal_qnum(u16 queue, struct ath_softc *sc);
+ int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);
+ int ath_cabq_update(struct ath_softc *);
+ 
+@@ -629,8 +635,6 @@ irqreturn_t ath_isr(int irq, void *dev);
+ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
+                   const struct ath_bus_ops *bus_ops);
+ void ath9k_deinit_device(struct ath_softc *sc);
+-const char *ath_mac_bb_name(u32 mac_bb_version);
+-const char *ath_rf_name(u16 rf_version);
+ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
+ void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw,
+                          struct ath9k_channel *ichan);
+@@ -681,8 +685,6 @@ void ath9k_set_wiphy_idle(struct ath_wip
+ void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue);
+ void ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);
+ 
+-int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype);
+-
+ void ath_start_rfkill_poll(struct ath_softc *sc);
+ extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
+ 
+--- a/drivers/net/wireless/ath/ath9k/eeprom.h
++++ b/drivers/net/wireless/ath/ath9k/eeprom.h
+@@ -263,7 +263,8 @@ enum eeprom_param {
+       EEP_PWR_TABLE_OFFSET,
+       EEP_DRIVE_STRENGTH,
+       EEP_INTERNAL_REGULATOR,
+-      EEP_SWREG
++      EEP_SWREG,
++      EEP_PAPRD,
+ };
+ 
+ enum ar5416_rates {
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -2246,6 +2246,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+               pCap->rx_status_len = sizeof(struct ar9003_rxs);
+               pCap->tx_desc_len = sizeof(struct ar9003_txc);
+               pCap->txs_len = sizeof(struct ar9003_txs);
++              if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
++                      pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
+       } else {
+               pCap->tx_desc_len = sizeof(struct ath_desc);
+               if (AR_SREV_9280_20(ah) &&
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -158,6 +158,9 @@
+ #define ATH9K_HW_RX_HP_QDEPTH 16
+ #define ATH9K_HW_RX_LP_QDEPTH 128
+ 
++#define PAPRD_GAIN_TABLE_ENTRIES    32
++#define PAPRD_TABLE_SZ              24
++
+ enum ath_ini_subsys {
+       ATH_INI_PRE = 0,
+       ATH_INI_CORE,
+@@ -200,6 +203,7 @@ enum ath9k_hw_caps {
+       ATH9K_HW_CAP_LDPC                       = BIT(19),
+       ATH9K_HW_CAP_FASTCLOCK                  = BIT(20),
+       ATH9K_HW_CAP_SGI_20                     = BIT(21),
++      ATH9K_HW_CAP_PAPRD                      = BIT(22),
+ };
+ 
+ enum ath9k_capability_type {
+@@ -359,6 +363,9 @@ struct ath9k_channel {
+       int8_t iCoff;
+       int8_t qCoff;
+       int16_t rawNoiseFloor;
++      bool paprd_done;
++      u16 small_signal_gain[AR9300_MAX_CHAINS];
++      u32 pa_table[AR9300_MAX_CHAINS][PAPRD_TABLE_SZ];
+ };
+ 
+ #define IS_CHAN_G(_c) ((((_c)->channelFlags & (CHANNEL_G)) == CHANNEL_G) || \
+@@ -793,6 +800,9 @@ struct ath_hw {
+ 
+       u32 bb_watchdog_last_status;
+       u32 bb_watchdog_timeout_ms; /* in ms, 0 to disable */
++
++      u32 paprd_gain_table_entries[PAPRD_GAIN_TABLE_ENTRIES];
++      u8 paprd_gain_table_index[PAPRD_GAIN_TABLE_ENTRIES];
+ };
+ 
+ static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
+@@ -922,6 +932,15 @@ void ar9003_hw_set_nf_limits(struct ath_
+ void ar9003_hw_bb_watchdog_config(struct ath_hw *ah);
+ void ar9003_hw_bb_watchdog_read(struct ath_hw *ah);
+ void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah);
++void ar9003_paprd_enable(struct ath_hw *ah, bool val);
++void ar9003_paprd_populate_single_table(struct ath_hw *ah,
++                                      struct ath9k_channel *chan, int chain);
++int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
++                            int chain);
++int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
++int ar9003_paprd_init_table(struct ath_hw *ah);
++bool ar9003_paprd_is_done(struct ath_hw *ah);
++void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains);
+ 
+ /* Hardware family op attach helpers */
+ void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -427,7 +427,7 @@ static int ath9k_init_btcoex(struct ath_
+               r = ath_init_btcoex_timer(sc);
+               if (r)
+                       return -1;
+-              qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
++              qnum = sc->tx.hwq_map[WME_AC_BE];
+               ath9k_hw_init_btcoex_hw(sc->sc_ah, qnum);
+               sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
+               break;
+@@ -464,23 +464,23 @@ static int ath9k_init_queues(struct ath_
+       sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
+       ath_cabq_update(sc);
+ 
+-      if (!ath_tx_setup(sc, ATH9K_WME_AC_BK)) {
++      if (!ath_tx_setup(sc, WME_AC_BK)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for BK traffic\n");
+               goto err;
+       }
+ 
+-      if (!ath_tx_setup(sc, ATH9K_WME_AC_BE)) {
++      if (!ath_tx_setup(sc, WME_AC_BE)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for BE traffic\n");
+               goto err;
+       }
+-      if (!ath_tx_setup(sc, ATH9K_WME_AC_VI)) {
++      if (!ath_tx_setup(sc, WME_AC_VI)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for VI traffic\n");
+               goto err;
+       }
+-      if (!ath_tx_setup(sc, ATH9K_WME_AC_VO)) {
++      if (!ath_tx_setup(sc, WME_AC_VO)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for VO traffic\n");
+               goto err;
+@@ -769,6 +769,7 @@ int ath9k_init_device(u16 devid, struct 
+                       goto error_world;
+       }
+ 
++      INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
+       INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);
+       INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);
+       sc->wiphy_scheduler_int = msecs_to_jiffies(500);
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -233,6 +233,104 @@ int ath_set_channel(struct ath_softc *sc
+       return r;
+ }
+ 
++static void ath_paprd_activate(struct ath_softc *sc)
++{
++      struct ath_hw *ah = sc->sc_ah;
++      int chain;
++
++      if (!ah->curchan->paprd_done)
++              return;
++
++      ath9k_ps_wakeup(sc);
++      for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
++              if (!(ah->caps.tx_chainmask & BIT(chain)))
++                      continue;
++
++              ar9003_paprd_populate_single_table(ah, ah->curchan, chain);
++      }
++
++      ar9003_paprd_enable(ah, true);
++      ath9k_ps_restore(sc);
++}
++
++void ath_paprd_calibrate(struct work_struct *work)
++{
++      struct ath_softc *sc = container_of(work, struct ath_softc, paprd_work);
++      struct ieee80211_hw *hw = sc->hw;
++      struct ath_hw *ah = sc->sc_ah;
++      struct ieee80211_hdr *hdr;
++      struct sk_buff *skb = NULL;
++      struct ieee80211_tx_info *tx_info;
++      int band = hw->conf.channel->band;
++      struct ieee80211_supported_band *sband = &sc->sbands[band];
++      struct ath_tx_control txctl;
++      int qnum, ftype;
++      int chain_ok = 0;
++      int chain;
++      int len = 1800;
++      int i;
++
++      ath9k_ps_wakeup(sc);
++      skb = alloc_skb(len, GFP_KERNEL);
++      if (!skb)
++              return;
++
++      tx_info = IEEE80211_SKB_CB(skb);
++
++      skb_put(skb, len);
++      memset(skb->data, 0, len);
++      hdr = (struct ieee80211_hdr *)skb->data;
++      ftype = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC;
++      hdr->frame_control = cpu_to_le16(ftype);
++      hdr->duration_id = 10;
++      memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
++      memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
++      memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
++
++      memset(&txctl, 0, sizeof(txctl));
++      qnum = sc->tx.hwq_map[WME_AC_BE];
++      txctl.txq = &sc->tx.txq[qnum];
++
++      ar9003_paprd_init_table(ah);
++      for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
++              if (!(ah->caps.tx_chainmask & BIT(chain)))
++                      continue;
++
++              chain_ok = 0;
++              memset(tx_info, 0, sizeof(*tx_info));
++              tx_info->band = band;
++
++              for (i = 0; i < 4; i++) {
++                      tx_info->control.rates[i].idx = sband->n_bitrates - 1;
++                      tx_info->control.rates[i].count = 6;
++              }
++
++              init_completion(&sc->paprd_complete);
++              ar9003_paprd_setup_gain_table(ah, chain);
++              txctl.paprd = BIT(chain);
++              if (ath_tx_start(hw, skb, &txctl) != 0)
++                      break;
++
++              wait_for_completion(&sc->paprd_complete);
++
++              if (!ar9003_paprd_is_done(ah))
++                      break;
++
++              if (ar9003_paprd_create_curve(ah, ah->curchan, chain) != 0)
++                      break;
++
++              chain_ok = 1;
++      }
++      kfree_skb(skb);
++
++      if (chain_ok) {
++              ah->curchan->paprd_done = true;
++              ath_paprd_activate(sc);
++      }
++
++      ath9k_ps_restore(sc);
++}
++
+ /*
+  *  This routine performs the periodic noise floor calibration function
+  *  that is used to adjust and optimize the chip performance.  This
+@@ -332,6 +430,13 @@ set_timer:
+               cal_interval = min(cal_interval, (u32)short_cal_interval);
+ 
+       mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
++      if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) &&
++          !(sc->sc_flags & SC_OP_SCANNING)) {
++              if (!sc->sc_ah->curchan->paprd_done)
++                      ieee80211_queue_work(sc->hw, &sc->paprd_work);
++              else
++                      ath_paprd_activate(sc);
++      }
+ }
+ 
+ static void ath_start_ani(struct ath_common *common)
+@@ -805,25 +910,25 @@ int ath_reset(struct ath_softc *sc, bool
+       return r;
+ }
+ 
+-int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
++static int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
+ {
+       int qnum;
+ 
+       switch (queue) {
+       case 0:
+-              qnum = sc->tx.hwq_map[ATH9K_WME_AC_VO];
++              qnum = sc->tx.hwq_map[WME_AC_VO];
+               break;
+       case 1:
+-              qnum = sc->tx.hwq_map[ATH9K_WME_AC_VI];
++              qnum = sc->tx.hwq_map[WME_AC_VI];
+               break;
+       case 2:
+-              qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
++              qnum = sc->tx.hwq_map[WME_AC_BE];
+               break;
+       case 3:
+-              qnum = sc->tx.hwq_map[ATH9K_WME_AC_BK];
++              qnum = sc->tx.hwq_map[WME_AC_BK];
+               break;
+       default:
+-              qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
++              qnum = sc->tx.hwq_map[WME_AC_BE];
+               break;
+       }
+ 
+@@ -835,16 +940,16 @@ int ath_get_mac80211_qnum(u32 queue, str
+       int qnum;
+ 
+       switch (queue) {
+-      case ATH9K_WME_AC_VO:
++      case WME_AC_VO:
+               qnum = 0;
+               break;
+-      case ATH9K_WME_AC_VI:
++      case WME_AC_VI:
+               qnum = 1;
+               break;
+-      case ATH9K_WME_AC_BE:
++      case WME_AC_BE:
+               qnum = 2;
+               break;
+-      case ATH9K_WME_AC_BK:
++      case WME_AC_BK:
+               qnum = 3;
+               break;
+       default:
+@@ -1128,6 +1233,7 @@ static void ath9k_stop(struct ieee80211_
+ 
+       cancel_delayed_work_sync(&sc->ath_led_blink_work);
+       cancel_delayed_work_sync(&sc->tx_complete_work);
++      cancel_work_sync(&sc->paprd_work);
+ 
+       if (!sc->num_sec_wiphy) {
+               cancel_delayed_work_sync(&sc->wiphy_work);
+@@ -1556,7 +1662,7 @@ static int ath9k_conf_tx(struct ieee8021
+               ath_print(common, ATH_DBG_FATAL, "TXQ Update failed\n");
+ 
+       if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)
+-              if ((qnum == sc->tx.hwq_map[ATH9K_WME_AC_BE]) && !ret)
++              if ((qnum == sc->tx.hwq_map[WME_AC_BE]) && !ret)
+                       ath_beaconq_config(sc);
+ 
+       mutex_unlock(&sc->mutex);
+@@ -1843,6 +1949,7 @@ static void ath9k_sw_scan_start(struct i
+       ath9k_wiphy_pause_all_forced(sc, aphy);
+       sc->sc_flags |= SC_OP_SCANNING;
+       del_timer_sync(&common->ani.timer);
++      cancel_work_sync(&sc->paprd_work);
+       cancel_delayed_work_sync(&sc->tx_complete_work);
+       mutex_unlock(&sc->mutex);
+ }
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -941,6 +941,7 @@ struct ath_txq *ath_txq_setup(struct ath
+       if (!ATH_TXQ_SETUP(sc, qnum)) {
+               struct ath_txq *txq = &sc->tx.txq[qnum];
+ 
++              txq->axq_class = subtype;
+               txq->axq_qnum = qnum;
+               txq->axq_link = NULL;
+               INIT_LIST_HEAD(&txq->axq_q);
+@@ -958,32 +959,6 @@ struct ath_txq *ath_txq_setup(struct ath
+       return &sc->tx.txq[qnum];
+ }
+ 
+-int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype)
+-{
+-      int qnum;
+-
+-      switch (qtype) {
+-      case ATH9K_TX_QUEUE_DATA:
+-              if (haltype >= ARRAY_SIZE(sc->tx.hwq_map)) {
+-                      ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
+-                                "HAL AC %u out of range, max %zu!\n",
+-                                haltype, ARRAY_SIZE(sc->tx.hwq_map));
+-                      return -1;
+-              }
+-              qnum = sc->tx.hwq_map[haltype];
+-              break;
+-      case ATH9K_TX_QUEUE_BEACON:
+-              qnum = sc->beacon.beaconq;
+-              break;
+-      case ATH9K_TX_QUEUE_CAB:
+-              qnum = sc->beacon.cabq->axq_qnum;
+-              break;
+-      default:
+-              qnum = -1;
+-      }
+-      return qnum;
+-}
+-
+ int ath_txq_update(struct ath_softc *sc, int qnum,
+                  struct ath9k_tx_queue_info *qinfo)
+ {
+@@ -1662,12 +1637,13 @@ static int ath_tx_setup_buffer(struct ie
+               bf->bf_frmlen -= padsize;
+       }
+ 
+-      if (conf_is_ht(&hw->conf)) {
++      if (!txctl->paprd && conf_is_ht(&hw->conf)) {
+               bf->bf_state.bf_type |= BUF_HT;
+               if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
+                       use_ldpc = true;
+       }
+ 
++      bf->bf_state.bfs_paprd = txctl->paprd;
+       bf->bf_flags = setup_tx_flags(skb, use_ldpc);
+ 
+       bf->bf_keytype = get_hw_crypto_keytype(skb);
+@@ -1742,6 +1718,9 @@ static void ath_tx_start_dma(struct ath_
+                           bf->bf_buf_addr,
+                           txctl->txq->axq_qnum);
+ 
++      if (bf->bf_state.bfs_paprd)
++              ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);
++
+       spin_lock_bh(&txctl->txq->axq_lock);
+ 
+       if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR) &&
+@@ -1785,7 +1764,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       struct ath_txq *txq = txctl->txq;
+       struct ath_buf *bf;
+-      int r;
++      int q, r;
+ 
+       bf = ath_tx_get_buffer(sc);
+       if (!bf) {
+@@ -1793,14 +1772,6 @@ int ath_tx_start(struct ieee80211_hw *hw
+               return -1;
+       }
+ 
+-      bf->txq = txctl->txq;
+-      spin_lock_bh(&bf->txq->axq_lock);
+-      if (++bf->txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
+-              ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
+-              txq->stopped = 1;
+-      }
+-      spin_unlock_bh(&bf->txq->axq_lock);
+-
+       r = ath_tx_setup_buffer(hw, bf, skb, txctl);
+       if (unlikely(r)) {
+               ath_print(common, ATH_DBG_FATAL, "TX mem alloc failure\n");
+@@ -1821,6 +1792,17 @@ int ath_tx_start(struct ieee80211_hw *hw
+               return r;
+       }
+ 
++      q = skb_get_queue_mapping(skb);
++      if (q >= 4)
++              q = 0;
++
++      spin_lock_bh(&txq->axq_lock);
++      if (++sc->tx.pending_frames[q] > ATH_MAX_QDEPTH && !txq->stopped) {
++              ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
++              txq->stopped = 1;
++      }
++      spin_unlock_bh(&txq->axq_lock);
++
+       ath_tx_start_dma(sc, bf, txctl);
+ 
+       return 0;
+@@ -1890,7 +1872,7 @@ static void ath_tx_complete(struct ath_s
+       struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
+-      int padpos, padsize;
++      int q, padpos, padsize;
+ 
+       ath_print(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
+ 
+@@ -1929,8 +1911,16 @@ static void ath_tx_complete(struct ath_s
+ 
+       if (unlikely(tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_INTERNAL))
+               ath9k_tx_status(hw, skb);
+-      else
++      else {
++              q = skb_get_queue_mapping(skb);
++              if (q >= 4)
++                      q = 0;
++
++              if (--sc->tx.pending_frames[q] < 0)
++                      sc->tx.pending_frames[q] = 0;
++
+               ieee80211_tx_status(hw, skb);
++      }
+ }
+ 
+ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
+@@ -1951,16 +1941,15 @@ static void ath_tx_complete_buf(struct a
+                       tx_flags |= ATH_TX_XRETRY;
+       }
+ 
+-      if (bf->txq) {
+-              spin_lock_bh(&bf->txq->axq_lock);
+-              bf->txq->pending_frames--;
+-              spin_unlock_bh(&bf->txq->axq_lock);
+-              bf->txq = NULL;
+-      }
+-
+       dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
+-      ath_tx_complete(sc, skb, bf->aphy, tx_flags);
+-      ath_debug_stat_tx(sc, txq, bf, ts);
++
++      if (bf->bf_state.bfs_paprd) {
++              sc->paprd_txok = txok;
++              complete(&sc->paprd_complete);
++      } else {
++              ath_tx_complete(sc, skb, bf->aphy, tx_flags);
++              ath_debug_stat_tx(sc, txq, bf, ts);
++      }
+ 
+       /*
+        * Return the list of ath_buf of this mpdu to free queue
+@@ -2045,13 +2034,14 @@ static void ath_wake_mac80211_queue(stru
+ {
+       int qnum;
+ 
++      qnum = ath_get_mac80211_qnum(txq->axq_class, sc);
++      if (qnum == -1)
++              return;
++
+       spin_lock_bh(&txq->axq_lock);
+-      if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
+-              qnum = ath_get_mac80211_qnum(txq->axq_qnum, sc);
+-              if (qnum != -1) {
+-                      ath_mac80211_start_queue(sc, qnum);
+-                      txq->stopped = 0;
+-              }
++      if (txq->stopped && sc->tx.pending_frames[qnum] < ATH_MAX_QDEPTH) {
++              ath_mac80211_start_queue(sc, qnum);
++              txq->stopped = 0;
+       }
+       spin_unlock_bh(&txq->axq_lock);
+ }
+@@ -2422,26 +2412,8 @@ void ath_tx_node_init(struct ath_softc *
+       for (acno = 0, ac = &an->ac[acno];
+            acno < WME_NUM_AC; acno++, ac++) {
+               ac->sched    = false;
++              ac->qnum = sc->tx.hwq_map[acno];
+               INIT_LIST_HEAD(&ac->tid_q);
+-
+-              switch (acno) {
+-              case WME_AC_BE:
+-                      ac->qnum = ath_tx_get_qnum(sc,
+-                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
+-                      break;
+-              case WME_AC_BK:
+-                      ac->qnum = ath_tx_get_qnum(sc,
+-                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BK);
+-                      break;
+-              case WME_AC_VI:
+-                      ac->qnum = ath_tx_get_qnum(sc,
+-                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VI);
+-                      break;
+-              case WME_AC_VO:
+-                      ac->qnum = ath_tx_get_qnum(sc,
+-                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VO);
+-                      break;
+-              }
+       }
+ }
+ 
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -38,8 +38,7 @@ int ath_beaconq_config(struct ath_softc 
+               qi.tqi_cwmax = 0;
+       } else {
+               /* Adhoc mode; important thing is to use 2x cwmin. */
+-              qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA,
+-                                     ATH9K_WME_AC_BE);
++              qnum = sc->tx.hwq_map[WME_AC_BE];
+               ath9k_hw_get_txq_props(ah, qnum, &qi_be);
+               qi.tqi_aifs = qi_be.tqi_aifs;
+               qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -630,10 +630,10 @@ static const struct file_operations fops
+       do {                                                            \
+               len += snprintf(buf + len, size - len,                  \
+                               "%s%13u%11u%10u%10u\n", str,            \
+-              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BE]].elem, \
+-              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BK]].elem, \
+-              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VI]].elem, \
+-              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VO]].elem); \
++              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BE]].elem, \
++              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BK]].elem, \
++              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VI]].elem, \
++              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VO]].elem); \
+ } while(0)
+ 
+ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
+@@ -956,6 +956,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+                       sc->debug.debugfs_phy, sc, &fops_regval))
+               goto err;
+ 
++      if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
++                      sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
++              goto err;
++
+       sc->debug.regidx = 0;
+       return 0;
+ err:
+--- a/drivers/net/wireless/ath/ath9k/htc.h
++++ b/drivers/net/wireless/ath/ath9k/htc.h
+@@ -398,7 +398,7 @@ struct ath9k_htc_priv {
+ 
+       int beaconq;
+       int cabq;
+-      int hwq_map[ATH9K_WME_AC_VO+1];
++      int hwq_map[WME_NUM_AC];
+ 
+ #ifdef CONFIG_ATH9K_HTC_DEBUGFS
+       struct ath9k_debug debug;
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+@@ -227,7 +227,7 @@ void ath9k_htc_beaconq_config(struct ath
+ {
+       struct ath_hw *ah = priv->ah;
+       struct ath9k_tx_queue_info qi, qi_be;
+-      int qnum = priv->hwq_map[ATH9K_WME_AC_BE];
++      int qnum = priv->hwq_map[WME_AC_BE];
+ 
+       memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
+       memset(&qi_be, 0, sizeof(struct ath9k_tx_queue_info));
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+@@ -521,23 +521,23 @@ static int ath9k_init_queues(struct ath9
+               goto err;
+       }
+ 
+-      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BE)) {
++      if (!ath9k_htc_txq_setup(priv, WME_AC_BE)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for BE traffic\n");
+               goto err;
+       }
+ 
+-      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BK)) {
++      if (!ath9k_htc_txq_setup(priv, WME_AC_BK)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for BK traffic\n");
+               goto err;
+       }
+-      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VI)) {
++      if (!ath9k_htc_txq_setup(priv, WME_AC_VI)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for VI traffic\n");
+               goto err;
+       }
+-      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VO)) {
++      if (!ath9k_htc_txq_setup(priv, WME_AC_VO)) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to setup xmit queue for VO traffic\n");
+               goto err;
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+@@ -1590,7 +1590,7 @@ static int ath9k_htc_conf_tx(struct ieee
+       }
+ 
+       if ((priv->ah->opmode == NL80211_IFTYPE_ADHOC) &&
+-          (qnum == priv->hwq_map[ATH9K_WME_AC_BE]))
++          (qnum == priv->hwq_map[WME_AC_BE]))
+                   ath9k_htc_beaconq_config(priv);
+ out:
+       ath9k_htc_ps_restore(priv);
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+@@ -34,15 +34,15 @@ int get_hw_qnum(u16 queue, int *hwq_map)
+ {
+       switch (queue) {
+       case 0:
+-              return hwq_map[ATH9K_WME_AC_VO];
++              return hwq_map[WME_AC_VO];
+       case 1:
+-              return hwq_map[ATH9K_WME_AC_VI];
++              return hwq_map[WME_AC_VI];
+       case 2:
+-              return hwq_map[ATH9K_WME_AC_BE];
++              return hwq_map[WME_AC_BE];
+       case 3:
+-              return hwq_map[ATH9K_WME_AC_BK];
++              return hwq_map[WME_AC_BK];
+       default:
+-              return hwq_map[ATH9K_WME_AC_BE];
++              return hwq_map[WME_AC_BE];
+       }
+ }
+ 
+--- a/drivers/net/wireless/ath/ath9k/mac.h
++++ b/drivers/net/wireless/ath/ath9k/mac.h
+@@ -577,13 +577,8 @@ enum ath9k_tx_queue {
+ 
+ #define       ATH9K_NUM_TX_QUEUES 10
+ 
+-enum ath9k_tx_queue_subtype {
+-      ATH9K_WME_AC_BK = 0,
+-      ATH9K_WME_AC_BE,
+-      ATH9K_WME_AC_VI,
+-      ATH9K_WME_AC_VO,
+-      ATH9K_WME_UPSD
+-};
++/* Used as a queue subtype instead of a WMM AC */
++#define ATH9K_WME_UPSD        4
+ 
+ enum ath9k_tx_queue_flags {
+       TXQ_FLAG_TXOKINT_ENABLE = 0x0001,
+@@ -617,7 +612,7 @@ enum ath9k_pkt_type {
+ struct ath9k_tx_queue_info {
+       u32 tqi_ver;
+       enum ath9k_tx_queue tqi_type;
+-      enum ath9k_tx_queue_subtype tqi_subtype;
++      int tqi_subtype;
+       enum ath9k_tx_queue_flags tqi_qflags;
+       u32 tqi_priority;
+       u32 tqi_aifs;
+--- a/drivers/net/wireless/ath/ath9k/virtual.c
++++ b/drivers/net/wireless/ath/ath9k/virtual.c
+@@ -219,7 +219,7 @@ static int ath9k_send_nullfunc(struct at
+       info->control.rates[1].idx = -1;
+ 
+       memset(&txctl, 0, sizeof(struct ath_tx_control));
+-      txctl.txq = &sc->tx.txq[sc->tx.hwq_map[ATH9K_WME_AC_VO]];
++      txctl.txq = &sc->tx.txq[sc->tx.hwq_map[WME_AC_VO]];
+       txctl.frame_type = ps ? ATH9K_IFT_PAUSE : ATH9K_IFT_UNPAUSE;
+ 
+       if (ath_tx_start(aphy->hw, skb, &txctl) != 0)

diff --git a/package/mac80211/patches/520-ath0k_hw_mcast_search.patch b/package/mac80211/patches/520-ath0k_hw_mcast_search.patch
deleted file mode 100644 (file)
index eb09da5..0000000
--- a/package/mac80211/patches/520-ath0k_hw_mcast_search.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1497,6 +1497,7 @@ EXPORT_SYMBOL(ath9k_hw_keyreset);
- bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac)
- {
-       u32 macHi, macLo;
-+      u32 unicast_flag = AR_KEYTABLE_VALID;
- 
-       if (entry >= ah->caps.keycache_size) {
-               ath_print(ath9k_hw_common(ah), ATH_DBG_FATAL,
-@@ -1505,6 +1506,16 @@ bool ath9k_hw_keysetmac(struct ath_hw *a
-       }
- 
-       if (mac != NULL) {
-+              /*
-+               * AR_KEYTABLE_VALID indicates that the address is a unicast
-+               * address, which must match the transmitter address for
-+               * decrypting frames.
-+               * Not setting this bit allows the hardware to use the key
-+               * for multicast frame decryption.
-+               */
-+              if (mac[0] & 0x01)
-+                      unicast_flag = 0;
-+
-               macHi = (mac[5] << 8) | mac[4];
-               macLo = (mac[3] << 24) |
-                       (mac[2] << 16) |
-@@ -1517,7 +1528,7 @@ bool ath9k_hw_keysetmac(struct ath_hw *a
-               macLo = macHi = 0;
-       }
-       REG_WRITE(ah, AR_KEYTABLE_MAC0(entry), macLo);
--      REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | AR_KEYTABLE_VALID);
-+      REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | unicast_flag);
- 
-       return true;
- }

diff --git a/package/mac80211/patches/520-ath9k_enable_ar9300.patch b/package/mac80211/patches/520-ath9k_enable_ar9300.patch
new file mode 100644 (file)
index 0000000..f8fbe86
--- /dev/null
+++ b/package/mac80211/patches/520-ath9k_enable_ar9300.patch
@@ -0,0 +1,10 @@
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -29,6 +29,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
+       { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
+       { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */
+       { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */
++      { PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E  AR9300 */
+       { 0 }
+ };
+ 

diff --git a/package/mac80211/patches/521-ath9k_common-use_mcast_search.patch b/package/mac80211/patches/521-ath9k_common-use_mcast_search.patch
deleted file mode 100644 (file)
index b83e958..0000000
--- a/package/mac80211/patches/521-ath9k_common-use_mcast_search.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/common.c
-+++ b/drivers/net/wireless/ath/ath9k/common.c
-@@ -211,10 +211,14 @@ static int ath_reserve_key_cache_slot_tk
-       return -1;
- }
- 
--static int ath_reserve_key_cache_slot(struct ath_common *common)
-+static int ath_reserve_key_cache_slot(struct ath_common *common,
-+                                    enum ieee80211_key_alg alg)
- {
-       int i;
- 
-+      if (alg == ALG_TKIP)
-+              return ath_reserve_key_cache_slot_tkip(common);
-+
-       /* First, try to find slots that would not be available for TKIP. */
-       if (common->splitmic) {
-               for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
-@@ -283,6 +287,7 @@ int ath9k_cmn_key_config(struct ath_comm
-       struct ath_hw *ah = common->ah;
-       struct ath9k_keyval hk;
-       const u8 *mac = NULL;
-+      u8 gmac[ETH_ALEN];
-       int ret = 0;
-       int idx;
- 
-@@ -306,9 +311,23 @@ int ath9k_cmn_key_config(struct ath_comm
-       memcpy(hk.kv_val, key->key, key->keylen);
- 
-       if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
--              /* For now, use the default keys for broadcast keys. This may
--               * need to change with virtual interfaces. */
--              idx = key->keyidx;
-+              switch (vif->type) {
-+              case NL80211_IFTYPE_AP:
-+                      memcpy(gmac, vif->addr, ETH_ALEN);
-+                      gmac[0] |= 0x01;
-+                      mac = gmac;
-+                      idx = ath_reserve_key_cache_slot(common, key->alg);
-+                      break;
-+              case NL80211_IFTYPE_ADHOC:
-+                      memcpy(gmac, sta->addr, ETH_ALEN);
-+                      gmac[0] |= 0x01;
-+                      mac = gmac;
-+                      idx = ath_reserve_key_cache_slot(common, key->alg);
-+                      break;
-+              default:
-+                      idx = key->keyidx;
-+                      break;
-+              }
-       } else if (key->keyidx) {
-               if (WARN_ON(!sta))
-                       return -EOPNOTSUPP;
-@@ -325,14 +344,12 @@ int ath9k_cmn_key_config(struct ath_comm
-                       return -EOPNOTSUPP;
-               mac = sta->addr;
- 
--              if (key->alg == ALG_TKIP)
--                      idx = ath_reserve_key_cache_slot_tkip(common);
--              else
--                      idx = ath_reserve_key_cache_slot(common);
--              if (idx < 0)
--                      return -ENOSPC; /* no free key cache entries */
-+              idx = ath_reserve_key_cache_slot(common, key->alg);
-       }
- 
-+      if (idx < 0)
-+              return -ENOSPC; /* no free key cache entries */
-+
-       if (key->alg == ALG_TKIP)
-               ret = ath_setkey_tkip(common, idx, key->key, &hk, mac,
-                                     vif->type == NL80211_IFTYPE_AP);

diff --git a/package/mac80211/patches/522-ath9k_remove_duplicate_code.patch b/package/mac80211/patches/522-ath9k_remove_duplicate_code.patch
deleted file mode 100644 (file)
index 53d8678..0000000
--- a/package/mac80211/patches/522-ath9k_remove_duplicate_code.patch
+++ /dev/null
@@ -1,255 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -622,234 +622,6 @@ static u32 ath_get_extchanmode(struct at
-       return chanmode;
- }
- 
--static int ath_setkey_tkip(struct ath_common *common, u16 keyix, const u8 *key,
--                         struct ath9k_keyval *hk, const u8 *addr,
--                         bool authenticator)
--{
--      struct ath_hw *ah = common->ah;
--      const u8 *key_rxmic;
--      const u8 *key_txmic;
--
--      key_txmic = key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY;
--      key_rxmic = key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY;
--
--      if (addr == NULL) {
--              /*
--               * Group key installation - only two key cache entries are used
--               * regardless of splitmic capability since group key is only
--               * used either for TX or RX.
--               */
--              if (authenticator) {
--                      memcpy(hk->kv_mic, key_txmic, sizeof(hk->kv_mic));
--                      memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_mic));
--              } else {
--                      memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
--                      memcpy(hk->kv_txmic, key_rxmic, sizeof(hk->kv_mic));
--              }
--              return ath9k_hw_set_keycache_entry(ah, keyix, hk, addr);
--      }
--      if (!common->splitmic) {
--              /* TX and RX keys share the same key cache entry. */
--              memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
--              memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_txmic));
--              return ath9k_hw_set_keycache_entry(ah, keyix, hk, addr);
--      }
--
--      /* Separate key cache entries for TX and RX */
--
--      /* TX key goes at first index, RX key at +32. */
--      memcpy(hk->kv_mic, key_txmic, sizeof(hk->kv_mic));
--      if (!ath9k_hw_set_keycache_entry(ah, keyix, hk, NULL)) {
--              /* TX MIC entry failed. No need to proceed further */
--              ath_print(common, ATH_DBG_FATAL,
--                        "Setting TX MIC Key Failed\n");
--              return 0;
--      }
--
--      memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
--      /* XXX delete tx key on failure? */
--      return ath9k_hw_set_keycache_entry(ah, keyix + 32, hk, addr);
--}
--
--static int ath_reserve_key_cache_slot_tkip(struct ath_common *common)
--{
--      int i;
--
--      for (i = IEEE80211_WEP_NKID; i < common->keymax / 2; i++) {
--              if (test_bit(i, common->keymap) ||
--                  test_bit(i + 64, common->keymap))
--                      continue; /* At least one part of TKIP key allocated */
--              if (common->splitmic &&
--                  (test_bit(i + 32, common->keymap) ||
--                   test_bit(i + 64 + 32, common->keymap)))
--                      continue; /* At least one part of TKIP key allocated */
--
--              /* Found a free slot for a TKIP key */
--              return i;
--      }
--      return -1;
--}
--
--static int ath_reserve_key_cache_slot(struct ath_common *common)
--{
--      int i;
--
--      /* First, try to find slots that would not be available for TKIP. */
--      if (common->splitmic) {
--              for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
--                      if (!test_bit(i, common->keymap) &&
--                          (test_bit(i + 32, common->keymap) ||
--                           test_bit(i + 64, common->keymap) ||
--                           test_bit(i + 64 + 32, common->keymap)))
--                              return i;
--                      if (!test_bit(i + 32, common->keymap) &&
--                          (test_bit(i, common->keymap) ||
--                           test_bit(i + 64, common->keymap) ||
--                           test_bit(i + 64 + 32, common->keymap)))
--                              return i + 32;
--                      if (!test_bit(i + 64, common->keymap) &&
--                          (test_bit(i , common->keymap) ||
--                           test_bit(i + 32, common->keymap) ||
--                           test_bit(i + 64 + 32, common->keymap)))
--                              return i + 64;
--                      if (!test_bit(i + 64 + 32, common->keymap) &&
--                          (test_bit(i, common->keymap) ||
--                           test_bit(i + 32, common->keymap) ||
--                           test_bit(i + 64, common->keymap)))
--                              return i + 64 + 32;
--              }
--      } else {
--              for (i = IEEE80211_WEP_NKID; i < common->keymax / 2; i++) {
--                      if (!test_bit(i, common->keymap) &&
--                          test_bit(i + 64, common->keymap))
--                              return i;
--                      if (test_bit(i, common->keymap) &&
--                          !test_bit(i + 64, common->keymap))
--                              return i + 64;
--              }
--      }
--
--      /* No partially used TKIP slots, pick any available slot */
--      for (i = IEEE80211_WEP_NKID; i < common->keymax; i++) {
--              /* Do not allow slots that could be needed for TKIP group keys
--               * to be used. This limitation could be removed if we know that
--               * TKIP will not be used. */
--              if (i >= 64 && i < 64 + IEEE80211_WEP_NKID)
--                      continue;
--              if (common->splitmic) {
--                      if (i >= 32 && i < 32 + IEEE80211_WEP_NKID)
--                              continue;
--                      if (i >= 64 + 32 && i < 64 + 32 + IEEE80211_WEP_NKID)
--                              continue;
--              }
--
--              if (!test_bit(i, common->keymap))
--                      return i; /* Found a free slot for a key */
--      }
--
--      /* No free slot found */
--      return -1;
--}
--
--static int ath_key_config(struct ath_common *common,
--                        struct ieee80211_vif *vif,
--                        struct ieee80211_sta *sta,
--                        struct ieee80211_key_conf *key)
--{
--      struct ath_hw *ah = common->ah;
--      struct ath9k_keyval hk;
--      const u8 *mac = NULL;
--      int ret = 0;
--      int idx;
--
--      memset(&hk, 0, sizeof(hk));
--
--      switch (key->alg) {
--      case ALG_WEP:
--              hk.kv_type = ATH9K_CIPHER_WEP;
--              break;
--      case ALG_TKIP:
--              hk.kv_type = ATH9K_CIPHER_TKIP;
--              break;
--      case ALG_CCMP:
--              hk.kv_type = ATH9K_CIPHER_AES_CCM;
--              break;
--      default:
--              return -EOPNOTSUPP;
--      }
--
--      hk.kv_len = key->keylen;
--      memcpy(hk.kv_val, key->key, key->keylen);
--
--      if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
--              /* For now, use the default keys for broadcast keys. This may
--               * need to change with virtual interfaces. */
--              idx = key->keyidx;
--      } else if (key->keyidx) {
--              if (WARN_ON(!sta))
--                      return -EOPNOTSUPP;
--              mac = sta->addr;
--
--              if (vif->type != NL80211_IFTYPE_AP) {
--                      /* Only keyidx 0 should be used with unicast key, but
--                       * allow this for client mode for now. */
--                      idx = key->keyidx;
--              } else
--                      return -EIO;
--      } else {
--              if (WARN_ON(!sta))
--                      return -EOPNOTSUPP;
--              mac = sta->addr;
--
--              if (key->alg == ALG_TKIP)
--                      idx = ath_reserve_key_cache_slot_tkip(common);
--              else
--                      idx = ath_reserve_key_cache_slot(common);
--              if (idx < 0)
--                      return -ENOSPC; /* no free key cache entries */
--      }
--
--      if (key->alg == ALG_TKIP)
--              ret = ath_setkey_tkip(common, idx, key->key, &hk, mac,
--                                    vif->type == NL80211_IFTYPE_AP);
--      else
--              ret = ath9k_hw_set_keycache_entry(ah, idx, &hk, mac);
--
--      if (!ret)
--              return -EIO;
--
--      set_bit(idx, common->keymap);
--      if (key->alg == ALG_TKIP) {
--              set_bit(idx + 64, common->keymap);
--              if (common->splitmic) {
--                      set_bit(idx + 32, common->keymap);
--                      set_bit(idx + 64 + 32, common->keymap);
--              }
--      }
--
--      return idx;
--}
--
--static void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key)
--{
--      struct ath_hw *ah = common->ah;
--
--      ath9k_hw_keyreset(ah, key->hw_key_idx);
--      if (key->hw_key_idx < IEEE80211_WEP_NKID)
--              return;
--
--      clear_bit(key->hw_key_idx, common->keymap);
--      if (key->alg != ALG_TKIP)
--              return;
--
--      clear_bit(key->hw_key_idx + 64, common->keymap);
--      if (common->splitmic) {
--              ath9k_hw_keyreset(ah, key->hw_key_idx + 32);
--              clear_bit(key->hw_key_idx + 32, common->keymap);
--              clear_bit(key->hw_key_idx + 64 + 32, common->keymap);
--      }
--}
--
- static void ath9k_bss_assoc_info(struct ath_softc *sc,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_bss_conf *bss_conf)
-@@ -1814,7 +1586,7 @@ static int ath9k_set_key(struct ieee8021
- 
-       switch (cmd) {
-       case SET_KEY:
--              ret = ath_key_config(common, vif, sta, key);
-+              ret = ath9k_cmn_key_config(common, vif, sta, key);
-               if (ret >= 0) {
-                       key->hw_key_idx = ret;
-                       /* push IV and Michael MIC generation to stack */
-@@ -1827,7 +1599,7 @@ static int ath9k_set_key(struct ieee8021
-               }
-               break;
-       case DISABLE_KEY:
--              ath_key_delete(common, key);
-+              ath9k_cmn_key_delete(common, key);
-               break;
-       default:
-               ret = -EINVAL;

diff --git a/package/mac80211/patches/530-ath9k_queue_fill.patch b/package/mac80211/patches/530-ath9k_queue_fill.patch
deleted file mode 100644 (file)
index d9bedd6..0000000
--- a/package/mac80211/patches/530-ath9k_queue_fill.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -137,6 +137,8 @@ void ath_descdma_cleanup(struct ath_soft
- #define ATH_MAX_ANTENNA         3
- #define ATH_RXBUF               512
- #define ATH_TXBUF               512
-+#define ATH_TXBUF_RESERVE       5
-+#define ATH_MAX_QDEPTH          (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
- #define ATH_TXMAXTRY            13
- #define ATH_MGT_TXMAXTRY        4
- 
-@@ -205,6 +207,7 @@ struct ath_txq {
-       struct list_head txq_fifo_pending;
-       u8 txq_headidx;
-       u8 txq_tailidx;
-+      int pending_frames;
- };
- 
- struct ath_atx_ac {
-@@ -242,6 +245,7 @@ struct ath_buf {
-       struct ath_buf_state bf_state;
-       dma_addr_t bf_dmacontext;
-       struct ath_wiphy *aphy;
-+      struct ath_txq *txq;
- };
- 
- struct ath_atx_tid {
-@@ -331,7 +335,6 @@ void ath_tx_node_cleanup(struct ath_soft
- void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq);
- int ath_tx_init(struct ath_softc *sc, int nbufs);
- void ath_tx_cleanup(struct ath_softc *sc);
--struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb);
- int ath_txq_update(struct ath_softc *sc, int qnum,
-                  struct ath9k_tx_queue_info *q);
- int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -986,32 +986,6 @@ int ath_tx_get_qnum(struct ath_softc *sc
-       return qnum;
- }
- 
--struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb)
--{
--      struct ath_txq *txq = NULL;
--      u16 skb_queue = skb_get_queue_mapping(skb);
--      int qnum;
--
--      qnum = ath_get_hal_qnum(skb_queue, sc);
--      txq = &sc->tx.txq[qnum];
--
--      spin_lock_bh(&txq->axq_lock);
--
--      if (txq->axq_depth >= (ATH_TXBUF - 20)) {
--              ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_XMIT,
--                        "TX queue: %d is full, depth: %d\n",
--                        qnum, txq->axq_depth);
--              ath_mac80211_stop_queue(sc, skb_queue);
--              txq->stopped = 1;
--              spin_unlock_bh(&txq->axq_lock);
--              return NULL;
--      }
--
--      spin_unlock_bh(&txq->axq_lock);
--
--      return txq;
--}
--
- int ath_txq_update(struct ath_softc *sc, int qnum,
-                  struct ath9k_tx_queue_info *qinfo)
- {
-@@ -1811,6 +1785,7 @@ int ath_tx_start(struct ieee80211_hw *hw
-       struct ath_wiphy *aphy = hw->priv;
-       struct ath_softc *sc = aphy->sc;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+      struct ath_txq *txq = txctl->txq;
-       struct ath_buf *bf;
-       int r;
- 
-@@ -1820,10 +1795,16 @@ int ath_tx_start(struct ieee80211_hw *hw
-               return -1;
-       }
- 
-+      bf->txq = txctl->txq;
-+      spin_lock_bh(&bf->txq->axq_lock);
-+      if (++bf->txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
-+              ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
-+              txq->stopped = 1;
-+      }
-+      spin_unlock_bh(&bf->txq->axq_lock);
-+
-       r = ath_tx_setup_buffer(hw, bf, skb, txctl);
-       if (unlikely(r)) {
--              struct ath_txq *txq = txctl->txq;
--
-               ath_print(common, ATH_DBG_FATAL, "TX mem alloc failure\n");
- 
-               /* upon ath_tx_processq() this TX queue will be resumed, we
-@@ -1831,7 +1812,7 @@ int ath_tx_start(struct ieee80211_hw *hw
-                * we will at least have to run TX completionon one buffer
-                * on the queue */
-               spin_lock_bh(&txq->axq_lock);
--              if (sc->tx.txq[txq->axq_qnum].axq_depth > 1) {
-+              if (!txq->stopped && txq->axq_depth > 1) {
-                       ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
-                       txq->stopped = 1;
-               }
-@@ -1972,6 +1953,13 @@ static void ath_tx_complete_buf(struct a
-                       tx_flags |= ATH_TX_XRETRY;
-       }
- 
-+      if (bf->txq) {
-+              spin_lock_bh(&bf->txq->axq_lock);
-+              bf->txq->pending_frames--;
-+              spin_unlock_bh(&bf->txq->axq_lock);
-+              bf->txq = NULL;
-+      }
-+
-       dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
-       ath_tx_complete(sc, skb, bf->aphy, tx_flags);
-       ath_debug_stat_tx(sc, txq, bf, ts);
-@@ -2060,8 +2048,7 @@ static void ath_wake_mac80211_queue(stru
-       int qnum;
- 
-       spin_lock_bh(&txq->axq_lock);
--      if (txq->stopped &&
--          sc->tx.txq[txq->axq_qnum].axq_depth <= (ATH_TXBUF - 20)) {
-+      if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
-               qnum = ath_get_mac80211_qnum(txq->axq_qnum, sc);
-               if (qnum != -1) {
-                       ath_mac80211_start_queue(sc, qnum);
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1026,6 +1026,7 @@ static int ath9k_tx(struct ieee80211_hw 
-       struct ath_tx_control txctl;
-       int padpos, padsize;
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-+      int qnum;
- 
-       if (aphy->state != ATH_WIPHY_ACTIVE && aphy->state != ATH_WIPHY_SCAN) {
-               ath_print(common, ATH_DBG_XMIT,
-@@ -1098,11 +1099,8 @@ static int ath9k_tx(struct ieee80211_hw 
-               memmove(skb->data, skb->data + padsize, padpos);
-       }
- 
--      /* Check if a tx queue is available */
--
--      txctl.txq = ath_test_get_txq(sc, skb);
--      if (!txctl.txq)
--              goto exit;
-+      qnum = ath_get_hal_qnum(skb_get_queue_mapping(skb), sc);
-+      txctl.txq = &sc->tx.txq[qnum];
- 
-       ath_print(common, ATH_DBG_XMIT, "transmitting packet, skb: %p\n", skb);
- 

diff --git a/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
index cea88ae..bae97ca 100644 (file)
--- a/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
+++ b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -216,6 +216,7 @@ void rt2x00pci_uninitialize(struct rt2x0
+@@ -262,6 +262,7 @@ void rt2x00pci_uninitialize(struct rt2x0
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
  
@@ -8,7 +8,7 @@
  /*
   * PCI driver handlers.
   */
-@@ -390,6 +391,7 @@ int rt2x00pci_resume(struct pci_dev *pci
+@@ -439,6 +440,7 @@ int rt2x00pci_resume(struct pci_dev *pci
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_resume);
  #endif /* CONFIG_PM */