summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/500-pending_work.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/mac80211/patches/500-pending_work.patch')
-rw-r--r--package/mac80211/patches/500-pending_work.patch9874
1 files changed, 0 insertions, 9874 deletions
diff --git a/package/mac80211/patches/500-pending_work.patch b/package/mac80211/patches/500-pending_work.patch
deleted file mode 100644
index 16ba6f5cc..000000000
--- 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);
-+}