diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 16bfb6fb73341dcba35ab24adf6cb29740fb56bd..f7e3e4fe51fe182bdbe45c5b572a55bb14d9afb3 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -10,11 +10,11 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mac80211
-PKG_VERSION:=2013-06-27
+PKG_VERSION:=2013-11-05
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
-PKG_BACKPORT_VERSION:=.1
-PKG_MD5SUM:=73bd220c64c5c6fdc22b3bb7f180644f
+PKG_BACKPORT_VERSION:=
+PKG_MD5SUM:=5ef839d02d19c341629555a529beebee
PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
@@ -24,8 +24,8 @@ PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
PKG_DRIVERS = \
adm8211 ath5k libertas-usb libertas-sd p54-common p54-pci p54-usb p54-spi \
- rt2x00-lib rt2x00-pci rt2x00-usb rt2x00-soc rt2800-lib rt2400-pci \
- rt2500-pci rt2500-usb rt61-pci rt73-usb rt2800-pci rt2800-usb \
+ rt2x00-lib rt2x00-pci rt2x00-usb rt2800-lib rt2400-pci rt2500-pci \
+ rt2500-usb rt61-pci rt73-usb rt2800-mmio rt2800-pci rt2800-usb rt2800-soc \
rtl8180 rtl8187 zd1211rw mac80211-hwsim carl9170 b43 b43legacy \
ath9k-common ath9k ath9k-htc ath10k ath net-libipw net-ipw2100 net-ipw2200 \
mwl8k net-hermes net-hermes-pci net-hermes-plx net-hermes-pcmcia \
@@ -263,15 +263,6 @@ $(call KernelPackage/rt2x00/Default)
AUTOLOAD:=$(call AutoProbe,rt2x00usb)
endef
-define KernelPackage/rt2x00-soc
-$(call KernelPackage/rt2x00/Default)
- DEPENDS+=@TARGET_ramips_rt305x +kmod-rt2x00-mmio +kmod-rt2x00-lib
- HIDDEN:=1
- TITLE+= (SoC)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko
- AUTOLOAD:=$(call AutoProbe,rt2x00soc)
-endef
-
define KernelPackage/rt2800-lib
$(call KernelPackage/rt2x00/Default)
DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-lib-crc-ccitt +@DRIVER_11N_SUPPORT
@@ -320,9 +311,27 @@ define KernelPackage/rt73-usb
AUTOLOAD:=$(call AutoProbe,rt73usb)
endef
+define KernelPackage/rt2800-mmio
+$(call KernelPackage/rt2x00/Default)
+ TITLE += (RT28xx/RT3xxx MMIO)
+ DEPENDS += +kmod-rt2800-lib +kmod-rt2x00-mmio
+ HIDDEN:=1
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800mmio.ko
+endef
+
+define KernelPackage/rt2800-soc
+$(call KernelPackage/rt2x00/Default)
+ DEPENDS += @TARGET_ramips_rt305x +kmod-rt2800-mmio +kmod-rt2800-lib
+ TITLE += (RT28xx/RT3xxx SoC)
+ FILES := \
+ $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko \
+ $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800soc.ko
+ AUTOLOAD:=$(call AutoProbe,rt2800soc)
+endef
+
define KernelPackage/rt2800-pci
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @(PCI_SUPPORT||TARGET_ramips_rt305x) +PCI_SUPPORT:kmod-rt2x00-pci +kmod-rt2800-lib +kmod-lib-crc-ccitt +TARGET_ramips_rt305x:kmod-rt2x00-soc
+ DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-rt2800-mmio
TITLE+= (RT2860 PCI)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko
AUTOLOAD:=$(call AutoProbe,rt2800pci)
@@ -1365,7 +1374,6 @@ config-$(call config_package,rt2x00-lib) += RT2X00 RT2X00_LIB
config-$(call config_package,rt2x00-pci) += RT2X00_LIB_PCI
config-$(call config_package,rt2x00-mmio) += RT2X00_LIB_MMIO
config-$(call config_package,rt2x00-usb) += RT2X00_LIB_USB
-config-$(call config_package,rt2x00-soc) += RT2X00_LIB_SOC
config-$(CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS) += RT2X00_LIB_DEBUGFS
config-$(CONFIG_PACKAGE_RT2X00_DEBUG) += RT2X00_DEBUG
@@ -1377,6 +1385,7 @@ config-$(call config_package,rt73-usb) += RT73USB
config-$(call config_package,rt2800-lib) += RT2800_LIB
+config-$(call config_package,rt2800-soc) += RT2800SOC
config-$(call config_package,rt2800-pci) += RT2800PCI
config-y += RT2800PCI_RT33XX RT2800PCI_RT35XX RT2800PCI_RT53XX RT2800PCI_RT3290
@@ -1748,13 +1757,14 @@ $(eval $(call KernelPackage,rt2x00-lib))
$(eval $(call KernelPackage,rt2x00-mmio))
$(eval $(call KernelPackage,rt2x00-pci))
$(eval $(call KernelPackage,rt2x00-usb))
-$(eval $(call KernelPackage,rt2x00-soc))
$(eval $(call KernelPackage,rt2800-lib))
$(eval $(call KernelPackage,rt2400-pci))
$(eval $(call KernelPackage,rt2500-pci))
$(eval $(call KernelPackage,rt2500-usb))
$(eval $(call KernelPackage,rt61-pci))
$(eval $(call KernelPackage,rt73-usb))
+$(eval $(call KernelPackage,rt2800-mmio))
+$(eval $(call KernelPackage,rt2800-soc))
$(eval $(call KernelPackage,rt2800-pci))
$(eval $(call KernelPackage,rt2800-usb))
$(eval $(call KernelPackage,rtl8180))
diff --git a/package/kernel/mac80211/patches/001-fix_build.patch b/package/kernel/mac80211/patches/001-fix_build.patch
index c541985cf3f0d2cc2af886fc210f8f68d4c34ede..26b327ac8e5e8426cc8c022f50fac1eaba425eb1 100644
--- a/package/kernel/mac80211/patches/001-fix_build.patch
+++ b/package/kernel/mac80211/patches/001-fix_build.patch
@@ -128,7 +128,7 @@
+ @$(MAKE) Kconfig.versions
@$(MAKE) -f Makefile.real "$@"
- else
+ .PHONY: defconfig-help
--- a/Makefile.real
+++ b/Makefile.real
@@ -54,7 +54,7 @@ defconfig-%::
diff --git a/package/kernel/mac80211/patches/030-rt2x00_options.patch b/package/kernel/mac80211/patches/030-rt2x00_options.patch
index 789a77ab12693ee1f8d3381b8dae2e01d78be6ec..5ee52a240d893432c0d44ee8c06119f472dd93f9 100644
--- a/package/kernel/mac80211/patches/030-rt2x00_options.patch
+++ b/package/kernel/mac80211/patches/030-rt2x00_options.patch
@@ -1,13 +1,20 @@
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -202,25 +202,28 @@ config RT2800USB_UNKNOWN
- endif
+@@ -225,36 +225,37 @@ config RT2800SOC
+
config RT2800_LIB
- tristate
+ tristate "RT2800 USB/PCI support"
depends on m
+ config RT2800_LIB_MMIO
+- tristate
++ tristate "RT2800 MMIO support"
+ depends on m
+ select RT2X00_LIB_MMIO
+ select RT2800_LIB
+
config RT2X00_LIB_MMIO
- tristate
+ tristate "RT2x00 MMIO support"
@@ -16,7 +23,6 @@
config RT2X00_LIB_PCI
- tristate
+ tristate "RT2x00 PCI support"
-+ depends on PCI
depends on m
select RT2X00_LIB
@@ -30,7 +36,12 @@
config RT2X00_LIB_USB
- tristate
+ tristate "RT2x00 USB support"
-+ depends on USB
depends on m
select RT2X00_LIB
+ config RT2X00_LIB
+- tristate
++ tristate "RT2x00 support"
+ depends on m
+ select BACKPORT_AVERAGE
+
diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
index 5e8d421aa565572b120045c07aefa30418db4422..28935717fbedb14573213038884e19a6a961829d 100644
--- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
+++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
@@ -1,6 +1,6 @@
--- a/.local-symbols
+++ b/.local-symbols
-@@ -363,42 +363,6 @@ USB_CDC_PHONET=
+@@ -382,42 +382,6 @@ USB_CDC_PHONET=
USB_IPHETH=
USB_SIERRA_NET=
USB_VL600=
@@ -77,7 +77,7 @@
return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
#else
return bus->chipco.dev;
-@@ -4735,7 +4735,7 @@ static int b43_wireless_core_init(struct
+@@ -4736,7 +4736,7 @@ static int b43_wireless_core_init(struct
}
if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
diff --git a/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch b/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8268bbd489a19b81c63049ff59a99aa7efc9b03f
--- /dev/null
+++ b/package/kernel/mac80211/patches/100-revert_aes_ccm_port.patch
@@ -0,0 +1,347 @@
+--- a/net/mac80211/Kconfig
++++ b/net/mac80211/Kconfig
+@@ -5,7 +5,6 @@ config MAC80211
+ depends on CRYPTO
+ depends on CRYPTO_ARC4
+ depends on CRYPTO_AES
+- depends on CRYPTO_CCM
+ depends on CRC32
+ select BACKPORT_AVERAGE
+ ---help---
+--- a/net/mac80211/aes_ccm.c
++++ b/net/mac80211/aes_ccm.c
+@@ -2,8 +2,6 @@
+ * Copyright 2003-2004, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
+ *
+- * Rewrite: Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.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.
+@@ -19,75 +17,134 @@
+ #include "key.h"
+ #include "aes_ccm.h"
+
+-void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+- u8 *data, size_t data_len, u8 *mic)
++static void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *scratch, u8 *a)
+ {
+- struct scatterlist assoc, pt, ct[2];
+- struct {
+- struct aead_request req;
+- u8 priv[crypto_aead_reqsize(tfm)];
+- } aead_req;
+-
+- memset(&aead_req, 0, sizeof(aead_req));
+-
+- sg_init_one(&pt, data, data_len);
+- sg_init_one(&assoc, &aad[2], be16_to_cpup((__be16 *)aad));
+- sg_init_table(ct, 2);
+- sg_set_buf(&ct[0], data, data_len);
+- sg_set_buf(&ct[1], mic, IEEE80211_CCMP_MIC_LEN);
+-
+- aead_request_set_tfm(&aead_req.req, tfm);
+- aead_request_set_assoc(&aead_req.req, &assoc, assoc.length);
+- aead_request_set_crypt(&aead_req.req, &pt, ct, data_len, b_0);
++ int i;
++ u8 *b_0, *aad, *b, *s_0;
+
+- crypto_aead_encrypt(&aead_req.req);
++ b_0 = scratch + 3 * AES_BLOCK_SIZE;
++ aad = scratch + 4 * AES_BLOCK_SIZE;
++ b = scratch;
++ s_0 = scratch + AES_BLOCK_SIZE;
++
++ crypto_cipher_encrypt_one(tfm, b, b_0);
++
++ /* Extra Authenticate-only data (always two AES blocks) */
++ for (i = 0; i < AES_BLOCK_SIZE; i++)
++ aad[i] ^= b[i];
++ crypto_cipher_encrypt_one(tfm, b, aad);
++
++ aad += AES_BLOCK_SIZE;
++
++ for (i = 0; i < AES_BLOCK_SIZE; i++)
++ aad[i] ^= b[i];
++ crypto_cipher_encrypt_one(tfm, a, aad);
++
++ /* Mask out bits from auth-only-b_0 */
++ b_0[0] &= 0x07;
++
++ /* S_0 is used to encrypt T (= MIC) */
++ b_0[14] = 0;
++ b_0[15] = 0;
++ crypto_cipher_encrypt_one(tfm, s_0, b_0);
+ }
+
+-int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+- u8 *data, size_t data_len, u8 *mic)
++
++void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
++ u8 *data, size_t data_len,
++ u8 *cdata, u8 *mic)
+ {
+- struct scatterlist assoc, pt, ct[2];
+- struct {
+- struct aead_request req;
+- u8 priv[crypto_aead_reqsize(tfm)];
+- } aead_req;
+-
+- memset(&aead_req, 0, sizeof(aead_req));
+-
+- sg_init_one(&pt, data, data_len);
+- sg_init_one(&assoc, &aad[2], be16_to_cpup((__be16 *)aad));
+- sg_init_table(ct, 2);
+- sg_set_buf(&ct[0], data, data_len);
+- sg_set_buf(&ct[1], mic, IEEE80211_CCMP_MIC_LEN);
+-
+- aead_request_set_tfm(&aead_req.req, tfm);
+- aead_request_set_assoc(&aead_req.req, &assoc, assoc.length);
+- aead_request_set_crypt(&aead_req.req, ct, &pt,
+- data_len + IEEE80211_CCMP_MIC_LEN, b_0);
++ int i, j, last_len, num_blocks;
++ u8 *pos, *cpos, *b, *s_0, *e, *b_0;
++
++ b = scratch;
++ s_0 = scratch + AES_BLOCK_SIZE;
++ e = scratch + 2 * AES_BLOCK_SIZE;
++ b_0 = scratch + 3 * AES_BLOCK_SIZE;
++
++ num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
++ last_len = data_len % AES_BLOCK_SIZE;
++ aes_ccm_prepare(tfm, scratch, b);
++
++ /* Process payload blocks */
++ pos = data;
++ cpos = cdata;
++ for (j = 1; j <= num_blocks; j++) {
++ int blen = (j == num_blocks && last_len) ?
++ last_len : AES_BLOCK_SIZE;
++
++ /* Authentication followed by encryption */
++ for (i = 0; i < blen; i++)
++ b[i] ^= pos[i];
++ crypto_cipher_encrypt_one(tfm, b, b);
++
++ b_0[14] = (j >> 8) & 0xff;
++ b_0[15] = j & 0xff;
++ crypto_cipher_encrypt_one(tfm, e, b_0);
++ for (i = 0; i < blen; i++)
++ *cpos++ = *pos++ ^ e[i];
++ }
+
+- return crypto_aead_decrypt(&aead_req.req);
++ for (i = 0; i < IEEE80211_CCMP_MIC_LEN; i++)
++ mic[i] = b[i] ^ s_0[i];
+ }
+
+-struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[])
++
++int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
++ u8 *cdata, size_t data_len, u8 *mic, u8 *data)
+ {
+- struct crypto_aead *tfm;
+- int err;
++ int i, j, last_len, num_blocks;
++ u8 *pos, *cpos, *b, *s_0, *a, *b_0;
+
+- tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC);
+- if (IS_ERR(tfm))
+- return tfm;
+-
+- err = crypto_aead_setkey(tfm, key, WLAN_KEY_LEN_CCMP);
+- if (!err)
+- err = crypto_aead_setauthsize(tfm, IEEE80211_CCMP_MIC_LEN);
+- if (!err)
+- return tfm;
++ b = scratch;
++ s_0 = scratch + AES_BLOCK_SIZE;
++ a = scratch + 2 * AES_BLOCK_SIZE;
++ b_0 = scratch + 3 * AES_BLOCK_SIZE;
++
++ num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
++ last_len = data_len % AES_BLOCK_SIZE;
++ aes_ccm_prepare(tfm, scratch, a);
++
++ /* Process payload blocks */
++ cpos = cdata;
++ pos = data;
++ for (j = 1; j <= num_blocks; j++) {
++ int blen = (j == num_blocks && last_len) ?
++ last_len : AES_BLOCK_SIZE;
++
++ /* Decryption followed by authentication */
++ b_0[14] = (j >> 8) & 0xff;
++ b_0[15] = j & 0xff;
++ crypto_cipher_encrypt_one(tfm, b, b_0);
++ for (i = 0; i < blen; i++) {
++ *pos = *cpos++ ^ b[i];
++ a[i] ^= *pos++;
++ }
++ crypto_cipher_encrypt_one(tfm, a, a);
++ }
++
++ for (i = 0; i < IEEE80211_CCMP_MIC_LEN; i++) {
++ if ((mic[i] ^ s_0[i]) != a[i])
++ return -1;
++ }
+
+- crypto_free_aead(tfm);
+- return ERR_PTR(err);
++ return 0;
+ }
+
+-void ieee80211_aes_key_free(struct crypto_aead *tfm)
++
++struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[])
++{
++ struct crypto_cipher *tfm;
++
++ tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
++ if (!IS_ERR(tfm))
++ crypto_cipher_setkey(tfm, key, WLAN_KEY_LEN_CCMP);
++
++ return tfm;
++}
++
++
++void ieee80211_aes_key_free(struct crypto_cipher *tfm)
+ {
+- crypto_free_aead(tfm);
++ crypto_free_cipher(tfm);
+ }
+--- a/net/mac80211/aes_ccm.h
++++ b/net/mac80211/aes_ccm.h
+@@ -12,11 +12,13 @@
+
+ #include <linux/crypto.h>
+
+-struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[]);
+-void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+- u8 *data, size_t data_len, u8 *mic);
+-int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+- u8 *data, size_t data_len, u8 *mic);
+-void ieee80211_aes_key_free(struct crypto_aead *tfm);
++struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]);
++void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
++ u8 *data, size_t data_len,
++ u8 *cdata, u8 *mic);
++int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
++ u8 *cdata, size_t data_len,
++ u8 *mic, u8 *data);
++void ieee80211_aes_key_free(struct crypto_cipher *tfm);
+
+ #endif /* AES_CCM_H */
+--- a/net/mac80211/key.h
++++ b/net/mac80211/key.h
+@@ -83,7 +83,7 @@ struct ieee80211_key {
+ * Management frames.
+ */
+ u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
+- struct crypto_aead *tfm;
++ struct crypto_cipher *tfm;
+ u32 replays; /* dot11RSNAStatsCCMPReplays */
+ } ccmp;
+ struct {
+--- a/net/mac80211/wpa.c
++++ b/net/mac80211/wpa.c
+@@ -301,16 +301,22 @@ ieee80211_crypto_tkip_decrypt(struct iee
+ }
+
+
+-static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *b_0, u8 *aad,
++static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *scratch,
+ int encrypted)
+ {
+ __le16 mask_fc;
+ int a4_included, mgmt;
+ u8 qos_tid;
+- u16 len_a;
++ u8 *b_0, *aad;
++ u16 data_len, len_a;
+ unsigned int hdrlen;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+
++ memset(scratch, 0, 6 * AES_BLOCK_SIZE);
++
++ b_0 = scratch + 3 * AES_BLOCK_SIZE;
++ aad = scratch + 4 * AES_BLOCK_SIZE;
++
+ /*
+ * Mask FC: zero subtype b4 b5 b6 (if not mgmt)
+ * Retry, PwrMgt, MoreData; set Protected
+@@ -332,21 +338,20 @@ static void ccmp_special_blocks(struct s
+ else
+ qos_tid = 0;
+
+- /* In CCM, the initial vectors (IV) used for CTR mode encryption and CBC
+- * mode authentication are not allowed to collide, yet both are derived
+- * from this vector b_0. We only set L := 1 here to indicate that the
+- * data size can be represented in (L+1) bytes. The CCM layer will take
+- * care of storing the data length in the top (L+1) bytes and setting
+- * and clearing the other bits as is required to derive the two IVs.
+- */
+- b_0[0] = 0x1;
++ data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN;
++ if (encrypted)
++ data_len -= IEEE80211_CCMP_MIC_LEN;
+
++ /* First block, b_0 */
++ b_0[0] = 0x59; /* flags: Adata: 1, M: 011, L: 001 */
+ /* Nonce: Nonce Flags | A2 | PN
+ * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
+ */
+ b_0[1] = qos_tid | (mgmt << 4);
+ memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
+ memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
++ /* l(m) */
++ put_unaligned_be16(data_len, &b_0[14]);
+
+ /* AAD (extra authenticate-only data) / masked 802.11 header
+ * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
+@@ -402,8 +407,7 @@ static int ccmp_encrypt_skb(struct ieee8
+ u8 *pos;
+ u8 pn[6];
+ u64 pn64;
+- u8 aad[2 * AES_BLOCK_SIZE];
+- u8 b_0[AES_BLOCK_SIZE];
++ u8 scratch[6 * AES_BLOCK_SIZE];
+
+ if (info->control.hw_key &&
+ !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
+@@ -456,9 +460,9 @@ static int ccmp_encrypt_skb(struct ieee8
+ return 0;
+
+ pos += IEEE80211_CCMP_HDR_LEN;
+- ccmp_special_blocks(skb, pn, b_0, aad, 0);
+- ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
+- skb_put(skb, IEEE80211_CCMP_MIC_LEN));
++ ccmp_special_blocks(skb, pn, scratch, 0);
++ ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, scratch, pos, len,
++ pos, skb_put(skb, IEEE80211_CCMP_MIC_LEN));
+
+ return 0;
+ }
+@@ -521,16 +525,16 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+ }
+
+ if (!(status->flag & RX_FLAG_DECRYPTED)) {
+- u8 aad[2 * AES_BLOCK_SIZE];
+- u8 b_0[AES_BLOCK_SIZE];
++ u8 scratch[6 * AES_BLOCK_SIZE];
+ /* hardware didn't decrypt/verify MIC */
+- ccmp_special_blocks(skb, pn, b_0, aad, 1);
++ ccmp_special_blocks(skb, pn, scratch, 1);
+
+ if (ieee80211_aes_ccm_decrypt(
+- key->u.ccmp.tfm, b_0, aad,
++ key->u.ccmp.tfm, scratch,
+ skb->data + hdrlen + IEEE80211_CCMP_HDR_LEN,
+ data_len,
+- skb->data + skb->len - IEEE80211_CCMP_MIC_LEN))
++ skb->data + skb->len - IEEE80211_CCMP_MIC_LEN,
++ skb->data + hdrlen + IEEE80211_CCMP_HDR_LEN))
+ return RX_DROP_UNUSABLE;
+ }
+
diff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
index 92c19099812f97d77bb25b827d1e96140d8d3ad8..3a0078608d0fb7f9c2a5070a050ffb8813950bab 100644
--- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
+++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -300,7 +300,7 @@ void ieee80211_restart_hw(struct ieee802
+@@ -291,7 +291,7 @@ void ieee80211_restart_hw(struct ieee802
}
EXPORT_SYMBOL(ieee80211_restart_hw);
@@ -9,7 +9,7 @@
static int ieee80211_ifa_changed(struct notifier_block *nb,
unsigned long data, void *arg)
{
-@@ -359,7 +359,7 @@ static int ieee80211_ifa_changed(struct
+@@ -350,7 +350,7 @@ static int ieee80211_ifa_changed(struct
}
#endif
@@ -18,7 +18,7 @@
static int ieee80211_ifa6_changed(struct notifier_block *nb,
unsigned long data, void *arg)
{
-@@ -990,14 +990,14 @@ int ieee80211_register_hw(struct ieee802
+@@ -978,14 +978,14 @@ int ieee80211_register_hw(struct ieee802
goto fail_pm_qos;
}
@@ -35,7 +35,7 @@
local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
result = register_inet6addr_notifier(&local->ifa6_notifier);
if (result)
-@@ -1006,13 +1006,13 @@ int ieee80211_register_hw(struct ieee802
+@@ -994,13 +994,13 @@ int ieee80211_register_hw(struct ieee802
return 0;
@@ -52,7 +52,7 @@
fail_ifa:
pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY,
&local->network_latency_notifier);
-@@ -1045,10 +1045,10 @@ void ieee80211_unregister_hw(struct ieee
+@@ -1033,10 +1033,10 @@ void ieee80211_unregister_hw(struct ieee
pm_qos_remove_notifier(PM_QOS_NETWORK_LATENCY,
&local->network_latency_notifier);
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
index 81f03c532efe2c745e5d188cc6fcae7e049bc7f3..71a2d6bec190ecab16eebf41678cac7a660defdf 100644
--- a/package/kernel/mac80211/patches/300-pending_work.patch
+++ b/package/kernel/mac80211/patches/300-pending_work.patch
@@ -1,1550 +1,597 @@
---- a/net/mac80211/agg-rx.c
-+++ b/net/mac80211/agg-rx.c
-@@ -204,6 +204,8 @@ static void ieee80211_send_addba_resp(st
- memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
- else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
- memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
-+ else if (sdata->vif.type == NL80211_IFTYPE_WDS)
-+ memcpy(mgmt->bssid, da, ETH_ALEN);
-
- mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
- IEEE80211_STYPE_ACTION);
---- a/net/mac80211/agg-tx.c
-+++ b/net/mac80211/agg-tx.c
-@@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
- memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
- if (sdata->vif.type == NL80211_IFTYPE_AP ||
- sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
-- sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
-+ sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
-+ sdata->vif.type == NL80211_IFTYPE_WDS)
- memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
- else if (sdata->vif.type == NL80211_IFTYPE_STATION)
- memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
-@@ -527,6 +528,7 @@ int ieee80211_start_tx_ba_session(struct
- sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
- sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
- sdata->vif.type != NL80211_IFTYPE_AP &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS &&
- sdata->vif.type != NL80211_IFTYPE_ADHOC)
- return -EINVAL;
-
---- a/net/mac80211/debugfs_sta.c
-+++ b/net/mac80211/debugfs_sta.c
-@@ -66,11 +66,11 @@ static ssize_t sta_flags_read(struct fil
- test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
-
- int res = scnprintf(buf, sizeof(buf),
-- "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-+ "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
- TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
- TEST(PS_DRIVER), TEST(AUTHORIZED),
- TEST(SHORT_PREAMBLE),
-- TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
-+ TEST(WME), TEST(CLEAR_PS_FILT),
- TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
- TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
- TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
-@@ -455,6 +455,15 @@ void ieee80211_sta_debugfs_add(struct st
- DEBUGFS_ADD_COUNTER(tx_retry_count, tx_retry_count);
- DEBUGFS_ADD_COUNTER(wep_weak_iv_count, wep_weak_iv_count);
-
-+ if (sizeof(sta->driver_buffered_tids) == sizeof(u32))
-+ debugfs_create_x32("driver_buffered_tids", 0400,
-+ sta->debugfs.dir,
-+ (u32 *)&sta->driver_buffered_tids);
-+ else
-+ debugfs_create_x64("driver_buffered_tids", 0400,
-+ sta->debugfs.dir,
-+ (u64 *)&sta->driver_buffered_tids);
-+
- drv_sta_add_debugfs(local, sdata, &sta->sta, sta->debugfs.dir);
- }
-
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -274,6 +274,12 @@ static int ieee80211_check_concurrent_if
- if (iftype == NL80211_IFTYPE_ADHOC &&
- nsdata->vif.type == NL80211_IFTYPE_ADHOC)
- return -EBUSY;
-+ /*
-+ * will not add another interface while any channel
-+ * switch is active.
-+ */
-+ if (nsdata->vif.csa_active)
-+ return -EBUSY;
-
- /*
- * The remaining checks are only performed for interfaces
-@@ -463,7 +469,6 @@ int ieee80211_do_open(struct wireless_de
- struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
- struct net_device *dev = wdev->netdev;
- struct ieee80211_local *local = sdata->local;
-- struct sta_info *sta;
- u32 changed = 0;
- int res;
- u32 hw_reconf_flags = 0;
-@@ -629,30 +634,8 @@ int ieee80211_do_open(struct wireless_de
+--- a/drivers/net/wireless/ath/ath10k/mac.c
++++ b/drivers/net/wireless/ath/ath10k/mac.c
+@@ -1351,12 +1351,12 @@ static int ath10k_update_channel_list(st
+ ch->allow_vht = true;
- set_bit(SDATA_STATE_RUNNING, &sdata->state);
-
-- if (sdata->vif.type == NL80211_IFTYPE_WDS) {
-- /* Create STA entry for the WDS peer */
-- sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
-- GFP_KERNEL);
-- if (!sta) {
-- res = -ENOMEM;
-- goto err_del_interface;
-- }
--
-- sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
-- sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
-- sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
--
-- res = sta_info_insert(sta);
-- if (res) {
-- /* STA has been freed */
-- goto err_del_interface;
-- }
--
-- rate_control_rate_init(sta);
-- netif_carrier_on(dev);
-- } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
-+ if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
- rcu_assign_pointer(local->p2p_sdata, sdata);
-- }
+ ch->allow_ibss =
+- !(channel->flags & IEEE80211_CHAN_NO_IBSS);
++ !(channel->flags & IEEE80211_CHAN_NO_IR);
- /*
- * set_multicast_list will be invoked by the networking core
-@@ -809,6 +792,8 @@ static void ieee80211_do_stop(struct iee
- cancel_work_sync(&local->dynamic_ps_enable_work);
+ ch->ht40plus =
+ !(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
- cancel_work_sync(&sdata->recalc_smps);
-+ sdata->vif.csa_active = false;
-+ cancel_work_sync(&sdata->csa_finalize_work);
+- passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
++ passive = channel->flags & IEEE80211_CHAN_NO_IR;
+ ch->passive = passive;
- cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
+ ch->freq = channel->center_freq;
+--- a/drivers/net/wireless/ath/ath9k/Kconfig
++++ b/drivers/net/wireless/ath/ath9k/Kconfig
+@@ -90,7 +90,7 @@ config ATH9K_DFS_CERTIFIED
-@@ -1116,6 +1101,74 @@ static void ieee80211_if_setup(struct ne
- dev->destructor = free_netdev;
+ config ATH9K_TX99
+ bool "Atheros ath9k TX99 testing support"
+- depends on CFG80211_CERTIFICATION_ONUS
++ depends on ATH9K_DEBUGFS && CFG80211_CERTIFICATION_ONUS
+ default n
+ ---help---
+ Say N. This should only be enabled on systems undergoing
+@@ -108,6 +108,14 @@ config ATH9K_TX99
+ be evaluated to meet the RF exposure limits set forth in the
+ governmental SAR regulations.
+
++config ATH9K_WOW
++ bool "Wake on Wireless LAN support (EXPERIMENTAL)"
++ depends on ATH9K && PM
++ default n
++ ---help---
++ This option enables Wake on Wireless LAN support for certain cards.
++ Currently, AR9462 is supported.
++
+ config ATH9K_LEGACY_RATE_CONTROL
+ bool "Atheros ath9k rate control"
+ depends on ATH9K
+--- a/drivers/net/wireless/ath/ath9k/Makefile
++++ b/drivers/net/wireless/ath/ath9k/Makefile
+@@ -13,9 +13,9 @@ ath9k-$(CPTCFG_ATH9K_PCI) += pci.o
+ ath9k-$(CPTCFG_ATH9K_AHB) += ahb.o
+ ath9k-$(CPTCFG_ATH9K_DEBUGFS) += debug.o
+ ath9k-$(CPTCFG_ATH9K_DFS_DEBUGFS) += dfs_debug.o
+-ath9k-$(CPTCFG_ATH9K_DFS_CERTIFIED) += \
+- dfs.o
+-ath9k-$(CONFIG_PM_SLEEP) += wow.o
++ath9k-$(CPTCFG_ATH9K_DFS_CERTIFIED) += dfs.o
++ath9k-$(CPTCFG_ATH9K_TX99) += tx99.o
++ath9k-$(CPTCFG_ATH9K_WOW) += wow.o
+
+ obj-$(CPTCFG_ATH9K) += ath9k.o
+
+@@ -41,6 +41,8 @@ ath9k_hw-y:= \
+ ar9003_eeprom.o \
+ ar9003_paprd.o
+
++ath9k_hw-$(CPTCFG_ATH9K_WOW) += ar9003_wow.o
++
+ ath9k_hw-$(CPTCFG_ATH9K_BTCOEX_SUPPORT) += btcoex.o \
+ ar9003_mci.o
+ obj-$(CPTCFG_ATH9K_HW) += ath9k_hw.o
+--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+@@ -581,6 +581,13 @@ static void ar9003_tx_gain_table_mode6(s
+ ar9580_1p0_type6_tx_gain_table);
}
-+static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
-+ struct sk_buff *skb)
++static void ar9003_tx_gain_table_mode7(struct ath_hw *ah)
+{
-+ struct ieee80211_local *local = sdata->local;
-+ struct ieee80211_rx_status *rx_status;
-+ struct ieee802_11_elems elems;
-+ struct ieee80211_mgmt *mgmt;
-+ struct sta_info *sta;
-+ size_t baselen;
-+ u32 rates = 0;
-+ u16 stype;
-+ bool new = false;
-+ enum ieee80211_band band;
-+ struct ieee80211_supported_band *sband;
-+
-+ rx_status = IEEE80211_SKB_RXCB(skb);
-+ band = rx_status->band;
-+ sband = local->hw.wiphy->bands[band];
-+ mgmt = (struct ieee80211_mgmt *) skb->data;
-+ stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
-+
-+ if (stype != IEEE80211_STYPE_BEACON)
-+ return;
-+
-+ baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
-+ if (baselen > skb->len)
-+ return;
-+
-+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
-+ skb->len - baselen, false, &elems);
-+
-+ rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
-+
-+ rcu_read_lock();
-+
-+ sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
-+
-+ if (!sta) {
-+ rcu_read_unlock();
-+ sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
-+ GFP_KERNEL);
-+ if (!sta)
-+ return;
-+
-+ new = true;
-+ }
-+
-+ sta->last_rx = jiffies;
-+ sta->sta.supp_rates[band] = rates;
-+
-+ if (elems.ht_cap_elem)
-+ ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
-+ elems.ht_cap_elem, sta);
-+
-+ if (elems.wmm_param)
-+ set_sta_flag(sta, WLAN_STA_WME);
-+
-+ if (new) {
-+ sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
-+ sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
-+ sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
-+ rate_control_rate_init(sta);
-+ sta_info_insert_rcu(sta);
-+ }
-+
-+ rcu_read_unlock();
++ if (AR_SREV_9340(ah))
++ INIT_INI_ARRAY(&ah->iniModesTxGain,
++ ar9340_cus227_tx_gain_table_1p0);
+}
+
- static void ieee80211_iface_work(struct work_struct *work)
- {
- struct ieee80211_sub_if_data *sdata =
-@@ -1220,6 +1273,9 @@ static void ieee80211_iface_work(struct
- break;
- ieee80211_mesh_rx_queued_mgmt(sdata, skb);
- break;
-+ case NL80211_IFTYPE_WDS:
-+ ieee80211_wds_rx_queued_mgmt(sdata, skb);
-+ break;
- default:
- WARN(1, "frame for unexpected interface type");
- break;
-@@ -1282,6 +1338,7 @@ static void ieee80211_setup_sdata(struct
- skb_queue_head_init(&sdata->skb_queue);
- INIT_WORK(&sdata->work, ieee80211_iface_work);
- INIT_WORK(&sdata->recalc_smps, ieee80211_recalc_smps_work);
-+ INIT_WORK(&sdata->csa_finalize_work, ieee80211_csa_finalize_work);
-
- switch (type) {
- case NL80211_IFTYPE_P2P_GO:
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -365,6 +365,14 @@ minstrel_ht_update_stats(struct minstrel
- }
- }
+ typedef void (*ath_txgain_tab)(struct ath_hw *ah);
-+#ifdef CPTCFG_MAC80211_DEBUGFS
-+ /* use fixed index if set */
-+ if (mp->fixed_rate_idx != -1) {
-+ mi->max_tp_rate = mp->fixed_rate_idx;
-+ mi->max_tp_rate2 = mp->fixed_rate_idx;
-+ mi->max_prob_rate = mp->fixed_rate_idx;
-+ }
-+#endif
-
- mi->stats_update = jiffies;
- }
-@@ -774,6 +782,11 @@ minstrel_ht_get_rate(void *priv, struct
- info->flags |= mi->tx_flags;
- minstrel_ht_check_cck_shortpreamble(mp, mi, txrc->short_preamble);
-
-+#ifdef CPTCFG_MAC80211_DEBUGFS
-+ if (mp->fixed_rate_idx != -1)
-+ return;
-+#endif
-+
- /* Don't use EAPOL frames for sampling on non-mrr hw */
- if (mp->hw->max_rates == 1 &&
- txrc->skb->protocol == cpu_to_be16(ETH_P_PAE))
-@@ -781,16 +794,6 @@ minstrel_ht_get_rate(void *priv, struct
- else
- sample_idx = minstrel_get_sample_rate(mp, mi);
-
--#ifdef CPTCFG_MAC80211_DEBUGFS
-- /* use fixed index if set */
-- if (mp->fixed_rate_idx != -1) {
-- mi->max_tp_rate = mp->fixed_rate_idx;
-- mi->max_tp_rate2 = mp->fixed_rate_idx;
-- mi->max_prob_rate = mp->fixed_rate_idx;
-- sample_idx = -1;
-- }
--#endif
--
- mi->total_packets++;
+ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
+@@ -593,6 +600,7 @@ static void ar9003_tx_gain_table_apply(s
+ ar9003_tx_gain_table_mode4,
+ ar9003_tx_gain_table_mode5,
+ ar9003_tx_gain_table_mode6,
++ ar9003_tx_gain_table_mode7,
+ };
+ int idx = ar9003_hw_get_tx_gain_idx(ah);
- /* wraparound */
-@@ -804,10 +807,18 @@ minstrel_ht_get_rate(void *priv, struct
-
- sample_group = &minstrel_mcs_groups[sample_idx / MCS_GROUP_RATES];
- info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
-+ rate->count = 1;
+@@ -750,6 +758,9 @@ static void ar9003_hw_init_mode_gain_reg
+ static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
+ bool power_off)
+ {
++ unsigned int i;
++ struct ar5416IniArray *array;
+
-+ if (sample_idx / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {
-+ int idx = sample_idx % ARRAY_SIZE(mp->cck_rates);
-+ rate->idx = mp->cck_rates[idx];
-+ rate->flags = 0;
-+ return;
-+ }
+ /*
+ * Increase L1 Entry Latency. Some WB222 boards don't have
+ * this change in eeprom/OTP.
+@@ -775,18 +786,13 @@ static void ar9003_hw_configpcipowersave
+ * Configire PCIE after Ini init. SERDES values now come from ini file
+ * This enables PCIe low power mode.
+ */
+- if (ah->config.pcieSerDesWrite) {
+- unsigned int i;
+- struct ar5416IniArray *array;
+-
+- array = power_off ? &ah->iniPcieSerdes :
+- &ah->iniPcieSerdesLowPower;
+-
+- for (i = 0; i < array->ia_rows; i++) {
+- REG_WRITE(ah,
+- INI_RA(array, i, 0),
+- INI_RA(array, i, 1));
+- }
++ array = power_off ? &ah->iniPcieSerdes :
++ &ah->iniPcieSerdesLowPower;
+
- rate->idx = sample_idx % MCS_GROUP_RATES +
- (sample_group->streams - 1) * MCS_GROUP_RATES;
- rate->flags = IEEE80211_TX_RC_MCS | sample_group->flags;
-- rate->count = 1;
++ for (i = 0; i < array->ia_rows; i++) {
++ REG_WRITE(ah,
++ INI_RA(array, i, 0),
++ INI_RA(array, i, 1));
+ }
}
- static void
-@@ -820,6 +831,9 @@ minstrel_ht_update_cck(struct minstrel_p
- if (sband->band != IEEE80211_BAND_2GHZ)
- return;
-
-+ if (!(mp->hw->flags & IEEE80211_HW_SUPPORTS_HT_CCK_RATES))
-+ return;
-+
- mi->cck_supported = 0;
- mi->cck_supported_short = 0;
- for (i = 0; i < 4; i++) {
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -936,8 +936,14 @@ ieee80211_rx_h_check(struct ieee80211_rx
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
- struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);
+--- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
+@@ -1447,4 +1447,106 @@ static const u32 ar9340_1p0_soc_preamble
+ {0x00007038, 0x000004c2},
+ };
-- /* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */
-- if (rx->sta && !is_multicast_ether_addr(hdr->addr1)) {
-+ /*
-+ * Drop duplicate 802.11 retransmissions
-+ * (IEEE 802.11-2012: 9.3.2.10 "Duplicate detection and recovery")
-+ */
-+ if (rx->skb->len >= 24 && rx->sta &&
-+ !ieee80211_is_ctl(hdr->frame_control) &&
-+ !ieee80211_is_qos_nullfunc(hdr->frame_control) &&
-+ !is_multicast_ether_addr(hdr->addr1)) {
- if (unlikely(ieee80211_has_retry(hdr->frame_control) &&
- rx->sta->last_seq_ctrl[rx->seqno_idx] ==
- hdr->seq_ctrl)) {
-@@ -2369,6 +2375,7 @@ ieee80211_rx_h_action(struct ieee80211_r
- sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
- sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
- sdata->vif.type != NL80211_IFTYPE_AP &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS &&
- sdata->vif.type != NL80211_IFTYPE_ADHOC)
- break;
-
-@@ -2720,14 +2727,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
-
- if (!ieee80211_vif_is_mesh(&sdata->vif) &&
- sdata->vif.type != NL80211_IFTYPE_ADHOC &&
-- sdata->vif.type != NL80211_IFTYPE_STATION)
-+ sdata->vif.type != NL80211_IFTYPE_STATION &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS)
- return RX_DROP_MONITOR;
-
- switch (stype) {
- case cpu_to_le16(IEEE80211_STYPE_AUTH):
- case cpu_to_le16(IEEE80211_STYPE_BEACON):
- case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
-- /* process for all: mesh, mlme, ibss */
-+ /* process for all: mesh, mlme, ibss, wds */
- break;
- case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
- case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-@@ -3008,6 +3016,9 @@ static int prepare_for_handlers(struct i
- case NL80211_IFTYPE_ADHOC:
- if (!bssid)
- return 0;
-+ if (ether_addr_equal(sdata->vif.addr, hdr->addr2) ||
-+ ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2))
-+ return 0;
- if (ieee80211_is_beacon(hdr->frame_control)) {
- return 1;
- } else if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid)) {
-@@ -3059,10 +3070,16 @@ static int prepare_for_handlers(struct i
- }
- break;
- case NL80211_IFTYPE_WDS:
-- if (bssid || !ieee80211_is_data(hdr->frame_control))
-- return 0;
- if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
- return 0;
-+
-+ if (ieee80211_is_data(hdr->frame_control) ||
-+ ieee80211_is_action(hdr->frame_control)) {
-+ if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
-+ return 0;
-+ } else if (!ieee80211_is_beacon(hdr->frame_control))
-+ return 0;
++static const u32 ar9340_cus227_tx_gain_table_1p0[][5] = {
++ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
++ {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++ {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, 0x11000400, 0x11000400},
++ {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
++ {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
++ {0x0000a520, 0x2c022220, 0x2c022220, 0x1b000603, 0x1b000603},
++ {0x0000a524, 0x30022222, 0x30022222, 0x1f000a02, 0x1f000a02},
++ {0x0000a528, 0x35022225, 0x35022225, 0x23000a04, 0x23000a04},
++ {0x0000a52c, 0x3b02222a, 0x3b02222a, 0x26000a20, 0x26000a20},
++ {0x0000a530, 0x3f02222c, 0x3f02222c, 0x2a000e20, 0x2a000e20},
++ {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
++ {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
++ {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
++ {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
++ {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
++ {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
++ {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
++ {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
++ {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
++ {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
++ {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
++ {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
++ {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++ {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++ {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++ {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++ {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++ {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++ {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
++ {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, 0x11800400, 0x11800400},
++ {0x0000a598, 0x21820220, 0x21820220, 0x15800402, 0x15800402},
++ {0x0000a59c, 0x27820223, 0x27820223, 0x19800404, 0x19800404},
++ {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
++ {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
++ {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
++ {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
++ {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
++ {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
++ {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
++ {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
++ {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
++ {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b801861, 0x3b801861},
++ {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e801a81, 0x3e801a81},
++ {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42801a83, 0x42801a83},
++ {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x44801c84, 0x44801c84},
++ {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x48801ce3, 0x48801ce3},
++ {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c801ce5, 0x4c801ce5},
++ {0x0000a5dc, 0x7086308c, 0x7086308c, 0x50801ce9, 0x50801ce9},
++ {0x0000a5e0, 0x738a308a, 0x738a308a, 0x54801ceb, 0x54801ceb},
++ {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++ {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++ {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++ {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++ {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++ {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++ {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
++ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++ {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++ {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++ {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++ {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
++ {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
++ {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
++ {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
++ {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
++ {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
++ {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
++ {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++ {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++ {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++ {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
++ {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
++ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
++ {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
++ {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
++ {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
++ {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
++ {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
++ {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
++ {0x0000a3a4, 0x00000011, 0x00000011, 0x00000011, 0x00000011},
++ {0x0000a3a8, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c, 0x3c3c3c3c},
++ {0x0000a3ac, 0x30303030, 0x30303030, 0x30303030, 0x30303030},
++};
+
- break;
- case NL80211_IFTYPE_P2P_DEVICE:
- if (!ieee80211_is_public_action(hdr, skb->len) &&
---- a/net/mac80211/sta_info.h
-+++ b/net/mac80211/sta_info.h
-@@ -32,7 +32,6 @@
- * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
- * frames.
- * @WLAN_STA_WME: Station is a QoS-STA.
-- * @WLAN_STA_WDS: Station is one of our WDS peers.
- * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
- * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
- * frame to this station is transmitted.
-@@ -66,7 +65,6 @@ enum ieee80211_sta_info_flags {
- WLAN_STA_AUTHORIZED,
- WLAN_STA_SHORT_PREAMBLE,
- WLAN_STA_WME,
-- WLAN_STA_WDS,
- WLAN_STA_CLEAR_PS_FILT,
- WLAN_STA_MFP,
- WLAN_STA_BLOCK_BA,
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -135,6 +135,9 @@ static struct ath_frame_info *get_frame_
+ #endif /* INITVALS_9340_H */
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -459,6 +459,7 @@ void ath_check_ani(struct ath_softc *sc)
+ int ath_update_survey_stats(struct ath_softc *sc);
+ void ath_update_survey_nf(struct ath_softc *sc, int channel);
+ void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
++void ath_ps_full_sleep(unsigned long data);
- static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno)
- {
-+ if (!tid->an->sta)
-+ return;
-+
- ieee80211_send_bar(tid->an->vif, tid->an->sta->addr, tid->tidno,
- seqno << IEEE80211_SEQ_SEQ_SHIFT);
- }
-@@ -146,6 +149,93 @@ static void ath_set_rates(struct ieee802
- ARRAY_SIZE(bf->rates));
+ /**********/
+ /* BTCOEX */
+@@ -570,6 +571,34 @@ static inline void ath_fill_led_pin(stru
}
+ #endif
-+static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,
-+ struct sk_buff *skb)
-+{
-+ int q;
-+
-+ q = skb_get_queue_mapping(skb);
-+ if (txq == sc->tx.uapsdq)
-+ txq = sc->tx.txq_map[q];
-+
-+ if (txq != sc->tx.txq_map[q])
-+ return;
-+
-+ if (WARN_ON(--txq->pending_frames < 0))
-+ txq->pending_frames = 0;
-+
-+ if (txq->stopped &&
-+ txq->pending_frames < sc->tx.txq_max_pending[q]) {
-+ ieee80211_wake_queue(sc->hw, q);
-+ txq->stopped = false;
-+ }
-+}
-+
-+static struct ath_atx_tid *
-+ath_get_skb_tid(struct ath_softc *sc, struct ath_node *an, struct sk_buff *skb)
++/************************/
++/* Wake on Wireless LAN */
++/************************/
++
++#ifdef CONFIG_ATH9K_WOW
++void ath9k_init_wow(struct ieee80211_hw *hw);
++int ath9k_suspend(struct ieee80211_hw *hw,
++ struct cfg80211_wowlan *wowlan);
++int ath9k_resume(struct ieee80211_hw *hw);
++void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled);
++#else
++static inline void ath9k_init_wow(struct ieee80211_hw *hw)
+{
-+ struct ieee80211_hdr *hdr;
-+ u8 tidno = 0;
-+
-+ hdr = (struct ieee80211_hdr *) skb->data;
-+ if (ieee80211_is_data_qos(hdr->frame_control))
-+ tidno = ieee80211_get_qos_ctl(hdr)[0];
-+
-+ tidno &= IEEE80211_QOS_CTL_TID_MASK;
-+ return ATH_AN_2_TID(an, tidno);
+}
-+
-+static bool ath_tid_has_buffered(struct ath_atx_tid *tid)
++static inline int ath9k_suspend(struct ieee80211_hw *hw,
++ struct cfg80211_wowlan *wowlan)
+{
-+ return !skb_queue_empty(&tid->buf_q) || !skb_queue_empty(&tid->retry_q);
++ return 0;
+}
-+
-+static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid)
++static inline int ath9k_resume(struct ieee80211_hw *hw)
+{
-+ struct sk_buff *skb;
-+
-+ skb = __skb_dequeue(&tid->retry_q);
-+ if (!skb)
-+ skb = __skb_dequeue(&tid->buf_q);
-+
-+ return skb;
++ return 0;
+}
-+
-+/*
-+ * ath_tx_tid_change_state:
-+ * - clears a-mpdu flag of previous session
-+ * - force sequence number allocation to fix next BlockAck Window
-+ */
-+static void
-+ath_tx_tid_change_state(struct ath_softc *sc, struct ath_atx_tid *tid)
++static inline void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
+{
-+ struct ath_txq *txq = tid->ac->txq;
-+ struct ieee80211_tx_info *tx_info;
-+ struct sk_buff *skb, *tskb;
-+ struct ath_buf *bf;
-+ struct ath_frame_info *fi;
-+
-+ skb_queue_walk_safe(&tid->buf_q, skb, tskb) {
-+ fi = get_frame_info(skb);
-+ bf = fi->bf;
-+
-+ tx_info = IEEE80211_SKB_CB(skb);
-+ tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU;
-+
-+ if (bf)
-+ continue;
-+
-+ bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-+ if (!bf) {
-+ __skb_unlink(skb, &tid->buf_q);
-+ ath_txq_skb_done(sc, txq, skb);
-+ ieee80211_free_txskb(sc->hw, skb);
-+ continue;
-+ }
-+ }
-+
+}
++#endif /* CONFIG_ATH9K_WOW */
+
- static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
- {
- struct ath_txq *txq = tid->ac->txq;
-@@ -160,27 +250,22 @@ static void ath_tx_flush_tid(struct ath_
-
- memset(&ts, 0, sizeof(ts));
-
-- while ((skb = __skb_dequeue(&tid->buf_q))) {
-+ while ((skb = __skb_dequeue(&tid->retry_q))) {
- fi = get_frame_info(skb);
- bf = fi->bf;
--
- if (!bf) {
-- bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-- if (!bf) {
-- ieee80211_free_txskb(sc->hw, skb);
-- continue;
-- }
-+ ath_txq_skb_done(sc, txq, skb);
-+ ieee80211_free_txskb(sc->hw, skb);
-+ continue;
- }
-
-- if (fi->retries) {
-- list_add_tail(&bf->list, &bf_head);
-+ if (fi->baw_tracked) {
- ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
-- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
- sendbar = true;
-- } else {
-- ath_set_rates(tid->an->vif, tid->an->sta, bf);
-- ath_tx_send_normal(sc, txq, NULL, skb);
- }
-+
-+ list_add_tail(&bf->list, &bf_head);
-+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
- }
+ /*******************************/
+ /* Antenna diversity/combining */
+ /*******************************/
+@@ -723,6 +752,7 @@ struct ath_softc {
+ struct work_struct hw_check_work;
+ struct work_struct hw_reset_work;
+ struct completion paprd_complete;
++ wait_queue_head_t tx_wait;
- if (sendbar) {
-@@ -209,13 +294,16 @@ static void ath_tx_update_baw(struct ath
- }
+ unsigned int hw_busy_count;
+ unsigned long sc_flags;
+@@ -759,6 +789,7 @@ struct ath_softc {
+ struct delayed_work tx_complete_work;
+ struct delayed_work hw_pll_work;
+ struct timer_list rx_poll_timer;
++ struct timer_list sleep_timer;
- static void ath_tx_addto_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
-- u16 seqno)
-+ struct ath_buf *bf)
- {
-+ struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
-+ u16 seqno = bf->bf_state.seqno;
- int index, cindex;
-
- index = ATH_BA_INDEX(tid->seq_start, seqno);
- cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
- __set_bit(cindex, tid->tx_buf);
-+ fi->baw_tracked = 1;
-
- if (index >= ((tid->baw_tail - tid->baw_head) &
- (ATH_TID_MAX_BUFS - 1))) {
-@@ -224,12 +312,6 @@ static void ath_tx_addto_baw(struct ath_
+ #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
+ struct ath_btcoex btcoex;
+@@ -783,7 +814,7 @@ struct ath_softc {
+ bool tx99_state;
+ s16 tx99_power;
+
+-#ifdef CONFIG_PM_SLEEP
++#ifdef CONFIG_ATH9K_WOW
+ atomic_t wow_got_bmiss_intr;
+ atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */
+ u32 wow_intr_before_sleep;
+@@ -946,10 +977,25 @@ struct fft_sample_ht20_40 {
+ u8 data[SPECTRAL_HT20_40_NUM_BINS];
+ } __packed;
+
+-int ath9k_tx99_init(struct ath_softc *sc);
+-void ath9k_tx99_deinit(struct ath_softc *sc);
++/********/
++/* TX99 */
++/********/
++
++#ifdef CONFIG_ATH9K_TX99
++void ath9k_tx99_init_debug(struct ath_softc *sc);
+ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
+ struct ath_tx_control *txctl);
++#else
++static inline void ath9k_tx99_init_debug(struct ath_softc *sc)
++{
++}
++static inline int ath9k_tx99_send(struct ath_softc *sc,
++ struct sk_buff *skb,
++ struct ath_tx_control *txctl)
++{
++ return 0;
++}
++#endif /* CONFIG_ATH9K_TX99 */
+
+ void ath9k_tasklet(unsigned long data);
+ int ath_cabq_update(struct ath_softc *);
+@@ -966,6 +1012,9 @@ extern bool is_ath9k_unloaded;
+
+ u8 ath9k_parse_mpdudensity(u8 mpdudensity);
+ irqreturn_t ath_isr(int irq, void *dev);
++int ath_reset(struct ath_softc *sc);
++void ath_cancel_work(struct ath_softc *sc);
++void ath_restart_work(struct ath_softc *sc);
+ int ath9k_init_device(u16 devid, struct ath_softc *sc,
+ const struct ath_bus_ops *bus_ops);
+ void ath9k_deinit_device(struct ath_softc *sc);
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1782,111 +1782,6 @@ void ath9k_deinit_debug(struct ath_softc
}
}
--/*
-- * TODO: For frame(s) that are in the retry state, we will reuse the
-- * sequence number(s) without setting the retry bit. The
-- * alternative is to give up on these and BAR the receiver's window
-- * forward.
-- */
- static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
- struct ath_atx_tid *tid)
-
-@@ -243,7 +325,7 @@ static void ath_tid_drain(struct ath_sof
- memset(&ts, 0, sizeof(ts));
- INIT_LIST_HEAD(&bf_head);
-
-- while ((skb = __skb_dequeue(&tid->buf_q))) {
-+ while ((skb = ath_tid_dequeue(tid))) {
- fi = get_frame_info(skb);
- bf = fi->bf;
-
-@@ -253,14 +335,8 @@ static void ath_tid_drain(struct ath_sof
- }
-
- list_add_tail(&bf->list, &bf_head);
+-static ssize_t read_file_tx99(struct file *file, char __user *user_buf,
+- size_t count, loff_t *ppos)
+-{
+- struct ath_softc *sc = file->private_data;
+- char buf[3];
+- unsigned int len;
-
-- ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
- }
+- len = sprintf(buf, "%d\n", sc->tx99_state);
+- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+-}
-
-- tid->seq_next = tid->seq_start;
-- tid->baw_tail = tid->baw_head;
-- tid->bar_index = -1;
- }
-
- static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq,
-@@ -323,6 +399,7 @@ static struct ath_buf* ath_clone_txbuf(s
- tbf->bf_buf_addr = bf->bf_buf_addr;
- memcpy(tbf->bf_desc, bf->bf_desc, sc->sc_ah->caps.tx_desc_len);
- tbf->bf_state = bf->bf_state;
-+ tbf->bf_state.stale = false;
+-static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
+- size_t count, loff_t *ppos)
+-{
+- struct ath_softc *sc = file->private_data;
+- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+- char buf[32];
+- bool start;
+- ssize_t len;
+- int r;
+-
+- if (sc->nvifs > 1)
+- return -EOPNOTSUPP;
+-
+- len = min(count, sizeof(buf) - 1);
+- if (copy_from_user(buf, user_buf, len))
+- return -EFAULT;
+-
+- if (strtobool(buf, &start))
+- return -EINVAL;
+-
+- if (start == sc->tx99_state) {
+- if (!start)
+- return count;
+- ath_dbg(common, XMIT, "Resetting TX99\n");
+- ath9k_tx99_deinit(sc);
+- }
+-
+- if (!start) {
+- ath9k_tx99_deinit(sc);
+- return count;
+- }
+-
+- r = ath9k_tx99_init(sc);
+- if (r)
+- return r;
+-
+- return count;
+-}
+-
+-static const struct file_operations fops_tx99 = {
+- .read = read_file_tx99,
+- .write = write_file_tx99,
+- .open = simple_open,
+- .owner = THIS_MODULE,
+- .llseek = default_llseek,
+-};
+-
+-static ssize_t read_file_tx99_power(struct file *file,
+- char __user *user_buf,
+- size_t count, loff_t *ppos)
+-{
+- struct ath_softc *sc = file->private_data;
+- char buf[32];
+- unsigned int len;
+-
+- len = sprintf(buf, "%d (%d dBm)\n",
+- sc->tx99_power,
+- sc->tx99_power / 2);
+-
+- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+-}
+-
+-static ssize_t write_file_tx99_power(struct file *file,
+- const char __user *user_buf,
+- size_t count, loff_t *ppos)
+-{
+- struct ath_softc *sc = file->private_data;
+- int r;
+- u8 tx_power;
+-
+- r = kstrtou8_from_user(user_buf, count, 0, &tx_power);
+- if (r)
+- return r;
+-
+- if (tx_power > MAX_RATE_POWER)
+- return -EINVAL;
+-
+- sc->tx99_power = tx_power;
+-
+- ath9k_ps_wakeup(sc);
+- ath9k_hw_tx99_set_txpower(sc->sc_ah, sc->tx99_power);
+- ath9k_ps_restore(sc);
+-
+- return count;
+-}
+-
+-static const struct file_operations fops_tx99_power = {
+- .read = read_file_tx99_power,
+- .write = write_file_tx99_power,
+- .open = simple_open,
+- .owner = THIS_MODULE,
+- .llseek = default_llseek,
+-};
+-
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+ struct ath_common *common = ath9k_hw_common(ah);
+@@ -1903,6 +1798,7 @@ int ath9k_init_debug(struct ath_hw *ah)
+ #endif
- return tbf;
- }
-@@ -380,7 +457,6 @@ static void ath_tx_complete_aggr(struct
- struct ieee80211_tx_rate rates[4];
- struct ath_frame_info *fi;
- int nframes;
-- u8 tidno;
- bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
- int i, retries;
- int bar_index = -1;
-@@ -406,7 +482,7 @@ static void ath_tx_complete_aggr(struct
- while (bf) {
- bf_next = bf->bf_next;
-
-- if (!bf->bf_stale || bf_next != NULL)
-+ if (!bf->bf_state.stale || bf_next != NULL)
- list_move_tail(&bf->list, &bf_head);
-
- ath_tx_complete_buf(sc, bf, txq, &bf_head, ts, 0);
-@@ -417,8 +493,7 @@ static void ath_tx_complete_aggr(struct
- }
+ ath9k_dfs_init_debug(sc);
++ ath9k_tx99_init_debug(sc);
- an = (struct ath_node *)sta->drv_priv;
-- tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
-- tid = ATH_AN_2_TID(an, tidno);
-+ tid = ath_get_skb_tid(sc, an, skb);
- seq_first = tid->seq_start;
- isba = ts->ts_flags & ATH9K_TX_BA;
+ debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+ &fops_dma);
+@@ -1978,15 +1874,6 @@ int ath9k_init_debug(struct ath_hw *ah)
+ debugfs_create_file("btcoex", S_IRUSR, sc->debug.debugfs_phy, sc,
+ &fops_btcoex);
+ #endif
+- if (config_enabled(CPTCFG_ATH9K_TX99) &&
+- AR_SREV_9300_20_OR_LATER(ah)) {
+- debugfs_create_file("tx99", S_IRUSR | S_IWUSR,
+- sc->debug.debugfs_phy, sc,
+- &fops_tx99);
+- debugfs_create_file("tx99_power", S_IRUSR | S_IWUSR,
+- sc->debug.debugfs_phy, sc,
+- &fops_tx99_power);
+- }
-@@ -430,7 +505,7 @@ static void ath_tx_complete_aggr(struct
- * Only BlockAcks have a TID and therefore normal Acks cannot be
- * checked
- */
-- if (isba && tidno != ts->tid)
-+ if (isba && tid->tidno != ts->tid)
- txok = false;
-
- isaggr = bf_isaggr(bf);
-@@ -466,7 +541,8 @@ static void ath_tx_complete_aggr(struct
- tx_info = IEEE80211_SKB_CB(skb);
- fi = get_frame_info(skb);
-
-- if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) {
-+ if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno) ||
-+ !tid->active) {
- /*
- * Outside of the current BlockAck window,
- * maybe part of a previous session
-@@ -499,7 +575,7 @@ static void ath_tx_complete_aggr(struct
- * not a holding desc.
- */
- INIT_LIST_HEAD(&bf_head);
-- if (bf_next != NULL || !bf_last->bf_stale)
-+ if (bf_next != NULL || !bf_last->bf_state.stale)
- list_move_tail(&bf->list, &bf_head);
-
- if (!txpending) {
-@@ -523,7 +599,7 @@ static void ath_tx_complete_aggr(struct
- ieee80211_sta_eosp(sta);
- }
- /* retry the un-acked ones */
-- if (bf->bf_next == NULL && bf_last->bf_stale) {
-+ if (bf->bf_next == NULL && bf_last->bf_state.stale) {
- struct ath_buf *tbf;
-
- tbf = ath_clone_txbuf(sc, bf_last);
-@@ -560,7 +636,7 @@ static void ath_tx_complete_aggr(struct
- if (an->sleeping)
- ieee80211_sta_set_buffered(sta, tid->tidno, true);
-
-- skb_queue_splice(&bf_pending, &tid->buf_q);
-+ skb_queue_splice_tail(&bf_pending, &tid->retry_q);
- if (!an->sleeping) {
- ath_tx_queue_tid(txq, tid);
-
-@@ -618,7 +694,7 @@ static void ath_tx_process_buffer(struct
- } else
- ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok);
-
-- if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && !flush)
-+ if (!flush)
- ath_txq_schedule(sc, txq);
+ return 0;
}
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -454,7 +454,6 @@ static void ath9k_hw_init_config(struct
+ }
-@@ -792,15 +868,20 @@ static int ath_compute_num_delims(struct
+ ah->config.rx_intr_mitigation = true;
+- ah->config.pcieSerDesWrite = true;
- static struct ath_buf *
- ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
-- struct ath_atx_tid *tid)
-+ struct ath_atx_tid *tid, struct sk_buff_head **q)
- {
-+ struct ieee80211_tx_info *tx_info;
- struct ath_frame_info *fi;
- struct sk_buff *skb;
- struct ath_buf *bf;
- u16 seqno;
-
- while (1) {
-- skb = skb_peek(&tid->buf_q);
-+ *q = &tid->retry_q;
-+ if (skb_queue_empty(*q))
-+ *q = &tid->buf_q;
-+
-+ skb = skb_peek(*q);
- if (!skb)
- break;
-
-@@ -808,13 +889,26 @@ ath_tx_get_tid_subframe(struct ath_softc
- bf = fi->bf;
- if (!fi->bf)
- bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-+ else
-+ bf->bf_state.stale = false;
-
- if (!bf) {
-- __skb_unlink(skb, &tid->buf_q);
-+ __skb_unlink(skb, *q);
-+ ath_txq_skb_done(sc, txq, skb);
- ieee80211_free_txskb(sc->hw, skb);
- continue;
- }
+ /*
+ * We need this for PCI devices only (Cardbus, PCI, miniPCI)
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -283,7 +283,6 @@ struct ath9k_ops_config {
+ int additional_swba_backoff;
+ int ack_6mb;
+ u32 cwm_ignore_extcca;
+- bool pcieSerDesWrite;
+ u8 pcie_clock_req;
+ u32 pcie_waen;
+ u8 analog_shiftreg;
+@@ -920,7 +919,7 @@ struct ath_hw {
+ /* Enterprise mode cap */
+ u32 ent_mode;
+
+-#ifdef CONFIG_PM_SLEEP
++#ifdef CONFIG_ATH9K_WOW
+ u32 wow_event_mask;
+ #endif
+ bool is_clk_25mhz;
+@@ -1126,7 +1125,7 @@ ath9k_hw_get_btcoex_scheme(struct ath_hw
+ #endif /* CPTCFG_ATH9K_BTCOEX_SUPPORT */
-+ bf->bf_next = NULL;
-+ bf->bf_lastbf = bf;
-+
-+ tx_info = IEEE80211_SKB_CB(skb);
-+ tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT;
-+ if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
-+ bf->bf_state.bf_type = 0;
-+ return bf;
-+ }
-+
- bf->bf_state.bf_type = BUF_AMPDU | BUF_AGGR;
- seqno = bf->bf_state.seqno;
-@@ -828,73 +922,52 @@ ath_tx_get_tid_subframe(struct ath_softc
+-#ifdef CONFIG_PM_SLEEP
++#ifdef CONFIG_ATH9K_WOW
+ const char *ath9k_hw_wow_event_to_string(u32 wow_event);
+ void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
+ u8 *user_mask, int pattern_count,
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -683,6 +683,7 @@ static int ath9k_init_softc(u16 devid, s
+ common = ath9k_hw_common(ah);
+ sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
+ sc->tx99_power = MAX_RATE_POWER + 1;
++ init_waitqueue_head(&sc->tx_wait);
- INIT_LIST_HEAD(&bf_head);
- list_add(&bf->list, &bf_head);
-- __skb_unlink(skb, &tid->buf_q);
-+ __skb_unlink(skb, *q);
- ath_tx_update_baw(sc, tid, seqno);
- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
- continue;
- }
+ if (!pdata) {
+ ah->ah_flags |= AH_USE_EEPROM;
+@@ -730,6 +731,7 @@ static int ath9k_init_softc(u16 devid, s
+ tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
+ (unsigned long)sc);
-- bf->bf_next = NULL;
-- bf->bf_lastbf = bf;
- return bf;
++ setup_timer(&sc->sleep_timer, ath_ps_full_sleep, (unsigned long)sc);
+ INIT_WORK(&sc->hw_reset_work, ath_reset_work);
+ INIT_WORK(&sc->hw_check_work, ath_hw_check);
+ INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
+@@ -862,20 +864,11 @@ static const struct ieee80211_iface_comb
+ .max_interfaces = 1,
+ .num_different_channels = 1,
+ .beacon_int_infra_match = true,
+- .radar_detect_widths = BIT(NL80211_CHAN_NO_HT) |
+- BIT(NL80211_CHAN_HT20),
++ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
++ BIT(NL80211_CHAN_WIDTH_20),
}
+ };
- return NULL;
- }
-
--static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
-- struct ath_txq *txq,
-- struct ath_atx_tid *tid,
-- struct list_head *bf_q,
-- int *aggr_len)
-+static bool
-+ath_tx_form_aggr(struct ath_softc *sc, struct ath_txq *txq,
-+ struct ath_atx_tid *tid, struct list_head *bf_q,
-+ struct ath_buf *bf_first, struct sk_buff_head *tid_q,
-+ int *aggr_len)
+-#ifdef CONFIG_PM
+-static const struct wiphy_wowlan_support ath9k_wowlan_support = {
+- .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
+- .n_patterns = MAX_NUM_USER_PATTERN,
+- .pattern_min_len = 1,
+- .pattern_max_len = MAX_PATTERN_SIZE,
+-};
+-#endif
+-
+ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
{
- #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
-- struct ath_buf *bf, *bf_first = NULL, *bf_prev = NULL;
-- int rl = 0, nframes = 0, ndelim, prev_al = 0;
-+ struct ath_buf *bf = bf_first, *bf_prev = NULL;
-+ int nframes = 0, ndelim;
- u16 aggr_limit = 0, al = 0, bpad = 0,
-- al_delta, h_baw = tid->baw_size / 2;
-- enum ATH_AGGR_STATUS status = ATH_AGGR_DONE;
-+ al_delta, h_baw = tid->baw_size / 2;
- struct ieee80211_tx_info *tx_info;
- struct ath_frame_info *fi;
- struct sk_buff *skb;
-+ bool closed = false;
-
-- do {
-- bf = ath_tx_get_tid_subframe(sc, txq, tid);
-- if (!bf) {
-- status = ATH_AGGR_BAW_CLOSED;
-- break;
-- }
-+ bf = bf_first;
-+ aggr_limit = ath_lookup_rate(sc, bf, tid);
+ struct ath_hw *ah = sc->sc_ah;
+@@ -925,16 +918,6 @@ void ath9k_set_hw_capab(struct ath_softc
+ hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_5_10_MHZ;
+ hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
+
+-#ifdef CONFIG_PM_SLEEP
+- if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
+- (sc->driver_data & ATH9K_PCI_WOW) &&
+- device_can_wakeup(sc->dev))
+- hw->wiphy->wowlan = &ath9k_wowlan_support;
+-
+- atomic_set(&sc->wow_sleep_proc_intr, -1);
+- atomic_set(&sc->wow_got_bmiss_intr, -1);
+-#endif
+-
+ hw->queues = 4;
+ hw->max_rates = 4;
+ hw->channel_change_time = 5000;
+@@ -960,6 +943,7 @@ void ath9k_set_hw_capab(struct ath_softc
+ hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+ &sc->sbands[IEEE80211_BAND_5GHZ];
-+ do {
- skb = bf->bf_mpdu;
- fi = get_frame_info(skb);
++ ath9k_init_wow(hw);
+ ath9k_reload_chainmask_settings(sc);
-- if (!bf_first)
-- bf_first = bf;
--
-- if (!rl) {
-- ath_set_rates(tid->an->vif, tid->an->sta, bf);
-- aggr_limit = ath_lookup_rate(sc, bf, tid);
-- rl = 1;
-- }
--
- /* do not exceed aggregation limit */
- al_delta = ATH_AGGR_DELIM_SZ + fi->framelen;
-+ if (nframes) {
-+ if (aggr_limit < al + bpad + al_delta ||
-+ ath_lookup_legacy(bf) || nframes >= h_baw)
-+ break;
-
-- if (nframes &&
-- ((aggr_limit < (al + bpad + al_delta + prev_al)) ||
-- ath_lookup_legacy(bf))) {
-- status = ATH_AGGR_LIMITED;
-- break;
-- }
--
-- tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-- if (nframes && (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
-- break;
--
-- /* do not exceed subframe limit */
-- if (nframes >= min((int)h_baw, ATH_AMPDU_SUBFRAME_DEFAULT)) {
-- status = ATH_AGGR_LIMITED;
-- break;
-+ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-+ if ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) ||
-+ !(tx_info->flags & IEEE80211_TX_CTL_AMPDU))
-+ break;
- }
-
- /* add padding for previous frame to aggregation length */
-@@ -912,22 +985,37 @@ static enum ATH_AGGR_STATUS ath_tx_form_
- bf->bf_next = NULL;
-
- /* link buffers of this frame to the aggregate */
-- if (!fi->retries)
-- ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
-+ if (!fi->baw_tracked)
-+ ath_tx_addto_baw(sc, tid, bf);
- bf->bf_state.ndelim = ndelim;
-
-- __skb_unlink(skb, &tid->buf_q);
-+ __skb_unlink(skb, tid_q);
- list_add_tail(&bf->list, bf_q);
- if (bf_prev)
- bf_prev->bf_next = bf;
-
- bf_prev = bf;
-
-- } while (!skb_queue_empty(&tid->buf_q));
-+ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
-+ if (!bf) {
-+ closed = true;
-+ break;
-+ }
-+ } while (ath_tid_has_buffered(tid));
-+
-+ bf = bf_first;
-+ bf->bf_lastbf = bf_prev;
-+
-+ if (bf == bf_prev) {
-+ al = get_frame_info(bf->bf_mpdu)->framelen;
-+ bf->bf_state.bf_type = BUF_AMPDU;
-+ } else {
-+ TX_STAT_INC(txq->axq_qnum, a_aggr);
-+ }
-
- *aggr_len = al;
-
-- return status;
-+ return closed;
- #undef PADBYTES
- }
-
-@@ -999,7 +1087,7 @@ void ath_update_max_aggr_framelen(struct
- }
-
- static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
-- struct ath_tx_info *info, int len)
-+ struct ath_tx_info *info, int len, bool rts)
- {
- struct ath_hw *ah = sc->sc_ah;
- struct sk_buff *skb;
-@@ -1008,6 +1096,7 @@ static void ath_buf_set_rate(struct ath_
- const struct ieee80211_rate *rate;
- struct ieee80211_hdr *hdr;
- struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
-+ u32 rts_thresh = sc->hw->wiphy->rts_threshold;
- int i;
- u8 rix = 0;
-
-@@ -1030,7 +1119,17 @@ static void ath_buf_set_rate(struct ath_
- rix = rates[i].idx;
- info->rates[i].Tries = rates[i].count;
-
-- if (rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS) {
-+ /*
-+ * Handle RTS threshold for unaggregated HT frames.
-+ */
-+ if (bf_isampdu(bf) && !bf_isaggr(bf) &&
-+ (rates[i].flags & IEEE80211_TX_RC_MCS) &&
-+ unlikely(rts_thresh != (u32) -1)) {
-+ if (!rts_thresh || (len > rts_thresh))
-+ rts = true;
-+ }
-+
-+ if (rts || rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS) {
- info->rates[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS;
- info->flags |= ATH9K_TXDESC_RTSENA;
- } else if (rates[i].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {
-@@ -1123,6 +1222,8 @@ static void ath_tx_fill_desc(struct ath_
- struct ath_hw *ah = sc->sc_ah;
- struct ath_buf *bf_first = NULL;
- struct ath_tx_info info;
-+ u32 rts_thresh = sc->hw->wiphy->rts_threshold;
-+ bool rts = false;
-
- memset(&info, 0, sizeof(info));
- info.is_first = true;
-@@ -1159,7 +1260,22 @@ static void ath_tx_fill_desc(struct ath_
- info.flags |= (u32) bf->bf_state.bfs_paprd <<
- ATH9K_TXDESC_PAPRD_S;
-
-- ath_buf_set_rate(sc, bf, &info, len);
-+ /*
-+ * mac80211 doesn't handle RTS threshold for HT because
-+ * the decision has to be taken based on AMPDU length
-+ * and aggregation is done entirely inside ath9k.
-+ * Set the RTS/CTS flag for the first subframe based
-+ * on the threshold.
-+ */
-+ if (aggr && (bf == bf_first) &&
-+ unlikely(rts_thresh != (u32) -1)) {
-+ /*
-+ * "len" is the size of the entire AMPDU.
-+ */
-+ if (!rts_thresh || (len > rts_thresh))
-+ rts = true;
-+ }
-+ ath_buf_set_rate(sc, bf, &info, len, rts);
- }
-
- info.buf_addr[0] = bf->bf_buf_addr;
-@@ -1188,64 +1304,101 @@ static void ath_tx_fill_desc(struct ath_
- }
- }
-
--static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
-- struct ath_atx_tid *tid)
-+static void
-+ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq,
-+ struct ath_atx_tid *tid, struct list_head *bf_q,
-+ struct ath_buf *bf_first, struct sk_buff_head *tid_q)
- {
-- struct ath_buf *bf;
-- enum ATH_AGGR_STATUS status;
-- struct ieee80211_tx_info *tx_info;
-- struct list_head bf_q;
-- int aggr_len;
-+ struct ath_buf *bf = bf_first, *bf_prev = NULL;
-+ struct sk_buff *skb;
-+ int nframes = 0;
-
- do {
-- if (skb_queue_empty(&tid->buf_q))
-- return;
-+ struct ieee80211_tx_info *tx_info;
-+ skb = bf->bf_mpdu;
-
-- INIT_LIST_HEAD(&bf_q);
-+ nframes++;
-+ __skb_unlink(skb, tid_q);
-+ list_add_tail(&bf->list, bf_q);
-+ if (bf_prev)
-+ bf_prev->bf_next = bf;
-+ bf_prev = bf;
-
-- status = ath_tx_form_aggr(sc, txq, tid, &bf_q, &aggr_len);
-+ if (nframes >= 2)
-+ break;
-
-- /*
-- * no frames picked up to be aggregated;
-- * block-ack window is not open.
-- */
-- if (list_empty(&bf_q))
-+ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
-+ if (!bf)
- break;
-
-- bf = list_first_entry(&bf_q, struct ath_buf, list);
-- bf->bf_lastbf = list_entry(bf_q.prev, struct ath_buf, list);
- tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-+ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
-+ break;
-
-- if (tid->ac->clear_ps_filter) {
-- tid->ac->clear_ps_filter = false;
-- tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
-- } else {
-- tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT;
-- }
-+ ath_set_rates(tid->an->vif, tid->an->sta, bf);
-+ } while (1);
-+}
-
-- /* if only one frame, send as non-aggregate */
-- if (bf == bf->bf_lastbf) {
-- aggr_len = get_frame_info(bf->bf_mpdu)->framelen;
-- bf->bf_state.bf_type = BUF_AMPDU;
-- } else {
-- TX_STAT_INC(txq->axq_qnum, a_aggr);
-- }
-+static bool ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
-+ struct ath_atx_tid *tid, bool *stop)
-+{
-+ struct ath_buf *bf;
-+ struct ieee80211_tx_info *tx_info;
-+ struct sk_buff_head *tid_q;
-+ struct list_head bf_q;
-+ int aggr_len = 0;
-+ bool aggr, last = true;
-+
-+ if (!ath_tid_has_buffered(tid))
-+ return false;
-
-- ath_tx_fill_desc(sc, bf, txq, aggr_len);
-- ath_tx_txqaddbuf(sc, txq, &bf_q, false);
-- } while (txq->axq_ampdu_depth < ATH_AGGR_MIN_QDEPTH &&
-- status != ATH_AGGR_BAW_CLOSED);
-+ INIT_LIST_HEAD(&bf_q);
-+
-+ bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
-+ if (!bf)
-+ return false;
-+
-+ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-+ aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
-+ if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ||
-+ (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) {
-+ *stop = true;
-+ return false;
-+ }
-+
-+ ath_set_rates(tid->an->vif, tid->an->sta, bf);
-+ if (aggr)
-+ last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf,
-+ tid_q, &aggr_len);
-+ else
-+ ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q);
-+
-+ if (list_empty(&bf_q))
-+ return false;
-+
-+ if (tid->ac->clear_ps_filter || tid->an->no_ps_filter) {
-+ tid->ac->clear_ps_filter = false;
-+ tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
-+ }
-+
-+ ath_tx_fill_desc(sc, bf, txq, aggr_len);
-+ ath_tx_txqaddbuf(sc, txq, &bf_q, false);
-+ return true;
- }
-
- int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
- u16 tid, u16 *ssn)
- {
- struct ath_atx_tid *txtid;
-+ struct ath_txq *txq;
- struct ath_node *an;
- u8 density;
-
- an = (struct ath_node *)sta->drv_priv;
- txtid = ATH_AN_2_TID(an, tid);
-+ txq = txtid->ac->txq;
-+
-+ ath_txq_lock(sc, txq);
-
- /* update ampdu factor/density, they may have changed. This may happen
- * in HT IBSS when a beacon with HT-info is received after the station
-@@ -1258,6 +1411,9 @@ int ath_tx_aggr_start(struct ath_softc *
- an->mpdudensity = density;
- }
-
-+ /* force sequence number allocation for pending frames */
-+ ath_tx_tid_change_state(sc, txtid);
-+
- txtid->active = true;
- txtid->paused = true;
- *ssn = txtid->seq_start = txtid->seq_next;
-@@ -1266,6 +1422,8 @@ int ath_tx_aggr_start(struct ath_softc *
- memset(txtid->tx_buf, 0, sizeof(txtid->tx_buf));
- txtid->baw_head = txtid->baw_tail = 0;
-
-+ ath_txq_unlock_complete(sc, txq);
-+
- return 0;
- }
-
-@@ -1277,8 +1435,9 @@ void ath_tx_aggr_stop(struct ath_softc *
-
- ath_txq_lock(sc, txq);
- txtid->active = false;
-- txtid->paused = true;
-+ txtid->paused = false;
- ath_tx_flush_tid(sc, txtid);
-+ ath_tx_tid_change_state(sc, txtid);
- ath_txq_unlock_complete(sc, txq);
- }
-
-@@ -1302,7 +1461,7 @@ void ath_tx_aggr_sleep(struct ieee80211_
-
- ath_txq_lock(sc, txq);
-
-- buffered = !skb_queue_empty(&tid->buf_q);
-+ buffered = ath_tid_has_buffered(tid);
-
- tid->sched = false;
- list_del(&tid->list);
-@@ -1334,7 +1493,7 @@ void ath_tx_aggr_wakeup(struct ath_softc
- ath_txq_lock(sc, txq);
- ac->clear_ps_filter = true;
-
-- if (!skb_queue_empty(&tid->buf_q) && !tid->paused) {
-+ if (!tid->paused && ath_tid_has_buffered(tid)) {
- ath_tx_queue_tid(txq, tid);
- ath_txq_schedule(sc, txq);
- }
-@@ -1359,7 +1518,7 @@ void ath_tx_aggr_resume(struct ath_softc
- tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
- tid->paused = false;
-
-- if (!skb_queue_empty(&tid->buf_q)) {
-+ if (ath_tid_has_buffered(tid)) {
- ath_tx_queue_tid(txq, tid);
- ath_txq_schedule(sc, txq);
- }
-@@ -1379,6 +1538,7 @@ void ath9k_release_buffered_frames(struc
- struct ieee80211_tx_info *info;
- struct list_head bf_q;
- struct ath_buf *bf_tail = NULL, *bf;
-+ struct sk_buff_head *tid_q;
- int sent = 0;
- int i;
-
-@@ -1394,16 +1554,18 @@ void ath9k_release_buffered_frames(struc
- continue;
-
- ath_txq_lock(sc, tid->ac->txq);
-- while (!skb_queue_empty(&tid->buf_q) && nframes > 0) {
-- bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid);
-+ while (nframes > 0) {
-+ bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid, &tid_q);
- if (!bf)
- break;
-
-- __skb_unlink(bf->bf_mpdu, &tid->buf_q);
-+ __skb_unlink(bf->bf_mpdu, tid_q);
- list_add_tail(&bf->list, &bf_q);
- ath_set_rates(tid->an->vif, tid->an->sta, bf);
-- ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
-- bf->bf_state.bf_type &= ~BUF_AGGR;
-+ if (bf_isampdu(bf)) {
-+ ath_tx_addto_baw(sc, tid, bf);
-+ bf->bf_state.bf_type &= ~BUF_AGGR;
-+ }
- if (bf_tail)
- bf_tail->bf_next = bf;
-
-@@ -1412,7 +1574,7 @@ void ath9k_release_buffered_frames(struc
- sent++;
- TX_STAT_INC(txq->axq_qnum, a_queued_hw);
-
-- if (skb_queue_empty(&tid->buf_q))
-+ if (an->sta && !ath_tid_has_buffered(tid))
- ieee80211_sta_set_buffered(an->sta, i, false);
- }
- ath_txq_unlock_complete(sc, tid->ac->txq);
-@@ -1542,16 +1704,9 @@ int ath_cabq_update(struct ath_softc *sc
- int qnum = sc->beacon.cabq->axq_qnum;
-
- ath9k_hw_get_txq_props(sc->sc_ah, qnum, &qi);
-- /*
-- * Ensure the readytime % is within the bounds.
-- */
-- if (sc->config.cabqReadytime < ATH9K_READY_TIME_LO_BOUND)
-- sc->config.cabqReadytime = ATH9K_READY_TIME_LO_BOUND;
-- else if (sc->config.cabqReadytime > ATH9K_READY_TIME_HI_BOUND)
-- sc->config.cabqReadytime = ATH9K_READY_TIME_HI_BOUND;
-
- qi.tqi_readyTime = (cur_conf->beacon_interval *
-- sc->config.cabqReadytime) / 100;
-+ ATH_CABQ_READY_TIME) / 100;
- ath_txq_update(sc, qnum, &qi);
-
- return 0;
-@@ -1571,7 +1726,7 @@ static void ath_drain_txq_list(struct at
- while (!list_empty(list)) {
- bf = list_first_entry(list, struct ath_buf, list);
-
-- if (bf->bf_stale) {
-+ if (bf->bf_state.stale) {
- list_del(&bf->list);
-
- ath_tx_return_buffer(sc, bf);
-@@ -1630,6 +1785,9 @@ bool ath_drain_all_txq(struct ath_softc
- if (!ATH_TXQ_SETUP(sc, i))
- continue;
-
-+ if (!sc->tx.txq[i].axq_depth)
-+ continue;
-+
- if (ath9k_hw_numtxpending(ah, sc->tx.txq[i].axq_qnum))
- npend |= BIT(i);
- }
-@@ -1665,25 +1823,27 @@ void ath_tx_cleanupq(struct ath_softc *s
- */
- void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
- {
-- struct ath_atx_ac *ac, *ac_tmp, *last_ac;
-+ struct ath_atx_ac *ac, *last_ac;
- struct ath_atx_tid *tid, *last_tid;
-+ bool sent = false;
-
- if (test_bit(SC_OP_HW_RESET, &sc->sc_flags) ||
-- list_empty(&txq->axq_acq) ||
-- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
-+ list_empty(&txq->axq_acq))
- return;
-
- rcu_read_lock();
-
-- ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);
- last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list);
-+ while (!list_empty(&txq->axq_acq)) {
-+ bool stop = false;
-
-- list_for_each_entry_safe(ac, ac_tmp, &txq->axq_acq, list) {
-+ ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);
- last_tid = list_entry(ac->tid_q.prev, struct ath_atx_tid, list);
- list_del(&ac->list);
- ac->sched = false;
-
- while (!list_empty(&ac->tid_q)) {
-+
- tid = list_first_entry(&ac->tid_q, struct ath_atx_tid,
- list);
- list_del(&tid->list);
-@@ -1692,17 +1852,17 @@ void ath_txq_schedule(struct ath_softc *
- if (tid->paused)
- continue;
-
-- ath_tx_sched_aggr(sc, txq, tid);
-+ if (ath_tx_sched_aggr(sc, txq, tid, &stop))
-+ sent = true;
-
- /*
- * add tid to round-robin queue if more frames
- * are pending for the tid
- */
-- if (!skb_queue_empty(&tid->buf_q))
-+ if (ath_tid_has_buffered(tid))
- ath_tx_queue_tid(txq, tid);
-
-- if (tid == last_tid ||
-- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
-+ if (stop || tid == last_tid)
- break;
- }
-
-@@ -1711,9 +1871,17 @@ void ath_txq_schedule(struct ath_softc *
- list_add_tail(&ac->list, &txq->axq_acq);
- }
-
-- if (ac == last_ac ||
-- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
-+ if (stop)
- break;
-+
-+ if (ac == last_ac) {
-+ if (!sent)
-+ break;
-+
-+ sent = false;
-+ last_ac = list_entry(txq->axq_acq.prev,
-+ struct ath_atx_ac, list);
-+ }
- }
-
- rcu_read_unlock();
-@@ -1787,74 +1955,28 @@ static void ath_tx_txqaddbuf(struct ath_
- if (bf_is_ampdu_not_probing(bf))
- txq->axq_ampdu_depth++;
-
-- bf = bf->bf_lastbf->bf_next;
-+ bf_last = bf->bf_lastbf;
-+ bf = bf_last->bf_next;
-+ bf_last->bf_next = NULL;
- }
- }
- }
-
--static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_txq *txq,
-- struct ath_atx_tid *tid, struct sk_buff *skb,
-- struct ath_tx_control *txctl)
--{
-- struct ath_frame_info *fi = get_frame_info(skb);
-- struct list_head bf_head;
-- struct ath_buf *bf;
--
-- /*
-- * Do not queue to h/w when any of the following conditions is true:
-- * - there are pending frames in software queue
-- * - the TID is currently paused for ADDBA/BAR request
-- * - seqno is not within block-ack window
-- * - h/w queue depth exceeds low water mark
-- */
-- if ((!skb_queue_empty(&tid->buf_q) || tid->paused ||
-- !BAW_WITHIN(tid->seq_start, tid->baw_size, tid->seq_next) ||
-- txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) &&
-- txq != sc->tx.uapsdq) {
-- /*
-- * Add this frame to software queue for scheduling later
-- * for aggregation.
-- */
-- TX_STAT_INC(txq->axq_qnum, a_queued_sw);
-- __skb_queue_tail(&tid->buf_q, skb);
-- if (!txctl->an || !txctl->an->sleeping)
-- ath_tx_queue_tid(txq, tid);
-- return;
-- }
--
-- bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-- if (!bf) {
-- ieee80211_free_txskb(sc->hw, skb);
-- return;
-- }
--
-- ath_set_rates(tid->an->vif, tid->an->sta, bf);
-- bf->bf_state.bf_type = BUF_AMPDU;
-- INIT_LIST_HEAD(&bf_head);
-- list_add(&bf->list, &bf_head);
--
-- /* Add sub-frame to BAW */
-- ath_tx_addto_baw(sc, tid, bf->bf_state.seqno);
--
-- /* Queue to h/w without aggregation */
-- TX_STAT_INC(txq->axq_qnum, a_queued_hw);
-- bf->bf_lastbf = bf;
-- ath_tx_fill_desc(sc, bf, txq, fi->framelen);
-- ath_tx_txqaddbuf(sc, txq, &bf_head, false);
--}
--
- static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
- struct ath_atx_tid *tid, struct sk_buff *skb)
- {
-+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
- struct ath_frame_info *fi = get_frame_info(skb);
- struct list_head bf_head;
-- struct ath_buf *bf;
--
-- bf = fi->bf;
-+ struct ath_buf *bf = fi->bf;
-
- INIT_LIST_HEAD(&bf_head);
- list_add_tail(&bf->list, &bf_head);
- bf->bf_state.bf_type = 0;
-+ if (tid && (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
-+ bf->bf_state.bf_type = BUF_AMPDU;
-+ ath_tx_addto_baw(sc, tid, bf);
-+ }
-
- bf->bf_next = NULL;
- bf->bf_lastbf = bf;
-@@ -1911,8 +2033,7 @@ u8 ath_txchainmask_reduction(struct ath_
- struct ath_hw *ah = sc->sc_ah;
- struct ath9k_channel *curchan = ah->curchan;
-
-- if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) &&
-- (curchan->channelFlags & CHANNEL_5GHZ) &&
-+ if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) && IS_CHAN_5GHZ(curchan) &&
- (chainmask == 0x7) && (rate < 0x90))
- return 0x3;
- else if (AR_SREV_9462(ah) && ath9k_hw_btcoex_is_enabled(ah) &&
-@@ -1985,6 +2106,7 @@ static int ath_tx_prepare(struct ieee802
- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- struct ieee80211_sta *sta = txctl->sta;
- struct ieee80211_vif *vif = info->control.vif;
-+ struct ath_vif *avp;
- struct ath_softc *sc = hw->priv;
- int frmlen = skb->len + FCS_LEN;
- int padpos, padsize;
-@@ -1992,6 +2114,10 @@ static int ath_tx_prepare(struct ieee802
- /* NOTE: sta can be NULL according to net/mac80211.h */
- if (sta)
- txctl->an = (struct ath_node *)sta->drv_priv;
-+ else if (vif && ieee80211_is_data(hdr->frame_control)) {
-+ avp = (void *)vif->drv_priv;
-+ txctl->an = &avp->mcast_node;
-+ }
-
- if (info->control.hw_key)
- frmlen += info->control.hw_key->icv_len;
-@@ -2041,7 +2167,6 @@ int ath_tx_start(struct ieee80211_hw *hw
- struct ath_txq *txq = txctl->txq;
- struct ath_atx_tid *tid = NULL;
- struct ath_buf *bf;
-- u8 tidno;
- int q;
- int ret;
-
-@@ -2069,27 +2194,31 @@ int ath_tx_start(struct ieee80211_hw *hw
- ath_txq_unlock(sc, txq);
- txq = sc->tx.uapsdq;
- ath_txq_lock(sc, txq);
-- }
--
-- if (txctl->an && ieee80211_is_data_qos(hdr->frame_control)) {
-- tidno = ieee80211_get_qos_ctl(hdr)[0] &
-- IEEE80211_QOS_CTL_TID_MASK;
-- tid = ATH_AN_2_TID(txctl->an, tidno);
-+ } else if (txctl->an &&
-+ ieee80211_is_data_present(hdr->frame_control)) {
-+ tid = ath_get_skb_tid(sc, txctl->an, skb);
-
- WARN_ON(tid->ac->txq != txctl->txq);
-- }
-
-- if ((info->flags & IEEE80211_TX_CTL_AMPDU) && tid) {
-+ if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
-+ tid->ac->clear_ps_filter = true;
-+
- /*
-- * Try aggregation if it's a unicast data frame
-- * and the destination is HT capable.
-+ * Add this frame to software queue for scheduling later
-+ * for aggregation.
- */
-- ath_tx_send_ampdu(sc, txq, tid, skb, txctl);
-+ TX_STAT_INC(txq->axq_qnum, a_queued_sw);
-+ __skb_queue_tail(&tid->buf_q, skb);
-+ if (!txctl->an->sleeping)
-+ ath_tx_queue_tid(txq, tid);
-+
-+ ath_txq_schedule(sc, txq);
- goto out;
- }
-
- bf = ath_tx_setup_buffer(sc, txq, tid, skb);
- if (!bf) {
-+ ath_txq_skb_done(sc, txq, skb);
- if (txctl->paprd)
- dev_kfree_skb_any(skb);
- else
-@@ -2142,7 +2271,7 @@ void ath_tx_cabq(struct ieee80211_hw *hw
-
- bf->bf_lastbf = bf;
- ath_set_rates(vif, NULL, bf);
-- ath_buf_set_rate(sc, bf, &info, fi->framelen);
-+ ath_buf_set_rate(sc, bf, &info, fi->framelen, false);
- duration += info.rates[0].PktDuration;
- if (bf_tail)
- bf_tail->bf_next = bf;
-@@ -2189,7 +2318,7 @@ static void ath_tx_complete(struct ath_s
- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
-- int q, padpos, padsize;
-+ int padpos, padsize;
- unsigned long flags;
-
- ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
-@@ -2225,21 +2354,7 @@ static void ath_tx_complete(struct ath_s
- spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
-
- __skb_queue_tail(&txq->complete_q, skb);
--
-- q = skb_get_queue_mapping(skb);
-- if (txq == sc->tx.uapsdq)
-- txq = sc->tx.txq_map[q];
--
-- if (txq == sc->tx.txq_map[q]) {
-- if (WARN_ON(--txq->pending_frames < 0))
-- txq->pending_frames = 0;
--
-- if (txq->stopped &&
-- txq->pending_frames < sc->tx.txq_max_pending[q]) {
-- ieee80211_wake_queue(sc->hw, q);
-- txq->stopped = false;
-- }
-- }
-+ ath_txq_skb_done(sc, txq, skb);
- }
-
- static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
-@@ -2360,8 +2475,7 @@ static void ath_tx_processq(struct ath_s
-
- if (list_empty(&txq->axq_q)) {
- txq->axq_link = NULL;
-- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
-- ath_txq_schedule(sc, txq);
-+ ath_txq_schedule(sc, txq);
- break;
- }
- bf = list_first_entry(&txq->axq_q, struct ath_buf, list);
-@@ -2375,7 +2489,7 @@ static void ath_tx_processq(struct ath_s
- * it with the STALE flag.
- */
- bf_held = NULL;
-- if (bf->bf_stale) {
-+ if (bf->bf_state.stale) {
- bf_held = bf;
- if (list_is_last(&bf_held->list, &txq->axq_q))
- break;
-@@ -2399,7 +2513,7 @@ static void ath_tx_processq(struct ath_s
- * however leave the last descriptor back as the holding
- * descriptor for hw.
- */
-- lastbf->bf_stale = true;
-+ lastbf->bf_state.stale = true;
- INIT_LIST_HEAD(&bf_head);
- if (!list_is_singular(&lastbf->list))
- list_cut_position(&bf_head,
-@@ -2470,7 +2584,7 @@ void ath_tx_edma_tasklet(struct ath_soft
- }
+ SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
+@@ -1058,6 +1042,7 @@ static void ath9k_deinit_softc(struct at
+ if (ATH_TXQ_SETUP(sc, i))
+ ath_tx_cleanupq(sc, &sc->tx.txq[i]);
- bf = list_first_entry(fifo_list, struct ath_buf, list);
-- if (bf->bf_stale) {
-+ if (bf->bf_state.stale) {
- list_del(&bf->list);
- ath_tx_return_buffer(sc, bf);
- bf = list_first_entry(fifo_list, struct ath_buf, list);
-@@ -2492,7 +2606,7 @@ void ath_tx_edma_tasklet(struct ath_soft
- ath_tx_txqaddbuf(sc, txq, &bf_q, true);
- }
- } else {
-- lastbf->bf_stale = true;
-+ lastbf->bf_state.stale = true;
- if (bf != lastbf)
- list_cut_position(&bf_head, fifo_list,
- lastbf->list.prev);
-@@ -2583,6 +2697,7 @@ void ath_tx_node_init(struct ath_softc *
- tid->paused = false;
- tid->active = false;
- __skb_queue_head_init(&tid->buf_q);
-+ __skb_queue_head_init(&tid->retry_q);
- acno = TID_TO_WME_AC(tidno);
- tid->ac = &an->ac[acno];
- }
-@@ -2590,6 +2705,7 @@ void ath_tx_node_init(struct ath_softc *
- for (acno = 0, ac = &an->ac[acno];
- acno < IEEE80211_NUM_ACS; acno++, ac++) {
- ac->sched = false;
-+ ac->clear_ps_filter = true;
- ac->txq = sc->tx.txq_map[acno];
- INIT_LIST_HEAD(&ac->tid_q);
- }
++ del_timer_sync(&sc->sleep_timer);
+ ath9k_hw_deinit(sc->sc_ah);
+ if (sc->dfs_detector != NULL)
+ sc->dfs_detector->exit(sc->dfs_detector);
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -82,6 +82,22 @@ static bool ath9k_setpower(struct ath_so
@@ -1601,354 +648,81 @@
!(sc->ps_flags & (PS_WAIT_FOR_BEACON |
PS_WAIT_FOR_CAB |
PS_WAIT_FOR_PSPOLL_DATA |
-@@ -173,8 +190,7 @@ static void ath_restart_work(struct ath_
+@@ -163,13 +180,13 @@ static void __ath_cancel_work(struct ath
+ #endif
+ }
+
+-static void ath_cancel_work(struct ath_softc *sc)
++void ath_cancel_work(struct ath_softc *sc)
+ {
+ __ath_cancel_work(sc);
+ cancel_work_sync(&sc->hw_reset_work);
+ }
+
+-static void ath_restart_work(struct ath_softc *sc)
++void ath_restart_work(struct ath_softc *sc)
{
ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
-- if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9485(sc->sc_ah) ||
-- AR_SREV_9550(sc->sc_ah))
-+ if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah))
- ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
- msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
+@@ -487,6 +504,8 @@ void ath9k_tasklet(unsigned long data)
+ ath_tx_edma_tasklet(sc);
+ else
+ ath_tx_tasklet(sc);
++
++ wake_up(&sc->tx_wait);
+ }
-@@ -209,6 +225,7 @@ static bool ath_complete_reset(struct at
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- unsigned long flags;
-+ int i;
+ ath9k_btcoex_handle_interrupt(sc, status);
+@@ -579,7 +598,8 @@ irqreturn_t ath_isr(int irq, void *dev)
- if (ath_startrecv(sc) != 0) {
- ath_err(common, "Unable to restart recv logic\n");
-@@ -236,10 +253,16 @@ static bool ath_complete_reset(struct at
+ goto chip_reset;
+ }
+-#ifdef CONFIG_PM_SLEEP
++
++#ifdef CONFIG_ATH9K_WOW
+ if (status & ATH9K_INT_BMISS) {
+ if (atomic_read(&sc->wow_sleep_proc_intr) == 0) {
+ ath_dbg(common, ANY, "during WoW we got a BMISS\n");
+@@ -588,6 +608,8 @@ irqreturn_t ath_isr(int irq, void *dev)
}
- work:
- ath_restart_work(sc);
-- }
-
-- if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3)
-- ath_ant_comb_update(sc);
-+ for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-+ if (!ATH_TXQ_SETUP(sc, i))
-+ continue;
+ }
+ #endif
+
-+ spin_lock_bh(&sc->tx.txq[i].axq_lock);
-+ ath_txq_schedule(sc, &sc->tx.txq[i]);
-+ spin_unlock_bh(&sc->tx.txq[i].axq_lock);
-+ }
-+ }
++
+ if (status & ATH9K_INT_SWBA)
+ tasklet_schedule(&sc->bcon_tasklet);
- ieee80211_wake_queues(sc->hw);
+@@ -627,7 +649,7 @@ chip_reset:
+ #undef SCHED_INTR
+ }
-@@ -306,17 +329,91 @@ out:
- * by reseting the chip. To accomplish this we must first cleanup any pending
- * DMA, then restart stuff.
- */
--static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
-- struct ath9k_channel *hchan)
-+static int ath_set_channel(struct ath_softc *sc, struct cfg80211_chan_def *chandef)
+-static int ath_reset(struct ath_softc *sc)
++int ath_reset(struct ath_softc *sc)
{
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ struct ieee80211_hw *hw = sc->hw;
-+ struct ath9k_channel *hchan;
-+ struct ieee80211_channel *chan = chandef->chan;
-+ unsigned long flags;
-+ bool offchannel;
-+ int pos = chan->hw_value;
-+ int old_pos = -1;
int r;
- if (test_bit(SC_OP_INVALID, &sc->sc_flags))
- return -EIO;
+@@ -1817,13 +1839,31 @@ static void ath9k_set_coverage_class(str
+ mutex_unlock(&sc->mutex);
+ }
-+ offchannel = !!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL);
-+
-+ if (ah->curchan)
-+ old_pos = ah->curchan - &ah->channels[0];
-+
-+ ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",
-+ chan->center_freq, chandef->width);
-+
-+ /* update survey stats for the old channel before switching */
-+ spin_lock_irqsave(&common->cc_lock, flags);
-+ ath_update_survey_stats(sc);
-+ spin_unlock_irqrestore(&common->cc_lock, flags);
-+
-+ ath9k_cmn_get_channel(hw, ah, chandef);
++static bool ath9k_has_tx_pending(struct ath_softc *sc)
++{
++ int i, npend;
+
-+ /*
-+ * If the operating channel changes, change the survey in-use flags
-+ * along with it.
-+ * Reset the survey data for the new channel, unless we're switching
-+ * back to the operating channel from an off-channel operation.
-+ */
-+ if (!offchannel && sc->cur_survey != &sc->survey[pos]) {
-+ if (sc->cur_survey)
-+ sc->cur_survey->filled &= ~SURVEY_INFO_IN_USE;
++ for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
++ if (!ATH_TXQ_SETUP(sc, i))
++ continue;
+
-+ sc->cur_survey = &sc->survey[pos];
++ if (!sc->tx.txq[i].axq_depth)
++ continue;
+
-+ memset(sc->cur_survey, 0, sizeof(struct survey_info));
-+ sc->cur_survey->filled |= SURVEY_INFO_IN_USE;
-+ } else if (!(sc->survey[pos].filled & SURVEY_INFO_IN_USE)) {
-+ memset(&sc->survey[pos], 0, sizeof(struct survey_info));
++ npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
++ if (npend)
++ break;
+ }
+
-+ hchan = &sc->sc_ah->channels[pos];
- r = ath_reset_internal(sc, hchan);
-+ if (r)
-+ return r;
-
-- return r;
-+ /*
-+ * The most recent snapshot of channel->noisefloor for the old
-+ * channel is only available after the hardware reset. Copy it to
-+ * the survey stats now.
-+ */
-+ if (old_pos >= 0)
-+ ath_update_survey_nf(sc, old_pos);
-+
-+ /*
-+ * Enable radar pulse detection if on a DFS channel. Spectral
-+ * scanning and radar detection can not be used concurrently.
-+ */
-+ if (hw->conf.radar_enabled) {
-+ u32 rxfilter;
-+
-+ /* set HW specific DFS configuration */
-+ ath9k_hw_set_radar_params(ah);
-+ rxfilter = ath9k_hw_getrxfilter(ah);
-+ rxfilter |= ATH9K_RX_FILTER_PHYRADAR |
-+ ATH9K_RX_FILTER_PHYERR;
-+ ath9k_hw_setrxfilter(ah, rxfilter);
-+ ath_dbg(common, DFS, "DFS enabled at freq %d\n",
-+ chan->center_freq);
-+ } else {
-+ /* perform spectral scan if requested. */
-+ if (test_bit(SC_OP_SCANNING, &sc->sc_flags) &&
-+ sc->spectral_mode == SPECTRAL_CHANSCAN)
-+ ath9k_spectral_scan_trigger(hw);
-+ }
-+
-+ return 0;
- }
-
- static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
-@@ -400,6 +497,8 @@ void ath9k_tasklet(unsigned long data)
- ath_tx_edma_tasklet(sc);
- else
- ath_tx_tasklet(sc);
-+
-+ wake_up(&sc->tx_wait);
- }
-
- ath9k_btcoex_handle_interrupt(sc, status);
-@@ -543,21 +642,10 @@ chip_reset:
-
- static int ath_reset(struct ath_softc *sc)
- {
-- int i, r;
-+ int r;
-
- ath9k_ps_wakeup(sc);
--
- r = ath_reset_internal(sc, NULL);
--
-- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-- if (!ATH_TXQ_SETUP(sc, i))
-- continue;
--
-- spin_lock_bh(&sc->tx.txq[i].axq_lock);
-- ath_txq_schedule(sc, &sc->tx.txq[i]);
-- spin_unlock_bh(&sc->tx.txq[i].axq_lock);
-- }
--
- ath9k_ps_restore(sc);
-
- return r;
-@@ -599,7 +687,7 @@ static int ath9k_start(struct ieee80211_
- ath9k_ps_wakeup(sc);
- mutex_lock(&sc->mutex);
-
-- init_channel = ath9k_cmn_get_curchannel(hw, ah);
-+ init_channel = ath9k_cmn_get_channel(hw, ah, &hw->conf.chandef);
-
- /* Reset SERDES registers */
- ath9k_hw_configpcipowersave(ah, false);
-@@ -802,7 +890,7 @@ static void ath9k_stop(struct ieee80211_
- }
-
- if (!ah->curchan)
-- ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-+ ah->curchan = ath9k_cmn_get_channel(hw, ah, &hw->conf.chandef);
-
- ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
- ath9k_hw_phy_disable(ah);
-@@ -821,7 +909,7 @@ static void ath9k_stop(struct ieee80211_
- ath_dbg(common, CONFIG, "Driver halt\n");
- }
-
--bool ath9k_uses_beacons(int type)
-+static bool ath9k_uses_beacons(int type)
- {
- switch (type) {
- case NL80211_IFTYPE_AP:
-@@ -966,6 +1054,8 @@ static int ath9k_add_interface(struct ie
- struct ath_softc *sc = hw->priv;
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-+ struct ath_vif *avp = (void *)vif->drv_priv;
-+ struct ath_node *an = &avp->mcast_node;
-
- mutex_lock(&sc->mutex);
-
-@@ -979,6 +1069,12 @@ static int ath9k_add_interface(struct ie
- if (ath9k_uses_beacons(vif->type))
- ath9k_beacon_assign_slot(sc, vif);
-
-+ an->sc = sc;
-+ an->sta = NULL;
-+ an->vif = vif;
-+ an->no_ps_filter = true;
-+ ath_tx_node_init(sc, an);
-+
- mutex_unlock(&sc->mutex);
- return 0;
- }
-@@ -1016,6 +1112,7 @@ static void ath9k_remove_interface(struc
- {
- struct ath_softc *sc = hw->priv;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ struct ath_vif *avp = (void *)vif->drv_priv;
-
- ath_dbg(common, CONFIG, "Detach Interface\n");
-
-@@ -1030,6 +1127,8 @@ static void ath9k_remove_interface(struc
- ath9k_calculate_summary_state(hw, NULL);
- ath9k_ps_restore(sc);
-
-+ ath_tx_node_cleanup(sc, &avp->mcast_node);
-+
- mutex_unlock(&sc->mutex);
- }
-
-@@ -1192,83 +1291,12 @@ static int ath9k_config(struct ieee80211
- }
-
- if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
-- struct ieee80211_channel *curchan = hw->conf.chandef.chan;
-- enum nl80211_channel_type channel_type =
-- cfg80211_get_chandef_type(&conf->chandef);
-- int pos = curchan->hw_value;
-- int old_pos = -1;
-- unsigned long flags;
--
-- if (ah->curchan)
-- old_pos = ah->curchan - &ah->channels[0];
--
-- ath_dbg(common, CONFIG, "Set channel: %d MHz type: %d\n",
-- curchan->center_freq, channel_type);
--
-- /* update survey stats for the old channel before switching */
-- spin_lock_irqsave(&common->cc_lock, flags);
-- ath_update_survey_stats(sc);
-- spin_unlock_irqrestore(&common->cc_lock, flags);
--
-- ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],
-- curchan, channel_type);
--
-- /*
-- * If the operating channel changes, change the survey in-use flags
-- * along with it.
-- * Reset the survey data for the new channel, unless we're switching
-- * back to the operating channel from an off-channel operation.
-- */
-- if (!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL) &&
-- sc->cur_survey != &sc->survey[pos]) {
--
-- if (sc->cur_survey)
-- sc->cur_survey->filled &= ~SURVEY_INFO_IN_USE;
--
-- sc->cur_survey = &sc->survey[pos];
--
-- memset(sc->cur_survey, 0, sizeof(struct survey_info));
-- sc->cur_survey->filled |= SURVEY_INFO_IN_USE;
-- } else if (!(sc->survey[pos].filled & SURVEY_INFO_IN_USE)) {
-- memset(&sc->survey[pos], 0, sizeof(struct survey_info));
-- }
--
-- if (ath_set_channel(sc, hw, &sc->sc_ah->channels[pos]) < 0) {
-+ if (ath_set_channel(sc, &hw->conf.chandef) < 0) {
- ath_err(common, "Unable to set channel\n");
- mutex_unlock(&sc->mutex);
- ath9k_ps_restore(sc);
- return -EINVAL;
- }
--
-- /*
-- * The most recent snapshot of channel->noisefloor for the old
-- * channel is only available after the hardware reset. Copy it to
-- * the survey stats now.
-- */
-- if (old_pos >= 0)
-- ath_update_survey_nf(sc, old_pos);
--
-- /*
-- * Enable radar pulse detection if on a DFS channel. Spectral
-- * scanning and radar detection can not be used concurrently.
-- */
-- if (hw->conf.radar_enabled) {
-- u32 rxfilter;
--
-- /* set HW specific DFS configuration */
-- ath9k_hw_set_radar_params(ah);
-- rxfilter = ath9k_hw_getrxfilter(ah);
-- rxfilter |= ATH9K_RX_FILTER_PHYRADAR |
-- ATH9K_RX_FILTER_PHYERR;
-- ath9k_hw_setrxfilter(ah, rxfilter);
-- ath_dbg(common, DFS, "DFS enabled at freq %d\n",
-- curchan->center_freq);
-- } else {
-- /* perform spectral scan if requested. */
-- if (test_bit(SC_OP_SCANNING, &sc->sc_flags) &&
-- sc->spectral_mode == SPECTRAL_CHANSCAN)
-- ath9k_spectral_scan_trigger(hw);
-- }
- }
-
- if (changed & IEEE80211_CONF_CHANGE_POWER) {
-@@ -1374,9 +1402,6 @@ static void ath9k_sta_notify(struct ieee
- struct ath_softc *sc = hw->priv;
- struct ath_node *an = (struct ath_node *) sta->drv_priv;
-
-- if (!sta->ht_cap.ht_supported)
-- return;
--
- switch (cmd) {
- case STA_NOTIFY_SLEEP:
- an->sleeping = true;
-@@ -1772,13 +1797,31 @@ static void ath9k_set_coverage_class(str
- mutex_unlock(&sc->mutex);
- }
-
-+static bool ath9k_has_tx_pending(struct ath_softc *sc)
-+{
-+ int i, npend;
-+
-+ for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-+ if (!ATH_TXQ_SETUP(sc, i))
-+ continue;
-+
-+ if (!sc->tx.txq[i].axq_depth)
-+ continue;
-+
-+ npend = ath9k_has_pending_frames(sc, &sc->tx.txq[i]);
-+ if (npend)
-+ break;
-+ }
-+
-+ return !!npend;
-+}
++ return !!npend;
++}
+
static void ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
{
@@ -1961,7 +735,7 @@
bool drain_txq;
mutex_lock(&sc->mutex);
-@@ -1796,25 +1839,9 @@ static void ath9k_flush(struct ieee80211
+@@ -1841,25 +1881,9 @@ static void ath9k_flush(struct ieee80211
return;
}
@@ -1990,7383 +764,3610 @@
if (drop) {
ath9k_ps_wakeup(sc);
-@@ -2094,7 +2121,7 @@ static void ath9k_wow_add_pattern(struct
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath9k_wow_pattern *wow_pattern = NULL;
-- struct cfg80211_wowlan_trig_pkt_pattern *patterns = wowlan->patterns;
-+ struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
- int mask_len;
- s8 i = 0;
-
---- a/drivers/net/wireless/mwifiex/cfg80211.c
-+++ b/drivers/net/wireless/mwifiex/cfg80211.c
-@@ -2298,8 +2298,7 @@ EXPORT_SYMBOL_GPL(mwifiex_del_virtual_in
-
- #ifdef CONFIG_PM
- static bool
--mwifiex_is_pattern_supported(struct cfg80211_wowlan_trig_pkt_pattern *pat,
-- s8 *byte_seq)
-+mwifiex_is_pattern_supported(struct cfg80211_pkt_pattern *pat, s8 *byte_seq)
- {
- int j, k, valid_byte_cnt = 0;
- bool dont_care_byte = false;
---- a/drivers/net/wireless/ti/wlcore/main.c
-+++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -1315,7 +1315,7 @@ static struct sk_buff *wl12xx_alloc_dumm
-
- #ifdef CONFIG_PM
- static int
--wl1271_validate_wowlan_pattern(struct cfg80211_wowlan_trig_pkt_pattern *p)
-+wl1271_validate_wowlan_pattern(struct cfg80211_pkt_pattern *p)
- {
- int num_fields = 0, in_field = 0, fields_size = 0;
- int i, pattern_len = 0;
-@@ -1458,9 +1458,9 @@ void wl1271_rx_filter_flatten_fields(str
- * Allocates an RX filter returned through f
- * which needs to be freed using rx_filter_free()
- */
--static int wl1271_convert_wowlan_pattern_to_rx_filter(
-- struct cfg80211_wowlan_trig_pkt_pattern *p,
-- struct wl12xx_rx_filter **f)
-+static int
-+wl1271_convert_wowlan_pattern_to_rx_filter(struct cfg80211_pkt_pattern *p,
-+ struct wl12xx_rx_filter **f)
- {
- int i, j, ret = 0;
- struct wl12xx_rx_filter *filter;
-@@ -1562,7 +1562,7 @@ static int wl1271_configure_wowlan(struc
-
- /* Translate WoWLAN patterns into filters */
- for (i = 0; i < wow->n_patterns; i++) {
-- struct cfg80211_wowlan_trig_pkt_pattern *p;
-+ struct cfg80211_pkt_pattern *p;
- struct wl12xx_rx_filter *filter = NULL;
-
- p = &wow->patterns[i];
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -639,6 +639,30 @@ struct cfg80211_ap_settings {
- };
-
- /**
-+ * struct cfg80211_csa_settings - channel switch settings
-+ *
-+ * Used for channel switch
-+ *
-+ * @chandef: defines the channel to use after the switch
-+ * @beacon_csa: beacon data while performing the switch
-+ * @counter_offset_beacon: offset for the counter within the beacon (tail)
-+ * @counter_offset_presp: offset for the counter within the probe response
-+ * @beacon_after: beacon data to be used on the new channel
-+ * @radar_required: whether radar detection is required on the new channel
-+ * @block_tx: whether transmissions should be blocked while changing
-+ * @count: number of beacons until switch
-+ */
-+struct cfg80211_csa_settings {
-+ struct cfg80211_chan_def chandef;
-+ struct cfg80211_beacon_data beacon_csa;
-+ u16 counter_offset_beacon, counter_offset_presp;
-+ struct cfg80211_beacon_data beacon_after;
-+ bool radar_required;
-+ bool block_tx;
-+ u8 count;
-+};
-+
-+/**
- * enum station_parameters_apply_mask - station parameter values to apply
- * @STATION_PARAM_APPLY_UAPSD: apply new uAPSD parameters (uapsd_queues, max_sp)
- * @STATION_PARAM_APPLY_CAPABILITY: apply new capability
-@@ -1698,7 +1722,7 @@ struct cfg80211_pmksa {
- };
-
- /**
-- * struct cfg80211_wowlan_trig_pkt_pattern - packet pattern
-+ * struct cfg80211_pkt_pattern - packet pattern
- * @mask: bitmask where to match pattern and where to ignore bytes,
- * one bit per byte, in same format as nl80211
- * @pattern: bytes to match where bitmask is 1
-@@ -1708,7 +1732,7 @@ struct cfg80211_pmksa {
- * Internal note: @mask and @pattern are allocated in one chunk of
- * memory, free @mask only!
- */
--struct cfg80211_wowlan_trig_pkt_pattern {
-+struct cfg80211_pkt_pattern {
- u8 *mask, *pattern;
- int pattern_len;
- int pkt_offset;
-@@ -1770,7 +1794,7 @@ struct cfg80211_wowlan {
- bool any, disconnect, magic_pkt, gtk_rekey_failure,
- eap_identity_req, four_way_handshake,
- rfkill_release;
-- struct cfg80211_wowlan_trig_pkt_pattern *patterns;
-+ struct cfg80211_pkt_pattern *patterns;
- struct cfg80211_wowlan_tcp *tcp;
- int n_patterns;
- };
-@@ -2071,6 +2095,8 @@ struct cfg80211_update_ft_ies_params {
- * driver can take the most appropriate actions.
- * @crit_proto_stop: Indicates critical protocol no longer needs increased link
- * reliability. This operation can not fail.
-+ *
-+ * @channel_switch: initiate channel-switch procedure (with CSA)
- */
- struct cfg80211_ops {
- int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
-@@ -2306,6 +2332,10 @@ struct cfg80211_ops {
- u16 duration);
- void (*crit_proto_stop)(struct wiphy *wiphy,
- struct wireless_dev *wdev);
-+
-+ int (*channel_switch)(struct wiphy *wiphy,
-+ struct net_device *dev,
-+ struct cfg80211_csa_settings *params);
- };
-
- /*
-@@ -2371,6 +2401,8 @@ struct cfg80211_ops {
- * @WIPHY_FLAG_OFFCHAN_TX: Device supports direct off-channel TX.
- * @WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL: Device supports remain-on-channel call.
- * @WIPHY_FLAG_SUPPORTS_5_10_MHZ: Device supports 5 MHz and 10 MHz channels.
-+ * @WIPHY_FLAG_HAS_CHANNEL_SWITCH: Device supports channel switch in
-+ * beaconing mode (AP, IBSS, Mesh, ...).
- */
- enum wiphy_flags {
- WIPHY_FLAG_CUSTOM_REGULATORY = BIT(0),
-@@ -2395,6 +2427,7 @@ enum wiphy_flags {
- WIPHY_FLAG_OFFCHAN_TX = BIT(20),
- WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL = BIT(21),
- WIPHY_FLAG_SUPPORTS_5_10_MHZ = BIT(22),
-+ WIPHY_FLAG_HAS_CHANNEL_SWITCH = BIT(23),
- };
-
- /**
---- a/include/uapi/linux/nl80211.h
-+++ b/include/uapi/linux/nl80211.h
-@@ -648,6 +648,16 @@
- * @NL80211_CMD_CRIT_PROTOCOL_STOP: Indicates the connection reliability can
- * return back to normal.
- *
-+ * @NL80211_CMD_CHANNEL_SWITCH: Perform a channel switch by announcing the
-+ * the new channel information (Channel Switch Announcement - CSA)
-+ * in the beacon for some time (as defined in the
-+ * %NL80211_ATTR_CH_SWITCH_COUNT parameter) and then change to the
-+ * new channel. Userspace provides the new channel information (using
-+ * %NL80211_ATTR_WIPHY_FREQ and the attributes determining channel
-+ * width). %NL80211_ATTR_CH_SWITCH_BLOCK_TX may be supplied to inform
-+ * other station that transmission must be blocked until the channel
-+ * switch is complete.
-+ *
- * @NL80211_CMD_MAX: highest used command number
- * @__NL80211_CMD_AFTER_LAST: internal use
- */
-@@ -810,6 +820,8 @@ enum nl80211_commands {
- NL80211_CMD_CRIT_PROTOCOL_START,
- NL80211_CMD_CRIT_PROTOCOL_STOP,
-
-+ NL80211_CMD_CHANNEL_SWITCH,
-+
- /* add new commands above here */
-
- /* used to define NL80211_CMD_MAX below */
-@@ -1436,6 +1448,18 @@ enum nl80211_commands {
- * allowed to be used with the first @NL80211_CMD_SET_STATION command to
- * update a TDLS peer STA entry.
- *
-+ * @NL80211_ATTR_CH_SWITCH_COUNT: u32 attribute specifying the number of TBTT's
-+ * until the channel switch event.
-+ * @NL80211_ATTR_CH_SWITCH_BLOCK_TX: flag attribute specifying that transmission
-+ * must be blocked on the current channel (before the channel switch
-+ * operation).
-+ * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information
-+ * for the time while performing a channel switch.
-+ * @NL80211_ATTR_CSA_C_OFF_BEACON: Offset of the channel switch counter
-+ * field in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
-+ * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
-+ * field in the probe response (%NL80211_ATTR_PROBE_RESP).
-+ *
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
- */
-@@ -1736,6 +1760,12 @@ enum nl80211_attrs {
-
- NL80211_ATTR_PEER_AID,
-
-+ NL80211_ATTR_CH_SWITCH_COUNT,
-+ NL80211_ATTR_CH_SWITCH_BLOCK_TX,
-+ NL80211_ATTR_CSA_IES,
-+ NL80211_ATTR_CSA_C_OFF_BEACON,
-+ NL80211_ATTR_CSA_C_OFF_PRESP,
-+
- /* add attributes here, update the policy in nl80211.c */
-
- __NL80211_ATTR_AFTER_LAST,
-@@ -3060,11 +3090,11 @@ enum nl80211_tx_power_setting {
- };
-
- /**
-- * enum nl80211_wowlan_packet_pattern_attr - WoWLAN packet pattern attribute
-- * @__NL80211_WOWLAN_PKTPAT_INVALID: invalid number for nested attribute
-- * @NL80211_WOWLAN_PKTPAT_PATTERN: the pattern, values where the mask has
-+ * enum nl80211_packet_pattern_attr - packet pattern attribute
-+ * @__NL80211_PKTPAT_INVALID: invalid number for nested attribute
-+ * @NL80211_PKTPAT_PATTERN: the pattern, values where the mask has
- * a zero bit are ignored
-- * @NL80211_WOWLAN_PKTPAT_MASK: pattern mask, must be long enough to have
-+ * @NL80211_PKTPAT_MASK: pattern mask, must be long enough to have
- * a bit for each byte in the pattern. The lowest-order bit corresponds
- * to the first byte of the pattern, but the bytes of the pattern are
- * in a little-endian-like format, i.e. the 9th byte of the pattern
-@@ -3075,23 +3105,23 @@ enum nl80211_tx_power_setting {
- * Note that the pattern matching is done as though frames were not
- * 802.11 frames but 802.3 frames, i.e. the frame is fully unpacked
- * first (including SNAP header unpacking) and then matched.
-- * @NL80211_WOWLAN_PKTPAT_OFFSET: packet offset, pattern is matched after
-+ * @NL80211_PKTPAT_OFFSET: packet offset, pattern is matched after
- * these fixed number of bytes of received packet
-- * @NUM_NL80211_WOWLAN_PKTPAT: number of attributes
-- * @MAX_NL80211_WOWLAN_PKTPAT: max attribute number
-+ * @NUM_NL80211_PKTPAT: number of attributes
-+ * @MAX_NL80211_PKTPAT: max attribute number
- */
--enum nl80211_wowlan_packet_pattern_attr {
-- __NL80211_WOWLAN_PKTPAT_INVALID,
-- NL80211_WOWLAN_PKTPAT_MASK,
-- NL80211_WOWLAN_PKTPAT_PATTERN,
-- NL80211_WOWLAN_PKTPAT_OFFSET,
-+enum nl80211_packet_pattern_attr {
-+ __NL80211_PKTPAT_INVALID,
-+ NL80211_PKTPAT_MASK,
-+ NL80211_PKTPAT_PATTERN,
-+ NL80211_PKTPAT_OFFSET,
-
-- NUM_NL80211_WOWLAN_PKTPAT,
-- MAX_NL80211_WOWLAN_PKTPAT = NUM_NL80211_WOWLAN_PKTPAT - 1,
-+ NUM_NL80211_PKTPAT,
-+ MAX_NL80211_PKTPAT = NUM_NL80211_PKTPAT - 1,
- };
-
- /**
-- * struct nl80211_wowlan_pattern_support - pattern support information
-+ * struct nl80211_pattern_support - packet pattern support information
- * @max_patterns: maximum number of patterns supported
- * @min_pattern_len: minimum length of each pattern
- * @max_pattern_len: maximum length of each pattern
-@@ -3101,13 +3131,22 @@ enum nl80211_wowlan_packet_pattern_attr
- * that is part of %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED in the
- * capability information given by the kernel to userspace.
- */
--struct nl80211_wowlan_pattern_support {
-+struct nl80211_pattern_support {
- __u32 max_patterns;
- __u32 min_pattern_len;
- __u32 max_pattern_len;
- __u32 max_pkt_offset;
- } __attribute__((packed));
-
-+/* only for backward compatibility */
-+#define __NL80211_WOWLAN_PKTPAT_INVALID __NL80211_PKTPAT_INVALID
-+#define NL80211_WOWLAN_PKTPAT_MASK NL80211_PKTPAT_MASK
-+#define NL80211_WOWLAN_PKTPAT_PATTERN NL80211_PKTPAT_PATTERN
-+#define NL80211_WOWLAN_PKTPAT_OFFSET NL80211_PKTPAT_OFFSET
-+#define NUM_NL80211_WOWLAN_PKTPAT NUM_NL80211_PKTPAT
-+#define MAX_NL80211_WOWLAN_PKTPAT MAX_NL80211_PKTPAT
-+#define nl80211_wowlan_pattern_support nl80211_pattern_support
-+
- /**
- * enum nl80211_wowlan_triggers - WoWLAN trigger definitions
- * @__NL80211_WOWLAN_TRIG_INVALID: invalid number for nested attributes
-@@ -3127,7 +3166,7 @@ struct nl80211_wowlan_pattern_support {
- * pattern matching is done after the packet is converted to the MSDU.
- *
- * In %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED, it is a binary attribute
-- * carrying a &struct nl80211_wowlan_pattern_support.
-+ * carrying a &struct nl80211_pattern_support.
- *
- * When reporting wakeup. it is a u32 attribute containing the 0-based
- * index of the pattern that caused the wakeup, in the patterns passed
-@@ -3284,7 +3323,7 @@ struct nl80211_wowlan_tcp_data_token_fea
- * @NL80211_WOWLAN_TCP_WAKE_PAYLOAD: wake packet payload, for advertising a
- * u32 attribute holding the maximum length
- * @NL80211_WOWLAN_TCP_WAKE_MASK: Wake packet payload mask, not used for
-- * feature advertising. The mask works like @NL80211_WOWLAN_PKTPAT_MASK
-+ * feature advertising. The mask works like @NL80211_PKTPAT_MASK
- * but on the TCP payload only.
- * @NUM_NL80211_WOWLAN_TCP: number of TCP attributes
- * @MAX_NL80211_WOWLAN_TCP: highest attribute number
---- a/net/mac80211/mesh_ps.c
-+++ b/net/mac80211/mesh_ps.c
-@@ -229,6 +229,10 @@ void ieee80211_mps_sta_status_update(str
- enum nl80211_mesh_power_mode pm;
- bool do_buffer;
-
-+ /* For non-assoc STA, prevent buffering or frame transmission */
-+ if (sta->sta_state < IEEE80211_STA_ASSOC)
-+ return;
-+
- /*
- * use peer-specific power mode if peering is established and the
- * peer's power mode is known
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -349,6 +349,11 @@ static const struct nla_policy nl80211_p
- [NL80211_ATTR_IE_RIC] = { .type = NLA_BINARY,
- .len = IEEE80211_MAX_DATA_LEN },
- [NL80211_ATTR_PEER_AID] = { .type = NLA_U16 },
-+ [NL80211_ATTR_CH_SWITCH_COUNT] = { .type = NLA_U32 },
-+ [NL80211_ATTR_CH_SWITCH_BLOCK_TX] = { .type = NLA_FLAG },
-+ [NL80211_ATTR_CSA_IES] = { .type = NLA_NESTED },
-+ [NL80211_ATTR_CSA_C_OFF_BEACON] = { .type = NLA_U16 },
-+ [NL80211_ATTR_CSA_C_OFF_PRESP] = { .type = NLA_U16 },
- };
-
- /* policy for the key attributes */
-@@ -441,10 +446,12 @@ static int nl80211_prepare_wdev_dump(str
- goto out_unlock;
- }
- *rdev = wiphy_to_dev((*wdev)->wiphy);
-- cb->args[0] = (*rdev)->wiphy_idx;
-+ /* 0 is the first index - add 1 to parse only once */
-+ cb->args[0] = (*rdev)->wiphy_idx + 1;
- cb->args[1] = (*wdev)->identifier;
- } else {
-- struct wiphy *wiphy = wiphy_idx_to_wiphy(cb->args[0]);
-+ /* subtract the 1 again here */
-+ struct wiphy *wiphy = wiphy_idx_to_wiphy(cb->args[0] - 1);
- struct wireless_dev *tmp;
-
- if (!wiphy) {
-@@ -974,7 +981,7 @@ static int nl80211_send_wowlan(struct sk
- return -ENOBUFS;
-
- if (dev->wiphy.wowlan->n_patterns) {
-- struct nl80211_wowlan_pattern_support pat = {
-+ struct nl80211_pattern_support pat = {
- .max_patterns = dev->wiphy.wowlan->n_patterns,
- .min_pattern_len = dev->wiphy.wowlan->pattern_min_len,
- .max_pattern_len = dev->wiphy.wowlan->pattern_max_len,
-@@ -1393,6 +1400,8 @@ static int nl80211_send_wiphy(struct cfg
- if (state->split) {
- CMD(crit_proto_start, CRIT_PROTOCOL_START);
- CMD(crit_proto_stop, CRIT_PROTOCOL_STOP);
-+ if (dev->wiphy.flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH)
-+ CMD(channel_switch, CHANNEL_SWITCH);
- }
-
- #ifdef CPTCFG_NL80211_TESTMODE
-@@ -1568,8 +1577,10 @@ static int nl80211_dump_wiphy(struct sk_
- rtnl_lock();
- if (!state) {
- state = kzalloc(sizeof(*state), GFP_KERNEL);
-- if (!state)
-+ if (!state) {
-+ rtnl_unlock();
- return -ENOMEM;
-+ }
- state->filter_wiphy = -1;
- ret = nl80211_dump_wiphy_parse(skb, cb, state);
- if (ret) {
-@@ -2620,8 +2631,8 @@ static int nl80211_get_key(struct sk_buf
-
- hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
- NL80211_CMD_NEW_KEY);
-- if (IS_ERR(hdr))
-- return PTR_ERR(hdr);
-+ if (!hdr)
-+ return -ENOBUFS;
-
- cookie.msg = msg;
- cookie.idx = key_idx;
-@@ -4770,9 +4781,9 @@ do { \
- FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding, 0, 1,
- mask, NL80211_MESHCONF_FORWARDING,
- nla_get_u8);
-- FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, 1, 255,
-+ FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, -255, 0,
- mask, NL80211_MESHCONF_RSSI_THRESHOLD,
-- nla_get_u32);
-+ nla_get_s32);
- FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode, 0, 16,
- mask, NL80211_MESHCONF_HT_OPMODE,
- nla_get_u16);
-@@ -5578,6 +5589,111 @@ static int nl80211_start_radar_detection
- return err;
- }
-
-+static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
-+{
-+ struct cfg80211_registered_device *rdev = info->user_ptr[0];
-+ struct net_device *dev = info->user_ptr[1];
-+ struct wireless_dev *wdev = dev->ieee80211_ptr;
-+ struct cfg80211_csa_settings params;
-+ /* csa_attrs is defined static to avoid waste of stack size - this
-+ * function is called under RTNL lock, so this should not be a problem.
-+ */
-+ static struct nlattr *csa_attrs[NL80211_ATTR_MAX+1];
-+ u8 radar_detect_width = 0;
-+ int err;
-+
-+ if (!rdev->ops->channel_switch ||
-+ !(rdev->wiphy.flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH))
-+ return -EOPNOTSUPP;
-+
-+ /* may add IBSS support later */
-+ if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
-+ dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)
-+ return -EOPNOTSUPP;
-+
-+ memset(¶ms, 0, sizeof(params));
-+
-+ if (!info->attrs[NL80211_ATTR_WIPHY_FREQ] ||
-+ !info->attrs[NL80211_ATTR_CH_SWITCH_COUNT])
-+ return -EINVAL;
-+
-+ /* only important for AP, IBSS and mesh create IEs internally */
-+ if (!info->attrs[NL80211_ATTR_CSA_IES])
-+ return -EINVAL;
-+
-+ /* useless if AP is not running */
-+ if (!wdev->beacon_interval)
-+ return -EINVAL;
-+
-+ params.count = nla_get_u32(info->attrs[NL80211_ATTR_CH_SWITCH_COUNT]);
-+
-+ err = nl80211_parse_beacon(info->attrs, ¶ms.beacon_after);
-+ if (err)
-+ return err;
-+
-+ err = nla_parse_nested(csa_attrs, NL80211_ATTR_MAX,
-+ info->attrs[NL80211_ATTR_CSA_IES],
-+ nl80211_policy);
-+ if (err)
-+ return err;
-+
-+ err = nl80211_parse_beacon(csa_attrs, ¶ms.beacon_csa);
-+ if (err)
-+ return err;
-+
-+ if (!csa_attrs[NL80211_ATTR_CSA_C_OFF_BEACON])
-+ return -EINVAL;
-+
-+ params.counter_offset_beacon =
-+ nla_get_u16(csa_attrs[NL80211_ATTR_CSA_C_OFF_BEACON]);
-+ if (params.counter_offset_beacon >= params.beacon_csa.tail_len)
-+ return -EINVAL;
-+
-+ /* sanity check - counters should be the same */
-+ if (params.beacon_csa.tail[params.counter_offset_beacon] !=
-+ params.count)
-+ return -EINVAL;
-+
-+ if (csa_attrs[NL80211_ATTR_CSA_C_OFF_PRESP]) {
-+ params.counter_offset_presp =
-+ nla_get_u16(csa_attrs[NL80211_ATTR_CSA_C_OFF_PRESP]);
-+ if (params.counter_offset_presp >=
-+ params.beacon_csa.probe_resp_len)
-+ return -EINVAL;
-+
-+ if (params.beacon_csa.probe_resp[params.counter_offset_presp] !=
-+ params.count)
-+ return -EINVAL;
-+ }
-+
-+ err = nl80211_parse_chandef(rdev, info, ¶ms.chandef);
-+ if (err)
-+ return err;
-+
-+ if (!cfg80211_reg_can_beacon(&rdev->wiphy, ¶ms.chandef))
-+ return -EINVAL;
-+
-+ err = cfg80211_chandef_dfs_required(wdev->wiphy, ¶ms.chandef);
-+ if (err < 0) {
-+ return err;
-+ } else if (err) {
-+ radar_detect_width = BIT(params.chandef.width);
-+ params.radar_required = true;
-+ }
-+
-+ err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype,
-+ params.chandef.chan,
-+ CHAN_MODE_SHARED,
-+ radar_detect_width);
-+ if (err)
-+ return err;
-+
-+ if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX])
-+ params.block_tx = true;
-+
-+ return rdev_channel_switch(rdev, dev, ¶ms);
-+}
-+
- static int nl80211_send_bss(struct sk_buff *msg, struct netlink_callback *cb,
- u32 seq, int flags,
- struct cfg80211_registered_device *rdev,
-@@ -6507,6 +6623,9 @@ static int nl80211_testmode_dump(struct
- NL80211_CMD_TESTMODE);
- struct nlattr *tmdata;
-
-+ if (!hdr)
-+ break;
-+
- if (nla_put_u32(skb, NL80211_ATTR_WIPHY, phy_idx)) {
- genlmsg_cancel(skb, hdr);
- break;
-@@ -6615,12 +6734,14 @@ EXPORT_SYMBOL(cfg80211_testmode_alloc_ev
-
- void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
- {
-+ struct cfg80211_registered_device *rdev = ((void **)skb->cb)[0];
- void *hdr = ((void **)skb->cb)[1];
- struct nlattr *data = ((void **)skb->cb)[2];
-
- nla_nest_end(skb, data);
- genlmsg_end(skb, hdr);
-- genlmsg_multicast(skb, 0, nl80211_testmode_mcgrp.id, gfp);
-+ genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
-+ nl80211_testmode_mcgrp.id, gfp);
+@@ -2021,333 +2045,6 @@ static int ath9k_get_antenna(struct ieee
+ return 0;
}
- EXPORT_SYMBOL(cfg80211_testmode_event);
- #endif
-@@ -6949,9 +7070,8 @@ static int nl80211_remain_on_channel(str
- hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
- NL80211_CMD_REMAIN_ON_CHANNEL);
+-#ifdef CONFIG_PM_SLEEP
-
-- if (IS_ERR(hdr)) {
-- err = PTR_ERR(hdr);
-+ if (!hdr) {
-+ err = -ENOBUFS;
- goto free_msg;
- }
-
-@@ -7249,9 +7369,8 @@ static int nl80211_tx_mgmt(struct sk_buf
-
- hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
- NL80211_CMD_FRAME);
+-static void ath9k_wow_map_triggers(struct ath_softc *sc,
+- struct cfg80211_wowlan *wowlan,
+- u32 *wow_triggers)
+-{
+- if (wowlan->disconnect)
+- *wow_triggers |= AH_WOW_LINK_CHANGE |
+- AH_WOW_BEACON_MISS;
+- if (wowlan->magic_pkt)
+- *wow_triggers |= AH_WOW_MAGIC_PATTERN_EN;
-
-- if (IS_ERR(hdr)) {
-- err = PTR_ERR(hdr);
-+ if (!hdr) {
-+ err = -ENOBUFS;
- goto free_msg;
- }
- }
-@@ -7593,12 +7712,11 @@ static int nl80211_send_wowlan_patterns(
- if (!nl_pat)
- return -ENOBUFS;
- pat_len = wowlan->patterns[i].pattern_len;
-- if (nla_put(msg, NL80211_WOWLAN_PKTPAT_MASK,
-- DIV_ROUND_UP(pat_len, 8),
-+ if (nla_put(msg, NL80211_PKTPAT_MASK, DIV_ROUND_UP(pat_len, 8),
- wowlan->patterns[i].mask) ||
-- nla_put(msg, NL80211_WOWLAN_PKTPAT_PATTERN,
-- pat_len, wowlan->patterns[i].pattern) ||
-- nla_put_u32(msg, NL80211_WOWLAN_PKTPAT_OFFSET,
-+ nla_put(msg, NL80211_PKTPAT_PATTERN, pat_len,
-+ wowlan->patterns[i].pattern) ||
-+ nla_put_u32(msg, NL80211_PKTPAT_OFFSET,
- wowlan->patterns[i].pkt_offset))
- return -ENOBUFS;
- nla_nest_end(msg, nl_pat);
-@@ -7939,7 +8057,7 @@ static int nl80211_set_wowlan(struct sk_
- struct nlattr *pat;
- int n_patterns = 0;
- int rem, pat_len, mask_len, pkt_offset;
-- struct nlattr *pat_tb[NUM_NL80211_WOWLAN_PKTPAT];
-+ struct nlattr *pat_tb[NUM_NL80211_PKTPAT];
-
- nla_for_each_nested(pat, tb[NL80211_WOWLAN_TRIG_PKT_PATTERN],
- rem)
-@@ -7958,26 +8076,25 @@ static int nl80211_set_wowlan(struct sk_
-
- nla_for_each_nested(pat, tb[NL80211_WOWLAN_TRIG_PKT_PATTERN],
- rem) {
-- nla_parse(pat_tb, MAX_NL80211_WOWLAN_PKTPAT,
-- nla_data(pat), nla_len(pat), NULL);
-+ nla_parse(pat_tb, MAX_NL80211_PKTPAT, nla_data(pat),
-+ nla_len(pat), NULL);
- err = -EINVAL;
-- if (!pat_tb[NL80211_WOWLAN_PKTPAT_MASK] ||
-- !pat_tb[NL80211_WOWLAN_PKTPAT_PATTERN])
-+ if (!pat_tb[NL80211_PKTPAT_MASK] ||
-+ !pat_tb[NL80211_PKTPAT_PATTERN])
- goto error;
-- pat_len = nla_len(pat_tb[NL80211_WOWLAN_PKTPAT_PATTERN]);
-+ pat_len = nla_len(pat_tb[NL80211_PKTPAT_PATTERN]);
- mask_len = DIV_ROUND_UP(pat_len, 8);
-- if (nla_len(pat_tb[NL80211_WOWLAN_PKTPAT_MASK]) !=
-- mask_len)
-+ if (nla_len(pat_tb[NL80211_PKTPAT_MASK]) != mask_len)
- goto error;
- if (pat_len > wowlan->pattern_max_len ||
- pat_len < wowlan->pattern_min_len)
- goto error;
-
-- if (!pat_tb[NL80211_WOWLAN_PKTPAT_OFFSET])
-+ if (!pat_tb[NL80211_PKTPAT_OFFSET])
- pkt_offset = 0;
- else
- pkt_offset = nla_get_u32(
-- pat_tb[NL80211_WOWLAN_PKTPAT_OFFSET]);
-+ pat_tb[NL80211_PKTPAT_OFFSET]);
- if (pkt_offset > wowlan->max_pkt_offset)
- goto error;
- new_triggers.patterns[i].pkt_offset = pkt_offset;
-@@ -7991,11 +8108,11 @@ static int nl80211_set_wowlan(struct sk_
- new_triggers.patterns[i].pattern =
- new_triggers.patterns[i].mask + mask_len;
- memcpy(new_triggers.patterns[i].mask,
-- nla_data(pat_tb[NL80211_WOWLAN_PKTPAT_MASK]),
-+ nla_data(pat_tb[NL80211_PKTPAT_MASK]),
- mask_len);
- new_triggers.patterns[i].pattern_len = pat_len;
- memcpy(new_triggers.patterns[i].pattern,
-- nla_data(pat_tb[NL80211_WOWLAN_PKTPAT_PATTERN]),
-+ nla_data(pat_tb[NL80211_PKTPAT_PATTERN]),
- pat_len);
- i++;
- }
-@@ -8130,9 +8247,8 @@ static int nl80211_probe_client(struct s
-
- hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
- NL80211_CMD_PROBE_CLIENT);
+- if (wowlan->n_patterns)
+- *wow_triggers |= AH_WOW_USER_PATTERN_EN;
-
-- if (IS_ERR(hdr)) {
-- err = PTR_ERR(hdr);
-+ if (!hdr) {
-+ err = -ENOBUFS;
- goto free_msg;
- }
-
-@@ -9041,7 +9157,15 @@ static struct genl_ops nl80211_ops[] = {
- .flags = GENL_ADMIN_PERM,
- .internal_flags = NL80211_FLAG_NEED_WDEV_UP |
- NL80211_FLAG_NEED_RTNL,
-- }
-+ },
-+ {
-+ .cmd = NL80211_CMD_CHANNEL_SWITCH,
-+ .doit = nl80211_channel_switch,
-+ .policy = nl80211_policy,
-+ .flags = GENL_ADMIN_PERM,
-+ .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
-+ NL80211_FLAG_NEED_RTNL,
-+ },
- };
-
- static struct genl_multicast_group nl80211_mlme_mcgrp = {
-@@ -10066,7 +10190,8 @@ void cfg80211_mgmt_tx_status(struct wire
-
- genlmsg_end(msg, hdr);
-
-- genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, gfp);
-+ genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
-+ nl80211_mlme_mcgrp.id, gfp);
- return;
-
- nla_put_failure:
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -2247,10 +2247,13 @@ int reg_device_uevent(struct device *dev
-
- void wiphy_regulatory_register(struct wiphy *wiphy)
- {
-+ struct regulatory_request *lr;
-+
- if (!reg_dev_ignore_cell_hint(wiphy))
- reg_num_devs_support_basehint++;
-
-- wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE);
-+ lr = get_last_request();
-+ wiphy_update_regulatory(wiphy, lr->initiator);
- }
-
- void wiphy_regulatory_deregister(struct wiphy *wiphy)
-@@ -2279,7 +2282,9 @@ void wiphy_regulatory_deregister(struct
- static void reg_timeout_work(struct work_struct *work)
+- sc->wow_enabled = *wow_triggers;
+-
+-}
+-
+-static void ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)
+-{
+- struct ath_hw *ah = sc->sc_ah;
+- struct ath_common *common = ath9k_hw_common(ah);
+- int pattern_count = 0;
+- int i, byte_cnt;
+- u8 dis_deauth_pattern[MAX_PATTERN_SIZE];
+- u8 dis_deauth_mask[MAX_PATTERN_SIZE];
+-
+- memset(dis_deauth_pattern, 0, MAX_PATTERN_SIZE);
+- memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);
+-
+- /*
+- * Create Dissassociate / Deauthenticate packet filter
+- *
+- * 2 bytes 2 byte 6 bytes 6 bytes 6 bytes
+- * +--------------+----------+---------+--------+--------+----
+- * + Frame Control+ Duration + DA + SA + BSSID +
+- * +--------------+----------+---------+--------+--------+----
+- *
+- * The above is the management frame format for disassociate/
+- * deauthenticate pattern, from this we need to match the first byte
+- * of 'Frame Control' and DA, SA, and BSSID fields
+- * (skipping 2nd byte of FC and Duration feild.
+- *
+- * Disassociate pattern
+- * --------------------
+- * Frame control = 00 00 1010
+- * DA, SA, BSSID = x:x:x:x:x:x
+- * Pattern will be A0000000 | x:x:x:x:x:x | x:x:x:x:x:x
+- * | x:x:x:x:x:x -- 22 bytes
+- *
+- * Deauthenticate pattern
+- * ----------------------
+- * Frame control = 00 00 1100
+- * DA, SA, BSSID = x:x:x:x:x:x
+- * Pattern will be C0000000 | x:x:x:x:x:x | x:x:x:x:x:x
+- * | x:x:x:x:x:x -- 22 bytes
+- */
+-
+- /* Create Disassociate Pattern first */
+-
+- byte_cnt = 0;
+-
+- /* Fill out the mask with all FF's */
+-
+- for (i = 0; i < MAX_PATTERN_MASK_SIZE; i++)
+- dis_deauth_mask[i] = 0xff;
+-
+- /* copy the first byte of frame control field */
+- dis_deauth_pattern[byte_cnt] = 0xa0;
+- byte_cnt++;
+-
+- /* skip 2nd byte of frame control and Duration field */
+- byte_cnt += 3;
+-
+- /*
+- * need not match the destination mac address, it can be a broadcast
+- * mac address or an unicast to this station
+- */
+- byte_cnt += 6;
+-
+- /* copy the source mac address */
+- memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
+-
+- byte_cnt += 6;
+-
+- /* copy the bssid, its same as the source mac address */
+-
+- memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
+-
+- /* Create Disassociate pattern mask */
+-
+- dis_deauth_mask[0] = 0xfe;
+- dis_deauth_mask[1] = 0x03;
+- dis_deauth_mask[2] = 0xc0;
+-
+- ath_dbg(common, WOW, "Adding disassoc/deauth patterns for WoW\n");
+-
+- ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
+- pattern_count, byte_cnt);
+-
+- pattern_count++;
+- /*
+- * for de-authenticate pattern, only the first byte of the frame
+- * control field gets changed from 0xA0 to 0xC0
+- */
+- dis_deauth_pattern[0] = 0xC0;
+-
+- ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
+- pattern_count, byte_cnt);
+-
+-}
+-
+-static void ath9k_wow_add_pattern(struct ath_softc *sc,
+- struct cfg80211_wowlan *wowlan)
+-{
+- struct ath_hw *ah = sc->sc_ah;
+- struct ath9k_wow_pattern *wow_pattern = NULL;
+- struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
+- int mask_len;
+- s8 i = 0;
+-
+- if (!wowlan->n_patterns)
+- return;
+-
+- /*
+- * Add the new user configured patterns
+- */
+- for (i = 0; i < wowlan->n_patterns; i++) {
+-
+- wow_pattern = kzalloc(sizeof(*wow_pattern), GFP_KERNEL);
+-
+- if (!wow_pattern)
+- return;
+-
+- /*
+- * TODO: convert the generic user space pattern to
+- * appropriate chip specific/802.11 pattern.
+- */
+-
+- mask_len = DIV_ROUND_UP(wowlan->patterns[i].pattern_len, 8);
+- memset(wow_pattern->pattern_bytes, 0, MAX_PATTERN_SIZE);
+- memset(wow_pattern->mask_bytes, 0, MAX_PATTERN_SIZE);
+- memcpy(wow_pattern->pattern_bytes, patterns[i].pattern,
+- patterns[i].pattern_len);
+- memcpy(wow_pattern->mask_bytes, patterns[i].mask, mask_len);
+- wow_pattern->pattern_len = patterns[i].pattern_len;
+-
+- /*
+- * just need to take care of deauth and disssoc pattern,
+- * make sure we don't overwrite them.
+- */
+-
+- ath9k_hw_wow_apply_pattern(ah, wow_pattern->pattern_bytes,
+- wow_pattern->mask_bytes,
+- i + 2,
+- wow_pattern->pattern_len);
+- kfree(wow_pattern);
+-
+- }
+-
+-}
+-
+-static int ath9k_suspend(struct ieee80211_hw *hw,
+- struct cfg80211_wowlan *wowlan)
+-{
+- struct ath_softc *sc = hw->priv;
+- struct ath_hw *ah = sc->sc_ah;
+- struct ath_common *common = ath9k_hw_common(ah);
+- u32 wow_triggers_enabled = 0;
+- int ret = 0;
+-
+- mutex_lock(&sc->mutex);
+-
+- ath_cancel_work(sc);
+- ath_stop_ani(sc);
+- del_timer_sync(&sc->rx_poll_timer);
+-
+- if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
+- ath_dbg(common, ANY, "Device not present\n");
+- ret = -EINVAL;
+- goto fail_wow;
+- }
+-
+- if (WARN_ON(!wowlan)) {
+- ath_dbg(common, WOW, "None of the WoW triggers enabled\n");
+- ret = -EINVAL;
+- goto fail_wow;
+- }
+-
+- if (!device_can_wakeup(sc->dev)) {
+- ath_dbg(common, WOW, "device_can_wakeup failed, WoW is not enabled\n");
+- ret = 1;
+- goto fail_wow;
+- }
+-
+- /*
+- * none of the sta vifs are associated
+- * and we are not currently handling multivif
+- * cases, for instance we have to seperately
+- * configure 'keep alive frame' for each
+- * STA.
+- */
+-
+- if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
+- ath_dbg(common, WOW, "None of the STA vifs are associated\n");
+- ret = 1;
+- goto fail_wow;
+- }
+-
+- if (sc->nvifs > 1) {
+- ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
+- ret = 1;
+- goto fail_wow;
+- }
+-
+- ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled);
+-
+- ath_dbg(common, WOW, "WoW triggers enabled 0x%x\n",
+- wow_triggers_enabled);
+-
+- ath9k_ps_wakeup(sc);
+-
+- ath9k_stop_btcoex(sc);
+-
+- /*
+- * Enable wake up on recieving disassoc/deauth
+- * frame by default.
+- */
+- ath9k_wow_add_disassoc_deauth_pattern(sc);
+-
+- if (wow_triggers_enabled & AH_WOW_USER_PATTERN_EN)
+- ath9k_wow_add_pattern(sc, wowlan);
+-
+- spin_lock_bh(&sc->sc_pcu_lock);
+- /*
+- * To avoid false wake, we enable beacon miss interrupt only
+- * when we go to sleep. We save the current interrupt mask
+- * so we can restore it after the system wakes up
+- */
+- sc->wow_intr_before_sleep = ah->imask;
+- ah->imask &= ~ATH9K_INT_GLOBAL;
+- ath9k_hw_disable_interrupts(ah);
+- ah->imask = ATH9K_INT_BMISS | ATH9K_INT_GLOBAL;
+- ath9k_hw_set_interrupts(ah);
+- ath9k_hw_enable_interrupts(ah);
+-
+- spin_unlock_bh(&sc->sc_pcu_lock);
+-
+- /*
+- * we can now sync irq and kill any running tasklets, since we already
+- * disabled interrupts and not holding a spin lock
+- */
+- synchronize_irq(sc->irq);
+- tasklet_kill(&sc->intr_tq);
+-
+- ath9k_hw_wow_enable(ah, wow_triggers_enabled);
+-
+- ath9k_ps_restore(sc);
+- ath_dbg(common, ANY, "WoW enabled in ath9k\n");
+- atomic_inc(&sc->wow_sleep_proc_intr);
+-
+-fail_wow:
+- mutex_unlock(&sc->mutex);
+- return ret;
+-}
+-
+-static int ath9k_resume(struct ieee80211_hw *hw)
+-{
+- struct ath_softc *sc = hw->priv;
+- struct ath_hw *ah = sc->sc_ah;
+- struct ath_common *common = ath9k_hw_common(ah);
+- u32 wow_status;
+-
+- mutex_lock(&sc->mutex);
+-
+- ath9k_ps_wakeup(sc);
+-
+- spin_lock_bh(&sc->sc_pcu_lock);
+-
+- ath9k_hw_disable_interrupts(ah);
+- ah->imask = sc->wow_intr_before_sleep;
+- ath9k_hw_set_interrupts(ah);
+- ath9k_hw_enable_interrupts(ah);
+-
+- spin_unlock_bh(&sc->sc_pcu_lock);
+-
+- wow_status = ath9k_hw_wow_wakeup(ah);
+-
+- if (atomic_read(&sc->wow_got_bmiss_intr) == 0) {
+- /*
+- * some devices may not pick beacon miss
+- * as the reason they woke up so we add
+- * that here for that shortcoming.
+- */
+- wow_status |= AH_WOW_BEACON_MISS;
+- atomic_dec(&sc->wow_got_bmiss_intr);
+- ath_dbg(common, ANY, "Beacon miss interrupt picked up during WoW sleep\n");
+- }
+-
+- atomic_dec(&sc->wow_sleep_proc_intr);
+-
+- if (wow_status) {
+- ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n",
+- ath9k_hw_wow_event_to_string(wow_status), wow_status);
+- }
+-
+- ath_restart_work(sc);
+- ath9k_start_btcoex(sc);
+-
+- ath9k_ps_restore(sc);
+- mutex_unlock(&sc->mutex);
+-
+- return 0;
+-}
+-
+-static void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
+-{
+- struct ath_softc *sc = hw->priv;
+-
+- mutex_lock(&sc->mutex);
+- device_init_wakeup(sc->dev, 1);
+- device_set_wakeup_enable(sc->dev, enabled);
+- mutex_unlock(&sc->mutex);
+-}
+-
+-#endif
+ static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
{
- REG_DBG_PRINT("Timeout while waiting for CRDA to reply, restoring regulatory settings\n");
-+ rtnl_lock();
- restore_regulatory_settings(true);
-+ rtnl_unlock();
+ struct ath_softc *sc = hw->priv;
+@@ -2373,134 +2070,6 @@ static void ath9k_channel_switch_beacon(
+ sc->csa_vif = vif;
}
- int __init regulatory_init(void)
---- a/net/wireless/sme.c
-+++ b/net/wireless/sme.c
-@@ -34,8 +34,10 @@ struct cfg80211_conn {
- CFG80211_CONN_SCAN_AGAIN,
- CFG80211_CONN_AUTHENTICATE_NEXT,
- CFG80211_CONN_AUTHENTICATING,
-+ CFG80211_CONN_AUTH_FAILED,
- CFG80211_CONN_ASSOCIATE_NEXT,
- CFG80211_CONN_ASSOCIATING,
-+ CFG80211_CONN_ASSOC_FAILED,
- CFG80211_CONN_DEAUTH,
- CFG80211_CONN_CONNECTED,
- } state;
-@@ -164,6 +166,8 @@ static int cfg80211_conn_do_work(struct
- NULL, 0,
- params->key, params->key_len,
- params->key_idx, NULL, 0);
-+ case CFG80211_CONN_AUTH_FAILED:
-+ return -ENOTCONN;
- case CFG80211_CONN_ASSOCIATE_NEXT:
- BUG_ON(!rdev->ops->assoc);
- wdev->conn->state = CFG80211_CONN_ASSOCIATING;
-@@ -188,10 +192,17 @@ static int cfg80211_conn_do_work(struct
- WLAN_REASON_DEAUTH_LEAVING,
- false);
- return err;
-+ case CFG80211_CONN_ASSOC_FAILED:
-+ cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
-+ NULL, 0,
-+ WLAN_REASON_DEAUTH_LEAVING, false);
-+ return -ENOTCONN;
- case CFG80211_CONN_DEAUTH:
- cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
- NULL, 0,
- WLAN_REASON_DEAUTH_LEAVING, false);
-+ /* free directly, disconnected event already sent */
-+ cfg80211_sme_free(wdev);
- return 0;
- default:
- return 0;
-@@ -371,7 +382,7 @@ bool cfg80211_sme_rx_assoc_resp(struct w
- return true;
- }
-
-- wdev->conn->state = CFG80211_CONN_DEAUTH;
-+ wdev->conn->state = CFG80211_CONN_ASSOC_FAILED;
- schedule_work(&rdev->conn_work);
- return false;
- }
-@@ -383,7 +394,13 @@ void cfg80211_sme_deauth(struct wireless
+-static void ath9k_tx99_stop(struct ath_softc *sc)
+-{
+- struct ath_hw *ah = sc->sc_ah;
+- struct ath_common *common = ath9k_hw_common(ah);
+-
+- ath_drain_all_txq(sc);
+- ath_startrecv(sc);
+-
+- ath9k_hw_set_interrupts(ah);
+- ath9k_hw_enable_interrupts(ah);
+-
+- ieee80211_wake_queues(sc->hw);
+-
+- kfree_skb(sc->tx99_skb);
+- sc->tx99_skb = NULL;
+- sc->tx99_state = false;
+-
+- ath9k_hw_tx99_stop(sc->sc_ah);
+- ath_dbg(common, XMIT, "TX99 stopped\n");
+-}
+-
+-static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)
+-{
+- static u8 PN9Data[] = {0xff, 0x87, 0xb8, 0x59, 0xb7, 0xa1, 0xcc, 0x24,
+- 0x57, 0x5e, 0x4b, 0x9c, 0x0e, 0xe9, 0xea, 0x50,
+- 0x2a, 0xbe, 0xb4, 0x1b, 0xb6, 0xb0, 0x5d, 0xf1,
+- 0xe6, 0x9a, 0xe3, 0x45, 0xfd, 0x2c, 0x53, 0x18,
+- 0x0c, 0xca, 0xc9, 0xfb, 0x49, 0x37, 0xe5, 0xa8,
+- 0x51, 0x3b, 0x2f, 0x61, 0xaa, 0x72, 0x18, 0x84,
+- 0x02, 0x23, 0x23, 0xab, 0x63, 0x89, 0x51, 0xb3,
+- 0xe7, 0x8b, 0x72, 0x90, 0x4c, 0xe8, 0xfb, 0xc0};
+- u32 len = 1200;
+- struct ieee80211_hw *hw = sc->hw;
+- struct ieee80211_hdr *hdr;
+- struct ieee80211_tx_info *tx_info;
+- struct sk_buff *skb;
+-
+- skb = alloc_skb(len, GFP_KERNEL);
+- if (!skb)
+- return NULL;
+-
+- skb_put(skb, len);
+-
+- memset(skb->data, 0, len);
+-
+- hdr = (struct ieee80211_hdr *)skb->data;
+- hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA);
+- hdr->duration_id = 0;
+-
+- memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
+- memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
+- memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
+-
+- hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
+-
+- tx_info = IEEE80211_SKB_CB(skb);
+- memset(tx_info, 0, sizeof(*tx_info));
+- tx_info->band = hw->conf.chandef.chan->band;
+- tx_info->flags = IEEE80211_TX_CTL_NO_ACK;
+- tx_info->control.vif = sc->tx99_vif;
+-
+- memcpy(skb->data + sizeof(*hdr), PN9Data, sizeof(PN9Data));
+-
+- return skb;
+-}
+-
+-void ath9k_tx99_deinit(struct ath_softc *sc)
+-{
+- ath_reset(sc);
+-
+- ath9k_ps_wakeup(sc);
+- ath9k_tx99_stop(sc);
+- ath9k_ps_restore(sc);
+-}
+-
+-int ath9k_tx99_init(struct ath_softc *sc)
+-{
+- struct ieee80211_hw *hw = sc->hw;
+- struct ath_hw *ah = sc->sc_ah;
+- struct ath_common *common = ath9k_hw_common(ah);
+- struct ath_tx_control txctl;
+- int r;
+-
+- if (sc->sc_flags & SC_OP_INVALID) {
+- ath_err(common,
+- "driver is in invalid state unable to use TX99");
+- return -EINVAL;
+- }
+-
+- sc->tx99_skb = ath9k_build_tx99_skb(sc);
+- if (!sc->tx99_skb)
+- return -ENOMEM;
+-
+- memset(&txctl, 0, sizeof(txctl));
+- txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
+-
+- ath_reset(sc);
+-
+- ath9k_ps_wakeup(sc);
+-
+- ath9k_hw_disable_interrupts(ah);
+- atomic_set(&ah->intr_ref_cnt, -1);
+- ath_drain_all_txq(sc);
+- ath_stoprecv(sc);
+-
+- sc->tx99_state = true;
+-
+- ieee80211_stop_queues(hw);
+-
+- if (sc->tx99_power == MAX_RATE_POWER + 1)
+- sc->tx99_power = MAX_RATE_POWER;
+-
+- ath9k_hw_tx99_set_txpower(ah, sc->tx99_power);
+- r = ath9k_tx99_send(sc, sc->tx99_skb, &txctl);
+- if (r) {
+- ath_dbg(common, XMIT, "Failed to xmit TX99 skb\n");
+- return r;
+- }
+-
+- ath_dbg(common, XMIT, "TX99 xmit started using %d ( %ddBm)\n",
+- sc->tx99_power,
+- sc->tx99_power / 2);
+-
+- /* We leave the harware awake as it will be chugging on */
+-
+- return 0;
+-}
+-
+ struct ieee80211_ops ath9k_ops = {
+ .tx = ath9k_tx,
+ .start = ath9k_start,
+@@ -2531,7 +2100,7 @@ struct ieee80211_ops ath9k_ops = {
+ .set_antenna = ath9k_set_antenna,
+ .get_antenna = ath9k_get_antenna,
+
+-#ifdef CONFIG_PM_SLEEP
++#ifdef CONFIG_ATH9K_WOW
+ .suspend = ath9k_suspend,
+ .resume = ath9k_resume,
+ .set_wakeup = ath9k_set_wakeup,
+--- a/drivers/net/wireless/ath/ath9k/wow.c
++++ b/drivers/net/wireless/ath/ath9k/wow.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2012 Qualcomm Atheros, Inc.
++ * Copyright (c) 2013 Qualcomm Atheros, 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
+@@ -14,409 +14,348 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
- void cfg80211_sme_auth_timeout(struct wireless_dev *wdev)
- {
-- cfg80211_sme_free(wdev);
-+ struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
-+
-+ if (!wdev->conn)
-+ return;
+-#include <linux/export.h>
+ #include "ath9k.h"
+-#include "reg.h"
+-#include "hw-ops.h"
+
+-const char *ath9k_hw_wow_event_to_string(u32 wow_event)
++static const struct wiphy_wowlan_support ath9k_wowlan_support = {
++ .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
++ .n_patterns = MAX_NUM_USER_PATTERN,
++ .pattern_min_len = 1,
++ .pattern_max_len = MAX_PATTERN_SIZE,
++};
+
-+ wdev->conn->state = CFG80211_CONN_AUTH_FAILED;
-+ schedule_work(&rdev->conn_work);
- }
-
- void cfg80211_sme_disassoc(struct wireless_dev *wdev)
-@@ -399,7 +416,13 @@ void cfg80211_sme_disassoc(struct wirele
-
- void cfg80211_sme_assoc_timeout(struct wireless_dev *wdev)
++static void ath9k_wow_map_triggers(struct ath_softc *sc,
++ struct cfg80211_wowlan *wowlan,
++ u32 *wow_triggers)
{
-- cfg80211_sme_disassoc(wdev);
-+ struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
-+
-+ if (!wdev->conn)
-+ return;
-+
-+ wdev->conn->state = CFG80211_CONN_ASSOC_FAILED;
-+ schedule_work(&rdev->conn_work);
+- if (wow_event & AH_WOW_MAGIC_PATTERN_EN)
+- return "Magic pattern";
+- if (wow_event & AH_WOW_USER_PATTERN_EN)
+- return "User pattern";
+- if (wow_event & AH_WOW_LINK_CHANGE)
+- return "Link change";
+- if (wow_event & AH_WOW_BEACON_MISS)
+- return "Beacon miss";
++ if (wowlan->disconnect)
++ *wow_triggers |= AH_WOW_LINK_CHANGE |
++ AH_WOW_BEACON_MISS;
++ if (wowlan->magic_pkt)
++ *wow_triggers |= AH_WOW_MAGIC_PATTERN_EN;
++
++ if (wowlan->n_patterns)
++ *wow_triggers |= AH_WOW_USER_PATTERN_EN;
++
++ sc->wow_enabled = *wow_triggers;
+
+- return "unknown reason";
}
+-EXPORT_SYMBOL(ath9k_hw_wow_event_to_string);
- static int cfg80211_sme_connect(struct wireless_dev *wdev,
-@@ -953,21 +976,19 @@ int cfg80211_disconnect(struct cfg80211_
- struct net_device *dev, u16 reason, bool wextev)
+-static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)
++static void ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)
{
- struct wireless_dev *wdev = dev->ieee80211_ptr;
-- int err;
-+ int err = 0;
-
- ASSERT_WDEV_LOCK(wdev);
-
- kfree(wdev->connect_keys);
- wdev->connect_keys = NULL;
-
-- if (wdev->conn) {
-+ if (wdev->conn)
- err = cfg80211_sme_disconnect(wdev, reason);
-- } else if (!rdev->ops->disconnect) {
-+ else if (!rdev->ops->disconnect)
- cfg80211_mlme_down(rdev, dev);
-- err = 0;
-- } else {
-+ else if (wdev->current_bss)
- err = rdev_disconnect(rdev, dev, reason);
-- }
++ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
++ int pattern_count = 0;
++ int i, byte_cnt;
++ u8 dis_deauth_pattern[MAX_PATTERN_SIZE];
++ u8 dis_deauth_mask[MAX_PATTERN_SIZE];
- return err;
- }
---- a/net/mac80211/rc80211_minstrel.c
-+++ b/net/mac80211/rc80211_minstrel.c
-@@ -203,6 +203,15 @@ minstrel_update_stats(struct minstrel_pr
- memcpy(mi->max_tp_rate, tmp_tp_rate, sizeof(mi->max_tp_rate));
- mi->max_prob_rate = tmp_prob_rate;
-
-+#ifdef CPTCFG_MAC80211_DEBUGFS
-+ /* use fixed index if set */
-+ if (mp->fixed_rate_idx != -1) {
-+ mi->max_tp_rate[0] = mp->fixed_rate_idx;
-+ mi->max_tp_rate[1] = mp->fixed_rate_idx;
-+ mi->max_prob_rate = mp->fixed_rate_idx;
-+ }
-+#endif
-+
- /* Reset update timer */
- mi->stats_update = jiffies;
-
-@@ -290,7 +299,7 @@ minstrel_get_rate(void *priv, struct iee
- struct minstrel_rate *msr, *mr;
- unsigned int ndx;
- bool mrr_capable;
-- bool prev_sample = mi->prev_sample;
-+ bool prev_sample;
- int delta;
- int sampling_ratio;
-
-@@ -310,10 +319,16 @@ minstrel_get_rate(void *priv, struct iee
- /* increase sum packet counter */
- mi->packet_count++;
-
-+#ifdef CPTCFG_MAC80211_DEBUGFS
-+ if (mp->fixed_rate_idx != -1)
-+ return;
-+#endif
-+
- delta = (mi->packet_count * sampling_ratio / 100) -
- (mi->sample_count + mi->sample_deferred / 2);
+- REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
++ memset(dis_deauth_pattern, 0, MAX_PATTERN_SIZE);
++ memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);
- /* delta < 0: no sampling required */
-+ prev_sample = mi->prev_sample;
- mi->prev_sample = false;
- if (delta < 0 || (!mrr_capable && prev_sample))
- return;
---- a/drivers/net/wireless/rt2x00/rt2x00queue.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
-@@ -936,13 +936,8 @@ void rt2x00queue_index_inc(struct queue_
- spin_unlock_irqrestore(&queue->index_lock, irqflags);
- }
+- /* set rx disable bit */
+- REG_WRITE(ah, AR_CR, AR_CR_RXD);
++ /*
++ * Create Dissassociate / Deauthenticate packet filter
++ *
++ * 2 bytes 2 byte 6 bytes 6 bytes 6 bytes
++ * +--------------+----------+---------+--------+--------+----
++ * + Frame Control+ Duration + DA + SA + BSSID +
++ * +--------------+----------+---------+--------+--------+----
++ *
++ * The above is the management frame format for disassociate/
++ * deauthenticate pattern, from this we need to match the first byte
++ * of 'Frame Control' and DA, SA, and BSSID fields
++ * (skipping 2nd byte of FC and Duration feild.
++ *
++ * Disassociate pattern
++ * --------------------
++ * Frame control = 00 00 1010
++ * DA, SA, BSSID = x:x:x:x:x:x
++ * Pattern will be A0000000 | x:x:x:x:x:x | x:x:x:x:x:x
++ * | x:x:x:x:x:x -- 22 bytes
++ *
++ * Deauthenticate pattern
++ * ----------------------
++ * Frame control = 00 00 1100
++ * DA, SA, BSSID = x:x:x:x:x:x
++ * Pattern will be C0000000 | x:x:x:x:x:x | x:x:x:x:x:x
++ * | x:x:x:x:x:x -- 22 bytes
++ */
--void rt2x00queue_pause_queue(struct data_queue *queue)
-+void rt2x00queue_pause_queue_nocheck(struct data_queue *queue)
- {
-- if (!test_bit(DEVICE_STATE_PRESENT, &queue->rt2x00dev->flags) ||
-- !test_bit(QUEUE_STARTED, &queue->flags) ||
-- test_and_set_bit(QUEUE_PAUSED, &queue->flags))
+- if (!ath9k_hw_wait(ah, AR_CR, AR_CR_RXE, 0, AH_WAIT_TIMEOUT)) {
+- ath_err(common, "Failed to stop Rx DMA in 10ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",
+- REG_READ(ah, AR_CR), REG_READ(ah, AR_DIAG_SW));
- return;
--
- switch (queue->qid) {
- case QID_AC_VO:
- case QID_AC_VI:
-@@ -958,6 +953,15 @@ void rt2x00queue_pause_queue(struct data
- break;
- }
- }
-+void rt2x00queue_pause_queue(struct data_queue *queue)
-+{
-+ if (!test_bit(DEVICE_STATE_PRESENT, &queue->rt2x00dev->flags) ||
-+ !test_bit(QUEUE_STARTED, &queue->flags) ||
-+ test_and_set_bit(QUEUE_PAUSED, &queue->flags))
-+ return;
-+
-+ rt2x00queue_pause_queue_nocheck(queue);
-+}
- EXPORT_SYMBOL_GPL(rt2x00queue_pause_queue);
-
- void rt2x00queue_unpause_queue(struct data_queue *queue)
-@@ -1019,7 +1023,7 @@ void rt2x00queue_stop_queue(struct data_
- return;
- }
-
-- rt2x00queue_pause_queue(queue);
-+ rt2x00queue_pause_queue_nocheck(queue);
+- }
++ /* Create Disassociate Pattern first */
- queue->rt2x00dev->ops->lib->stop_queue(queue);
+- REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_ON_INT);
+-}
++ byte_cnt = 0;
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -31,10 +31,12 @@
- #include "led.h"
-
- #define IEEE80211_AUTH_TIMEOUT (HZ / 5)
-+#define IEEE80211_AUTH_TIMEOUT_LONG (HZ / 2)
- #define IEEE80211_AUTH_TIMEOUT_SHORT (HZ / 10)
- #define IEEE80211_AUTH_MAX_TRIES 3
- #define IEEE80211_AUTH_WAIT_ASSOC (HZ * 5)
- #define IEEE80211_ASSOC_TIMEOUT (HZ / 5)
-+#define IEEE80211_ASSOC_TIMEOUT_LONG (HZ / 2)
- #define IEEE80211_ASSOC_TIMEOUT_SHORT (HZ / 10)
- #define IEEE80211_ASSOC_MAX_TRIES 3
-
-@@ -209,8 +211,9 @@ ieee80211_determine_chantype(struct ieee
- struct ieee80211_channel *channel,
- const struct ieee80211_ht_operation *ht_oper,
- const struct ieee80211_vht_operation *vht_oper,
-- struct cfg80211_chan_def *chandef, bool verbose)
-+ struct cfg80211_chan_def *chandef, bool tracking)
- {
-+ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
- struct cfg80211_chan_def vht_chandef;
- u32 ht_cfreq, ret;
-
-@@ -229,7 +232,7 @@ ieee80211_determine_chantype(struct ieee
- ht_cfreq = ieee80211_channel_to_frequency(ht_oper->primary_chan,
- channel->band);
- /* check that channel matches the right operating channel */
-- if (channel->center_freq != ht_cfreq) {
-+ if (!tracking && channel->center_freq != ht_cfreq) {
- /*
- * It's possible that some APs are confused here;
- * Netgear WNDR3700 sometimes reports 4 higher than
-@@ -237,11 +240,10 @@ ieee80211_determine_chantype(struct ieee
- * since we look at probe response/beacon data here
- * it should be OK.
- */
-- if (verbose)
-- sdata_info(sdata,
-- "Wrong control channel: center-freq: %d ht-cfreq: %d ht->primary_chan: %d band: %d - Disabling HT\n",
-- channel->center_freq, ht_cfreq,
-- ht_oper->primary_chan, channel->band);
-+ sdata_info(sdata,
-+ "Wrong control channel: center-freq: %d ht-cfreq: %d ht->primary_chan: %d band: %d - Disabling HT\n",
-+ channel->center_freq, ht_cfreq,
-+ ht_oper->primary_chan, channel->band);
- ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT;
- goto out;
- }
-@@ -295,7 +297,7 @@ ieee80211_determine_chantype(struct ieee
- channel->band);
- break;
- default:
-- if (verbose)
-+ if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT))
- sdata_info(sdata,
- "AP VHT operation IE has invalid channel width (%d), disable VHT\n",
- vht_oper->chan_width);
-@@ -304,7 +306,7 @@ ieee80211_determine_chantype(struct ieee
- }
+-static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
+-{
+- struct ath_common *common = ath9k_hw_common(ah);
+- u8 sta_mac_addr[ETH_ALEN], ap_mac_addr[ETH_ALEN];
+- u32 ctl[13] = {0};
+- u32 data_word[KAL_NUM_DATA_WORDS];
+- u8 i;
+- u32 wow_ka_data_word0;
+-
+- memcpy(sta_mac_addr, common->macaddr, ETH_ALEN);
+- memcpy(ap_mac_addr, common->curbssid, ETH_ALEN);
+-
+- /* set the transmit buffer */
+- ctl[0] = (KAL_FRAME_LEN | (MAX_RATE_POWER << 16));
+- ctl[1] = 0;
+- ctl[3] = 0xb; /* OFDM_6M hardware value for this rate */
+- ctl[4] = 0;
+- ctl[7] = (ah->txchainmask) << 2;
+- ctl[2] = 0xf << 16; /* tx_tries 0 */
+-
+- for (i = 0; i < KAL_NUM_DESC_WORDS; i++)
+- REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
+-
+- REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
+-
+- data_word[0] = (KAL_FRAME_TYPE << 2) | (KAL_FRAME_SUB_TYPE << 4) |
+- (KAL_TO_DS << 8) | (KAL_DURATION_ID << 16);
+- data_word[1] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
+- (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
+- data_word[2] = (sta_mac_addr[1] << 24) | (sta_mac_addr[0] << 16) |
+- (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
+- data_word[3] = (sta_mac_addr[5] << 24) | (sta_mac_addr[4] << 16) |
+- (sta_mac_addr[3] << 8) | (sta_mac_addr[2]);
+- data_word[4] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
+- (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
+- data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
+-
+- if (AR_SREV_9462_20(ah)) {
+- /* AR9462 2.0 has an extra descriptor word (time based
+- * discard) compared to other chips */
+- REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0);
+- wow_ka_data_word0 = AR_WOW_TXBUF(13);
+- } else {
+- wow_ka_data_word0 = AR_WOW_TXBUF(12);
+- }
++ /* Fill out the mask with all FF's */
- if (!cfg80211_chandef_valid(&vht_chandef)) {
-- if (verbose)
-+ if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT))
- sdata_info(sdata,
- "AP VHT information is invalid, disable VHT\n");
- ret = IEEE80211_STA_DISABLE_VHT;
-@@ -317,7 +319,7 @@ ieee80211_determine_chantype(struct ieee
- }
+- for (i = 0; i < KAL_NUM_DATA_WORDS; i++)
+- REG_WRITE(ah, (wow_ka_data_word0 + i*4), data_word[i]);
++ for (i = 0; i < MAX_PATTERN_MASK_SIZE; i++)
++ dis_deauth_mask[i] = 0xff;
- if (!cfg80211_chandef_compatible(chandef, &vht_chandef)) {
-- if (verbose)
-+ if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT))
- sdata_info(sdata,
- "AP VHT information doesn't match HT, disable VHT\n");
- ret = IEEE80211_STA_DISABLE_VHT;
-@@ -333,18 +335,27 @@ out:
- if (ret & IEEE80211_STA_DISABLE_VHT)
- vht_chandef = *chandef;
+-}
++ /* copy the first byte of frame control field */
++ dis_deauth_pattern[byte_cnt] = 0xa0;
++ byte_cnt++;
+-void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
+- u8 *user_mask, int pattern_count,
+- int pattern_len)
+-{
+- int i;
+- u32 pattern_val, mask_val;
+- u32 set, clr;
++ /* skip 2nd byte of frame control and Duration field */
++ byte_cnt += 3;
+
+- /* FIXME: should check count by querying the hardware capability */
+- if (pattern_count >= MAX_NUM_PATTERN)
+- return;
+ /*
-+ * Ignore the DISABLED flag when we're already connected and only
-+ * tracking the APs beacon for bandwidth changes - otherwise we
-+ * might get disconnected here if we connect to an AP, update our
-+ * regulatory information based on the AP's country IE and the
-+ * information we have is wrong/outdated and disables the channel
-+ * that we're actually using for the connection to the AP.
++ * need not match the destination mac address, it can be a broadcast
++ * mac address or an unicast to this station
+ */
- while (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef,
-- IEEE80211_CHAN_DISABLED)) {
-+ tracking ? 0 :
-+ IEEE80211_CHAN_DISABLED)) {
- if (WARN_ON(chandef->width == NL80211_CHAN_WIDTH_20_NOHT)) {
- ret = IEEE80211_STA_DISABLE_HT |
- IEEE80211_STA_DISABLE_VHT;
-- goto out;
-+ break;
- }
++ byte_cnt += 6;
+
+- REG_SET_BIT(ah, AR_WOW_PATTERN, BIT(pattern_count));
++ /* copy the source mac address */
++ memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
+
+- /* set the registers for pattern */
+- for (i = 0; i < MAX_PATTERN_SIZE; i += 4) {
+- memcpy(&pattern_val, user_pattern, 4);
+- REG_WRITE(ah, (AR_WOW_TB_PATTERN(pattern_count) + i),
+- pattern_val);
+- user_pattern += 4;
+- }
++ byte_cnt += 6;
- ret |= chandef_downgrade(chandef);
- }
+- /* set the registers for mask */
+- for (i = 0; i < MAX_PATTERN_MASK_SIZE; i += 4) {
+- memcpy(&mask_val, user_mask, 4);
+- REG_WRITE(ah, (AR_WOW_TB_MASK(pattern_count) + i), mask_val);
+- user_mask += 4;
+- }
++ /* copy the bssid, its same as the source mac address */
+
+- /* set the pattern length to be matched
+- *
+- * AR_WOW_LENGTH1_REG1
+- * bit 31:24 pattern 0 length
+- * bit 23:16 pattern 1 length
+- * bit 15:8 pattern 2 length
+- * bit 7:0 pattern 3 length
+- *
+- * AR_WOW_LENGTH1_REG2
+- * bit 31:24 pattern 4 length
+- * bit 23:16 pattern 5 length
+- * bit 15:8 pattern 6 length
+- * bit 7:0 pattern 7 length
+- *
+- * the below logic writes out the new
+- * pattern length for the corresponding
+- * pattern_count, while masking out the
+- * other fields
+- */
++ memcpy((dis_deauth_pattern + byte_cnt), common->curbssid, ETH_ALEN);
-- if (chandef->width != vht_chandef.width && verbose)
-+ if (chandef->width != vht_chandef.width && !tracking)
- sdata_info(sdata,
- "capabilities/regulatory prevented using AP HT/VHT configuration, downgraded\n");
+- ah->wow_event_mask |= BIT(pattern_count + AR_WOW_PAT_FOUND_SHIFT);
++ /* Create Disassociate pattern mask */
+
+- if (pattern_count < 4) {
+- /* Pattern 0-3 uses AR_WOW_LENGTH1 register */
+- set = (pattern_len & AR_WOW_LENGTH_MAX) <<
+- AR_WOW_LEN1_SHIFT(pattern_count);
+- clr = AR_WOW_LENGTH1_MASK(pattern_count);
+- REG_RMW(ah, AR_WOW_LENGTH1, set, clr);
+- } else {
+- /* Pattern 4-7 uses AR_WOW_LENGTH2 register */
+- set = (pattern_len & AR_WOW_LENGTH_MAX) <<
+- AR_WOW_LEN2_SHIFT(pattern_count);
+- clr = AR_WOW_LENGTH2_MASK(pattern_count);
+- REG_RMW(ah, AR_WOW_LENGTH2, set, clr);
+- }
++ dis_deauth_mask[0] = 0xfe;
++ dis_deauth_mask[1] = 0x03;
++ dis_deauth_mask[2] = 0xc0;
-@@ -384,7 +395,7 @@ static int ieee80211_config_bw(struct ie
+-}
+-EXPORT_SYMBOL(ath9k_hw_wow_apply_pattern);
++ ath_dbg(common, WOW, "Adding disassoc/deauth patterns for WoW\n");
- /* calculate new channel (type) based on HT/VHT operation IEs */
- flags = ieee80211_determine_chantype(sdata, sband, chan, ht_oper,
-- vht_oper, &chandef, false);
-+ vht_oper, &chandef, true);
+-u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
+-{
+- u32 wow_status = 0;
+- u32 val = 0, rval;
++ ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
++ pattern_count, byte_cnt);
++ pattern_count++;
/*
- * Downgrade the new channel if we associated with restricted
-@@ -1043,6 +1054,13 @@ ieee80211_sta_process_chanswitch(struct
- if (!ieee80211_operating_class_to_band(
- elems->ext_chansw_ie->new_operating_class,
- &new_band)) {
-+ /*
-+ * Some APs send invalid ECSA IEs in probe response
-+ * frames, so check for these and ignore them.
-+ */
-+ if (beacon && elems->ext_chansw_ie->new_ch_num == 0 &&
-+ elems->ext_chansw_ie->new_operating_class == 0)
-+ return;
- sdata_info(sdata,
- "cannot understand ECSA IE operating class %d, disconnecting\n",
- elems->ext_chansw_ie->new_operating_class);
-@@ -1110,6 +1128,15 @@ ieee80211_sta_process_chanswitch(struct
- case -1:
- cfg80211_chandef_create(&new_chandef, new_chan,
- NL80211_CHAN_NO_HT);
-+ /* keep width for 5/10 MHz channels */
-+ switch (sdata->vif.bss_conf.chandef.width) {
-+ case NL80211_CHAN_WIDTH_5:
-+ case NL80211_CHAN_WIDTH_10:
-+ new_chandef.width = sdata->vif.bss_conf.chandef.width;
-+ break;
-+ default:
-+ break;
-+ }
- break;
- }
+- * read the WoW status register to know
+- * the wakeup reason
++ * for de-authenticate pattern, only the first byte of the frame
++ * control field gets changed from 0xA0 to 0xC0
+ */
+- rval = REG_READ(ah, AR_WOW_PATTERN);
+- val = AR_WOW_STATUS(rval);
++ dis_deauth_pattern[0] = 0xC0;
-@@ -3394,10 +3421,13 @@ static int ieee80211_probe_auth(struct i
+- /*
+- * mask only the WoW events that we have enabled. Sometimes
+- * we have spurious WoW events from the AR_WOW_PATTERN
+- * register. This mask will clean it up.
+- */
++ ath9k_hw_wow_apply_pattern(ah, dis_deauth_pattern, dis_deauth_mask,
++ pattern_count, byte_cnt);
- if (tx_flags == 0) {
- auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
-- ifmgd->auth_data->timeout_started = true;
-+ auth_data->timeout_started = true;
- run_again(sdata, auth_data->timeout);
- } else {
-- auth_data->timeout_started = false;
-+ auth_data->timeout =
-+ round_jiffies_up(jiffies + IEEE80211_AUTH_TIMEOUT_LONG);
-+ auth_data->timeout_started = true;
-+ run_again(sdata, auth_data->timeout);
- }
+- val &= ah->wow_event_mask;
++}
- return 0;
-@@ -3434,7 +3464,11 @@ static int ieee80211_do_assoc(struct iee
- assoc_data->timeout_started = true;
- run_again(sdata, assoc_data->timeout);
- } else {
-- assoc_data->timeout_started = false;
-+ assoc_data->timeout =
-+ round_jiffies_up(jiffies +
-+ IEEE80211_ASSOC_TIMEOUT_LONG);
-+ assoc_data->timeout_started = true;
-+ run_again(sdata, assoc_data->timeout);
- }
+- if (val) {
+- if (val & AR_WOW_MAGIC_PAT_FOUND)
+- wow_status |= AH_WOW_MAGIC_PATTERN_EN;
+- if (AR_WOW_PATTERN_FOUND(val))
+- wow_status |= AH_WOW_USER_PATTERN_EN;
+- if (val & AR_WOW_KEEP_ALIVE_FAIL)
+- wow_status |= AH_WOW_LINK_CHANGE;
+- if (val & AR_WOW_BEACON_FAIL)
+- wow_status |= AH_WOW_BEACON_MISS;
+- }
++static void ath9k_wow_add_pattern(struct ath_softc *sc,
++ struct cfg80211_wowlan *wowlan)
++{
++ struct ath_hw *ah = sc->sc_ah;
++ struct ath9k_wow_pattern *wow_pattern = NULL;
++ struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
++ int mask_len;
++ s8 i = 0;
++
++ if (!wowlan->n_patterns)
++ return;
- return 0;
-@@ -3829,7 +3863,7 @@ static int ieee80211_prep_channel(struct
- ifmgd->flags |= ieee80211_determine_chantype(sdata, sband,
- cbss->channel,
- ht_oper, vht_oper,
-- &chandef, true);
-+ &chandef, false);
-
- sdata->needed_rx_chains = min(ieee80211_ht_vht_rx_chains(sdata, cbss),
- local->rx_chains);
---- a/net/wireless/core.c
-+++ b/net/wireless/core.c
-@@ -772,6 +772,7 @@ void cfg80211_leave(struct cfg80211_regi
- cfg80211_leave_mesh(rdev, dev);
- break;
- case NL80211_IFTYPE_AP:
-+ case NL80211_IFTYPE_P2P_GO:
- cfg80211_stop_ap(rdev, dev);
- break;
- default:
---- a/drivers/net/wireless/rtlwifi/Kconfig
-+++ b/drivers/net/wireless/rtlwifi/Kconfig
-@@ -1,29 +1,22 @@
--config RTLWIFI
-- tristate "Realtek wireless card support"
-+menuconfig RTL_CARDS
-+ tristate "Realtek rtlwifi family of devices"
- depends on m
-- depends on MAC80211
-- select BACKPORT_FW_LOADER
-- ---help---
-- This is common code for RTL8192CE/RTL8192CU/RTL8192SE/RTL8723AE
-- drivers. This module does nothing by itself - the various front-end
-- drivers need to be enabled to support any desired devices.
--
-- If you choose to build as a module, it'll be called rtlwifi.
--
--config RTLWIFI_DEBUG
-- bool "Debugging output for rtlwifi driver family"
-- depends on RTLWIFI
-+ depends on MAC80211 && (PCI || USB)
- default y
- ---help---
-- To use the module option that sets the dynamic-debugging level for,
-- the front-end driver, this parameter must be "Y". For memory-limited
-- systems, choose "N". If in doubt, choose "Y".
-+ This option will enable support for the Realtek mac80211-based
-+ wireless drivers. Drivers rtl8192ce, rtl8192cu, rtl8192se, rtl8192de,
-+ rtl8723eu, and rtl8188eu share some common code.
-+
-+if RTL_CARDS
-
- config RTL8192CE
- tristate "Realtek RTL8192CE/RTL8188CE Wireless Network Adapter"
- depends on m
-- depends on RTLWIFI && PCI
-+ depends on PCI
- select RTL8192C_COMMON
-+ select RTLWIFI
-+ select RTLWIFI_PCI
- ---help---
- This is the driver for Realtek RTL8192CE/RTL8188CE 802.11n PCIe
- wireless network adapters.
-@@ -33,7 +26,9 @@ config RTL8192CE
- config RTL8192SE
- tristate "Realtek RTL8192SE/RTL8191SE PCIe Wireless Network Adapter"
- depends on m
-- depends on RTLWIFI && PCI
-+ depends on PCI
-+ select RTLWIFI
-+ select RTLWIFI_PCI
- ---help---
- This is the driver for Realtek RTL8192SE/RTL8191SE 802.11n PCIe
- wireless network adapters.
-@@ -43,7 +38,9 @@ config RTL8192SE
- config RTL8192DE
- tristate "Realtek RTL8192DE/RTL8188DE PCIe Wireless Network Adapter"
- depends on m
-- depends on RTLWIFI && PCI
-+ depends on PCI
-+ select RTLWIFI
-+ select RTLWIFI_PCI
- ---help---
- This is the driver for Realtek RTL8192DE/RTL8188DE 802.11n PCIe
- wireless network adapters.
-@@ -53,7 +50,9 @@ config RTL8192DE
- config RTL8723AE
- tristate "Realtek RTL8723AE PCIe Wireless Network Adapter"
- depends on m
-- depends on RTLWIFI && PCI
-+ depends on PCI
-+ select RTLWIFI
-+ select RTLWIFI_PCI
- ---help---
- This is the driver for Realtek RTL8723AE 802.11n PCIe
- wireless network adapters.
-@@ -63,7 +62,9 @@ config RTL8723AE
- config RTL8188EE
- tristate "Realtek RTL8188EE Wireless Network Adapter"
- depends on m
-- depends on RTLWIFI && PCI
-+ depends on PCI
-+ select RTLWIFI
-+ select RTLWIFI_PCI
- ---help---
- This is the driver for Realtek RTL8188EE 802.11n PCIe
- wireless network adapters.
-@@ -73,7 +74,9 @@ config RTL8188EE
- config RTL8192CU
- tristate "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter"
- depends on m
-- depends on RTLWIFI && USB
-+ depends on USB
-+ select RTLWIFI
-+ select RTLWIFI_USB
- select RTL8192C_COMMON
- ---help---
- This is the driver for Realtek RTL8192CU/RTL8188CU 802.11n USB
-@@ -81,8 +84,32 @@ config RTL8192CU
+ /*
+- * set and clear WOW_PME_CLEAR registers for the chip to
+- * generate next wow signal.
+- * disable D3 before accessing other registers ?
++ * Add the new user configured patterns
+ */
++ for (i = 0; i < wowlan->n_patterns; i++) {
- If you choose to build it as a module, it will be called rtl8192cu
+- /* do we need to check the bit value 0x01000000 (7-10) ?? */
+- REG_RMW(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_WOW_PME_CLR,
+- AR_PMCTRL_PWR_STATE_D1D3);
++ wow_pattern = kzalloc(sizeof(*wow_pattern), GFP_KERNEL);
-+config RTLWIFI
-+ tristate
-+ depends on m
-+ select BACKPORT_FW_LOADER
-+
-+config RTLWIFI_PCI
-+ tristate
-+ depends on m
+- /*
+- * clear all events
+- */
+- REG_WRITE(ah, AR_WOW_PATTERN,
+- AR_WOW_CLEAR_EVENTS(REG_READ(ah, AR_WOW_PATTERN)));
++ if (!wow_pattern)
++ return;
+
+- /*
+- * restore the beacon threshold to init value
+- */
+- REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);
++ /*
++ * TODO: convert the generic user space pattern to
++ * appropriate chip specific/802.11 pattern.
++ */
+
+- /*
+- * Restore the way the PCI-E reset, Power-On-Reset, external
+- * PCIE_POR_SHORT pins are tied to its original value.
+- * Previously just before WoW sleep, we untie the PCI-E
+- * reset to our Chip's Power On Reset so that any PCI-E
+- * reset from the bus will not reset our chip
+- */
+- if (ah->is_pciexpress)
+- ath9k_hw_configpcipowersave(ah, false);
++ mask_len = DIV_ROUND_UP(wowlan->patterns[i].pattern_len, 8);
++ memset(wow_pattern->pattern_bytes, 0, MAX_PATTERN_SIZE);
++ memset(wow_pattern->mask_bytes, 0, MAX_PATTERN_SIZE);
++ memcpy(wow_pattern->pattern_bytes, patterns[i].pattern,
++ patterns[i].pattern_len);
++ memcpy(wow_pattern->mask_bytes, patterns[i].mask, mask_len);
++ wow_pattern->pattern_len = patterns[i].pattern_len;
+
-+config RTLWIFI_USB
-+ tristate
-+ depends on m
++ /*
++ * just need to take care of deauth and disssoc pattern,
++ * make sure we don't overwrite them.
++ */
+
-+config RTLWIFI_DEBUG
-+ bool "Debugging output for rtlwifi driver family"
-+ depends on RTLWIFI
-+ default y
-+ ---help---
-+ To use the module option that sets the dynamic-debugging level for,
-+ the front-end driver, this parameter must be "Y". For memory-limited
-+ systems, choose "N". If in doubt, choose "Y".
-+
- config RTL8192C_COMMON
- tristate
- depends on m
- depends on RTL8192CE || RTL8192CU
-- default m
-+ default y
-+
-+endif
---- a/drivers/net/wireless/rtlwifi/Makefile
-+++ b/drivers/net/wireless/rtlwifi/Makefile
-@@ -12,13 +12,11 @@ rtlwifi-objs := \
-
- rtl8192c_common-objs += \
-
--ifneq ($(CONFIG_PCI),)
--rtlwifi-objs += pci.o
--endif
-+obj-$(CPTCFG_RTLWIFI_PCI) += rtl_pci.o
-+rtl_pci-objs := pci.o
-
--ifneq ($(CONFIG_USB),)
--rtlwifi-objs += usb.o
--endif
-+obj-$(CPTCFG_RTLWIFI_USB) += rtl_usb.o
-+rtl_usb-objs := usb.o
-
- obj-$(CPTCFG_RTL8192C_COMMON) += rtl8192c/
- obj-$(CPTCFG_RTL8192CE) += rtl8192ce/
---- a/drivers/net/wireless/rtlwifi/ps.h
-+++ b/drivers/net/wireless/rtlwifi/ps.h
-@@ -49,5 +49,6 @@ void rtl_swlps_rf_awake(struct ieee80211
- void rtl_swlps_rf_sleep(struct ieee80211_hw *hw);
- void rtl_p2p_ps_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
- void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len);
-+void rtl_lps_change_work_callback(struct work_struct *work);
++ ath9k_hw_wow_apply_pattern(ah, wow_pattern->pattern_bytes,
++ wow_pattern->mask_bytes,
++ i + 2,
++ wow_pattern->pattern_len);
++ kfree(wow_pattern);
- #endif
---- a/drivers/net/wireless/rtlwifi/base.c
-+++ b/drivers/net/wireless/rtlwifi/base.c
-@@ -173,6 +173,7 @@ u8 rtl_tid_to_ac(u8 tid)
- {
- return tid_to_ac[tid];
- }
-+EXPORT_SYMBOL_GPL(rtl_tid_to_ac);
+- ah->wow_event_mask = 0;
++ }
- static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
- struct ieee80211_sta_ht_cap *ht_cap)
-@@ -407,6 +408,7 @@ void rtl_deinit_deferred_work(struct iee
- cancel_delayed_work(&rtlpriv->works.ps_rfon_wq);
- cancel_delayed_work(&rtlpriv->works.fwevt_wq);
+- return wow_status;
}
-+EXPORT_SYMBOL_GPL(rtl_deinit_deferred_work);
+-EXPORT_SYMBOL(ath9k_hw_wow_wakeup);
- void rtl_init_rfkill(struct ieee80211_hw *hw)
+-void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)
++int ath9k_suspend(struct ieee80211_hw *hw,
++ struct cfg80211_wowlan *wowlan)
{
-@@ -440,6 +442,7 @@ void rtl_deinit_rfkill(struct ieee80211_
- {
- wiphy_rfkill_stop_polling(hw->wiphy);
- }
-+EXPORT_SYMBOL_GPL(rtl_deinit_rfkill);
+- u32 wow_event_mask;
+- u32 set, clr;
++ struct ath_softc *sc = hw->priv;
++ struct ath_hw *ah = sc->sc_ah;
++ struct ath_common *common = ath9k_hw_common(ah);
++ u32 wow_triggers_enabled = 0;
++ int ret = 0;
- int rtl_init_core(struct ieee80211_hw *hw)
- {
-@@ -490,10 +493,12 @@ int rtl_init_core(struct ieee80211_hw *h
+- /*
+- * wow_event_mask is a mask to the AR_WOW_PATTERN register to
+- * indicate which WoW events we have enabled. The WoW events
+- * are from the 'pattern_enable' in this function and
+- * 'pattern_count' of ath9k_hw_wow_apply_pattern()
+- */
+- wow_event_mask = ah->wow_event_mask;
++ mutex_lock(&sc->mutex);
- return 0;
- }
-+EXPORT_SYMBOL_GPL(rtl_init_core);
+- /*
+- * Untie Power-on-Reset from the PCI-E-Reset. When we are in
+- * WOW sleep, we do want the Reset from the PCI-E to disturb
+- * our hw state
+- */
+- if (ah->is_pciexpress) {
+- /*
+- * we need to untie the internal POR (power-on-reset)
+- * to the external PCI-E reset. We also need to tie
+- * the PCI-E Phy reset to the PCI-E reset.
+- */
+- set = AR_WA_RESET_EN | AR_WA_POR_SHORT;
+- clr = AR_WA_UNTIE_RESET_EN | AR_WA_D3_L1_DISABLE;
+- REG_RMW(ah, AR_WA, set, clr);
++ ath_cancel_work(sc);
++ ath_stop_ani(sc);
++ del_timer_sync(&sc->rx_poll_timer);
++
++ if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
++ ath_dbg(common, ANY, "Device not present\n");
++ ret = -EINVAL;
++ goto fail_wow;
+ }
- void rtl_deinit_core(struct ieee80211_hw *hw)
- {
- }
-+EXPORT_SYMBOL_GPL(rtl_deinit_core);
+- /*
+- * set the power states appropriately and enable PME
+- */
+- set = AR_PMCTRL_HOST_PME_EN | AR_PMCTRL_PWR_PM_CTRL_ENA |
+- AR_PMCTRL_AUX_PWR_DET | AR_PMCTRL_WOW_PME_CLR;
++ if (WARN_ON(!wowlan)) {
++ ath_dbg(common, WOW, "None of the WoW triggers enabled\n");
++ ret = -EINVAL;
++ goto fail_wow;
++ }
- void rtl_init_rx_config(struct ieee80211_hw *hw)
- {
-@@ -502,6 +507,7 @@ void rtl_init_rx_config(struct ieee80211
+- /*
+- * set and clear WOW_PME_CLEAR registers for the chip
+- * to generate next wow signal.
+- */
+- REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
+- clr = AR_PMCTRL_WOW_PME_CLR;
+- REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
++ if (!device_can_wakeup(sc->dev)) {
++ ath_dbg(common, WOW, "device_can_wakeup failed, WoW is not enabled\n");
++ ret = 1;
++ goto fail_wow;
++ }
- rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *) (&mac->rx_conf));
- }
-+EXPORT_SYMBOL_GPL(rtl_init_rx_config);
+ /*
+- * Setup for:
+- * - beacon misses
+- * - magic pattern
+- * - keep alive timeout
+- * - pattern matching
++ * none of the sta vifs are associated
++ * and we are not currently handling multivif
++ * cases, for instance we have to seperately
++ * configure 'keep alive frame' for each
++ * STA.
+ */
- /*********************************************************
- *
-@@ -880,6 +886,7 @@ bool rtl_tx_mgmt_proc(struct ieee80211_h
+- /*
+- * Program default values for pattern backoff, aifs/slot/KAL count,
+- * beacon miss timeout, KAL timeout, etc.
+- */
+- set = AR_WOW_BACK_OFF_SHIFT(AR_WOW_PAT_BACKOFF);
+- REG_SET_BIT(ah, AR_WOW_PATTERN, set);
++ if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
++ ath_dbg(common, WOW, "None of the STA vifs are associated\n");
++ ret = 1;
++ goto fail_wow;
++ }
++
++ if (sc->nvifs > 1) {
++ ath_dbg(common, WOW, "WoW for multivif is not yet supported\n");
++ ret = 1;
++ goto fail_wow;
++ }
- return true;
- }
-+EXPORT_SYMBOL_GPL(rtl_tx_mgmt_proc);
+- set = AR_WOW_AIFS_CNT(AR_WOW_CNT_AIFS_CNT) |
+- AR_WOW_SLOT_CNT(AR_WOW_CNT_SLOT_CNT) |
+- AR_WOW_KEEP_ALIVE_CNT(AR_WOW_CNT_KA_CNT);
+- REG_SET_BIT(ah, AR_WOW_COUNT, set);
+-
+- if (pattern_enable & AH_WOW_BEACON_MISS)
+- set = AR_WOW_BEACON_TIMO;
+- /* We are not using beacon miss, program a large value */
+- else
+- set = AR_WOW_BEACON_TIMO_MAX;
++ ath9k_wow_map_triggers(sc, wowlan, &wow_triggers_enabled);
- void rtl_get_tcb_desc(struct ieee80211_hw *hw,
- struct ieee80211_tx_info *info,
-@@ -1053,6 +1060,7 @@ bool rtl_action_proc(struct ieee80211_hw
+- REG_WRITE(ah, AR_WOW_BCN_TIMO, set);
++ ath_dbg(common, WOW, "WoW triggers enabled 0x%x\n",
++ wow_triggers_enabled);
- return true;
- }
-+EXPORT_SYMBOL_GPL(rtl_action_proc);
+- /*
+- * Keep alive timo in ms except AR9280
+- */
+- if (!pattern_enable)
+- set = AR_WOW_KEEP_ALIVE_NEVER;
+- else
+- set = KAL_TIMEOUT * 32;
++ ath9k_ps_wakeup(sc);
- /*should call before software enc*/
- u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
-@@ -1126,6 +1134,7 @@ u8 rtl_is_special_data(struct ieee80211_
+- REG_WRITE(ah, AR_WOW_KEEP_ALIVE_TIMO, set);
++ ath9k_stop_btcoex(sc);
- return false;
- }
-+EXPORT_SYMBOL_GPL(rtl_is_special_data);
+ /*
+- * Keep alive delay in us. based on 'power on clock',
+- * therefore in usec
++ * Enable wake up on recieving disassoc/deauth
++ * frame by default.
+ */
+- set = KAL_DELAY * 1000;
+- REG_WRITE(ah, AR_WOW_KEEP_ALIVE_DELAY, set);
++ ath9k_wow_add_disassoc_deauth_pattern(sc);
- /*********************************************************
- *
-@@ -1301,6 +1310,7 @@ void rtl_beacon_statistic(struct ieee802
+- /*
+- * Create keep alive pattern to respond to beacons
+- */
+- ath9k_wow_create_keep_alive_pattern(ah);
++ if (wow_triggers_enabled & AH_WOW_USER_PATTERN_EN)
++ ath9k_wow_add_pattern(sc, wowlan);
- rtlpriv->link_info.bcn_rx_inperiod++;
- }
-+EXPORT_SYMBOL_GPL(rtl_beacon_statistic);
++ spin_lock_bh(&sc->sc_pcu_lock);
+ /*
+- * Configure MAC WoW Registers
++ * To avoid false wake, we enable beacon miss interrupt only
++ * when we go to sleep. We save the current interrupt mask
++ * so we can restore it after the system wakes up
+ */
+- set = 0;
+- /* Send keep alive timeouts anyway */
+- clr = AR_WOW_KEEP_ALIVE_AUTO_DIS;
+-
+- if (pattern_enable & AH_WOW_LINK_CHANGE)
+- wow_event_mask |= AR_WOW_KEEP_ALIVE_FAIL;
+- else
+- set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
++ sc->wow_intr_before_sleep = ah->imask;
++ ah->imask &= ~ATH9K_INT_GLOBAL;
++ ath9k_hw_disable_interrupts(ah);
++ ah->imask = ATH9K_INT_BMISS | ATH9K_INT_GLOBAL;
++ ath9k_hw_set_interrupts(ah);
++ ath9k_hw_enable_interrupts(ah);
+
+- set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
+- REG_RMW(ah, AR_WOW_KEEP_ALIVE, set, clr);
++ spin_unlock_bh(&sc->sc_pcu_lock);
- void rtl_watchdog_wq_callback(void *data)
- {
-@@ -1794,6 +1804,7 @@ void rtl_recognize_peer(struct ieee80211
+ /*
+- * we are relying on a bmiss failure. ensure we have
+- * enough threshold to prevent false positives
++ * we can now sync irq and kill any running tasklets, since we already
++ * disabled interrupts and not holding a spin lock
+ */
+- REG_RMW_FIELD(ah, AR_RSSI_THR, AR_RSSI_THR_BM_THR,
+- AR_WOW_BMISSTHRESHOLD);
++ synchronize_irq(sc->irq);
++ tasklet_kill(&sc->intr_tq);
++
++ ath9k_hw_wow_enable(ah, wow_triggers_enabled);
- mac->vendor = vendor;
- }
-+EXPORT_SYMBOL_GPL(rtl_recognize_peer);
+- set = 0;
+- clr = 0;
++ ath9k_ps_restore(sc);
++ ath_dbg(common, ANY, "WoW enabled in ath9k\n");
++ atomic_inc(&sc->wow_sleep_proc_intr);
- /*********************************************************
- *
-@@ -1850,6 +1861,7 @@ struct attribute_group rtl_attribute_gro
- .name = "rtlsysfs",
- .attrs = rtl_sysfs_entries,
- };
-+EXPORT_SYMBOL_GPL(rtl_attribute_group);
+- if (pattern_enable & AH_WOW_BEACON_MISS) {
+- set = AR_WOW_BEACON_FAIL_EN;
+- wow_event_mask |= AR_WOW_BEACON_FAIL;
+- } else {
+- clr = AR_WOW_BEACON_FAIL_EN;
++fail_wow:
++ mutex_unlock(&sc->mutex);
++ return ret;
++}
++
++int ath9k_resume(struct ieee80211_hw *hw)
++{
++ struct ath_softc *sc = hw->priv;
++ struct ath_hw *ah = sc->sc_ah;
++ struct ath_common *common = ath9k_hw_common(ah);
++ u32 wow_status;
++
++ mutex_lock(&sc->mutex);
++
++ ath9k_ps_wakeup(sc);
++
++ spin_lock_bh(&sc->sc_pcu_lock);
++
++ ath9k_hw_disable_interrupts(ah);
++ ah->imask = sc->wow_intr_before_sleep;
++ ath9k_hw_set_interrupts(ah);
++ ath9k_hw_enable_interrupts(ah);
++
++ spin_unlock_bh(&sc->sc_pcu_lock);
++
++ wow_status = ath9k_hw_wow_wakeup(ah);
++
++ if (atomic_read(&sc->wow_got_bmiss_intr) == 0) {
++ /*
++ * some devices may not pick beacon miss
++ * as the reason they woke up so we add
++ * that here for that shortcoming.
++ */
++ wow_status |= AH_WOW_BEACON_MISS;
++ atomic_dec(&sc->wow_got_bmiss_intr);
++ ath_dbg(common, ANY, "Beacon miss interrupt picked up during WoW sleep\n");
+ }
- MODULE_AUTHOR("lizhaoming <chaoming_li@realsil.com.cn>");
- MODULE_AUTHOR("Realtek WlanFAE <wlanfae@realtek.com>");
-@@ -1857,7 +1869,8 @@ MODULE_AUTHOR("Larry Finger <Larry.FInge
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("Realtek 802.11n PCI wireless core");
+- REG_RMW(ah, AR_WOW_BCN_EN, set, clr);
++ atomic_dec(&sc->wow_sleep_proc_intr);
--struct rtl_global_var global_var = {};
-+struct rtl_global_var rtl_global_var = {};
-+EXPORT_SYMBOL_GPL(rtl_global_var);
+- set = 0;
+- clr = 0;
+- /*
+- * Enable the magic packet registers
+- */
+- if (pattern_enable & AH_WOW_MAGIC_PATTERN_EN) {
+- set = AR_WOW_MAGIC_EN;
+- wow_event_mask |= AR_WOW_MAGIC_PAT_FOUND;
+- } else {
+- clr = AR_WOW_MAGIC_EN;
++ if (wow_status) {
++ ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n",
++ ath9k_hw_wow_event_to_string(wow_status), wow_status);
+ }
+- set |= AR_WOW_MAC_INTR_EN;
+- REG_RMW(ah, AR_WOW_PATTERN, set, clr);
- static int __init rtl_core_module_init(void)
- {
-@@ -1865,8 +1878,8 @@ static int __init rtl_core_module_init(v
- pr_err("Unable to register rtl_rc, use default RC !!\n");
+- REG_WRITE(ah, AR_WOW_PATTERN_MATCH_LT_256B,
+- AR_WOW_PATTERN_SUPPORTED);
++ ath_restart_work(sc);
++ ath9k_start_btcoex(sc);
- /* init some global vars */
-- INIT_LIST_HEAD(&global_var.glb_priv_list);
-- spin_lock_init(&global_var.glb_list_lock);
-+ INIT_LIST_HEAD(&rtl_global_var.glb_priv_list);
-+ spin_lock_init(&rtl_global_var.glb_list_lock);
+- /*
+- * Set the power states appropriately and enable PME
+- */
+- clr = 0;
+- set = AR_PMCTRL_PWR_STATE_D1D3 | AR_PMCTRL_HOST_PME_EN |
+- AR_PMCTRL_PWR_PM_CTRL_ENA;
++ ath9k_ps_restore(sc);
++ mutex_unlock(&sc->mutex);
- return 0;
- }
---- a/drivers/net/wireless/rtlwifi/base.h
-+++ b/drivers/net/wireless/rtlwifi/base.h
-@@ -147,7 +147,7 @@ void rtl_recognize_peer(struct ieee80211
- u8 rtl_tid_to_ac(u8 tid);
- extern struct attribute_group rtl_attribute_group;
- void rtl_easy_concurrent_retrytimer_callback(unsigned long data);
--extern struct rtl_global_var global_var;
-+extern struct rtl_global_var rtl_global_var;
- int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
- bool isht, u8 desc_rate, bool first_ampdu);
- bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);
---- a/drivers/net/wireless/rtlwifi/core.c
-+++ b/drivers/net/wireless/rtlwifi/core.c
-@@ -1330,3 +1330,4 @@ const struct ieee80211_ops rtl_ops = {
- .rfkill_poll = rtl_op_rfkill_poll,
- .flush = rtl_op_flush,
- };
-+EXPORT_SYMBOL_GPL(rtl_ops);
---- a/drivers/net/wireless/rtlwifi/debug.c
-+++ b/drivers/net/wireless/rtlwifi/debug.c
-@@ -51,3 +51,4 @@ void rtl_dbgp_flag_init(struct ieee80211
+- clr = AR_PCIE_PM_CTRL_ENA;
+- REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr);
++ return 0;
++}
- /*Init Debug flag enable condition */
- }
-+EXPORT_SYMBOL_GPL(rtl_dbgp_flag_init);
---- a/drivers/net/wireless/rtlwifi/efuse.c
-+++ b/drivers/net/wireless/rtlwifi/efuse.c
-@@ -229,6 +229,7 @@ void read_efuse_byte(struct ieee80211_hw
+- /*
+- * this is needed to prevent the chip waking up
+- * the host within 3-4 seconds with certain
+- * platform/BIOS. The fix is to enable
+- * D1 & D3 to match original definition and
+- * also match the OTP value. Anyway this
+- * is more related to SW WOW.
+- */
+- clr = AR_PMCTRL_PWR_STATE_D1D3;
+- REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
++void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
++{
++ struct ath_softc *sc = hw->priv;
+
+- set = AR_PMCTRL_PWR_STATE_D1D3_REAL;
+- REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
++ mutex_lock(&sc->mutex);
++ device_init_wakeup(sc->dev, 1);
++ device_set_wakeup_enable(sc->dev, enabled);
++ mutex_unlock(&sc->mutex);
++}
- *pbuf = (u8) (value32 & 0xff);
+- REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PRESERVE_SEQNUM);
++void ath9k_init_wow(struct ieee80211_hw *hw)
++{
++ struct ath_softc *sc = hw->priv;
+
+- /* to bring down WOW power low margin */
+- set = BIT(13);
+- REG_SET_BIT(ah, AR_PCIE_PHY_REG3, set);
+- /* HW WoW */
+- clr = BIT(5);
+- REG_CLR_BIT(ah, AR_PCU_MISC_MODE3, clr);
++ if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
++ (sc->driver_data & ATH9K_PCI_WOW) &&
++ device_can_wakeup(sc->dev))
++ hw->wiphy->wowlan = &ath9k_wowlan_support;
+
+- ath9k_hw_set_powermode_wow_sleep(ah);
+- ah->wow_event_mask = wow_event_mask;
++ atomic_set(&sc->wow_sleep_proc_intr, -1);
++ atomic_set(&sc->wow_got_bmiss_intr, -1);
}
-+EXPORT_SYMBOL_GPL(read_efuse_byte);
+-EXPORT_SYMBOL(ath9k_hw_wow_enable);
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -1786,6 +1786,9 @@ bool ath_drain_all_txq(struct ath_softc
+ if (!ATH_TXQ_SETUP(sc, i))
+ continue;
- void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
- {
---- a/drivers/net/wireless/rtlwifi/pci.c
-+++ b/drivers/net/wireless/rtlwifi/pci.c
-@@ -35,6 +35,13 @@
- #include "efuse.h"
- #include <linux/export.h>
- #include <linux/kmemleak.h>
-+#include <linux/module.h>
-+
-+MODULE_AUTHOR("lizhaoming <chaoming_li@realsil.com.cn>");
-+MODULE_AUTHOR("Realtek WlanFAE <wlanfae@realtek.com>");
-+MODULE_AUTHOR("Larry Finger <Larry.FInger@lwfinger.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("PCI basic driver for rtlwifi");
-
- static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {
- PCI_VENDOR_ID_INTEL,
-@@ -1008,19 +1015,6 @@ static void _rtl_pci_prepare_bcn_tasklet
- return;
++ if (!sc->tx.txq[i].axq_depth)
++ continue;
++
+ if (ath9k_hw_numtxpending(ah, sc->tx.txq[i].axq_qnum))
+ npend |= BIT(i);
+ }
+@@ -2749,6 +2752,8 @@ void ath_tx_node_cleanup(struct ath_soft
+ }
}
--static void rtl_lps_change_work_callback(struct work_struct *work)
--{
-- struct rtl_works *rtlworks =
-- container_of(work, struct rtl_works, lps_change_work);
-- struct ieee80211_hw *hw = rtlworks->hw;
-- struct rtl_priv *rtlpriv = rtl_priv(hw);
--
-- if (rtlpriv->enter_ps)
-- rtl_lps_enter(hw);
-- else
-- rtl_lps_leave(hw);
--}
--
- static void _rtl_pci_init_trx_var(struct ieee80211_hw *hw)
++#ifdef CONFIG_ATH9K_TX99
++
+ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,
+ struct ath_tx_control *txctl)
{
- struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-@@ -1899,7 +1893,7 @@ int rtl_pci_probe(struct pci_dev *pdev,
- rtlpriv->rtlhal.interface = INTF_PCI;
- rtlpriv->cfg = (struct rtl_hal_cfg *)(id->driver_data);
- rtlpriv->intf_ops = &rtl_pci_ops;
-- rtlpriv->glb_var = &global_var;
-+ rtlpriv->glb_var = &rtl_global_var;
+@@ -2791,3 +2796,5 @@ int ath9k_tx99_send(struct ath_softc *sc
- /*
- *init dbgp flags before all
---- a/drivers/net/wireless/rtlwifi/ps.c
-+++ b/drivers/net/wireless/rtlwifi/ps.c
-@@ -269,6 +269,7 @@ void rtl_ips_nic_on(struct ieee80211_hw
-
- spin_unlock_irqrestore(&rtlpriv->locks.ips_lock, flags);
+ return 0;
}
-+EXPORT_SYMBOL_GPL(rtl_ips_nic_on);
++
++#endif /* CONFIG_ATH9K_TX99 */
+--- a/drivers/net/wireless/ath/regd.c
++++ b/drivers/net/wireless/ath/regd.c
+@@ -37,17 +37,17 @@ static int __ath_regd_init(struct ath_re
+
+ /* We enable active scan on these a case by case basis by regulatory domain */
+ #define ATH9K_2GHZ_CH12_13 REG_RULE(2467-10, 2472+10, 40, 0, 20,\
+- NL80211_RRF_PASSIVE_SCAN)
++ NL80211_RRF_NO_IR)
+ #define ATH9K_2GHZ_CH14 REG_RULE(2484-10, 2484+10, 40, 0, 20,\
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)
++ NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM)
+
+ /* We allow IBSS on these on a case by case basis by regulatory domain */
+ #define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5350+10, 80, 0, 30,\
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+ #define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 5850+10, 80, 0, 30,\
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+ #define ATH9K_5GHZ_5725_5850 REG_RULE(5725-10, 5850+10, 80, 0, 30,\
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+
+ #define ATH9K_2GHZ_ALL ATH9K_2GHZ_CH01_11, \
+ ATH9K_2GHZ_CH12_13, \
+@@ -224,17 +224,16 @@ ath_reg_apply_beaconing_flags(struct wip
+ * regulatory_hint().
+ */
+ if (!(reg_rule->flags &
+- NL80211_RRF_NO_IBSS))
++ NL80211_RRF_NO_IR))
+ ch->flags &=
+- ~IEEE80211_CHAN_NO_IBSS;
++ ~IEEE80211_CHAN_NO_IR;
+ if (!(reg_rule->flags &
+- NL80211_RRF_PASSIVE_SCAN))
++ NL80211_RRF_NO_IR))
+ ch->flags &=
+- ~IEEE80211_CHAN_PASSIVE_SCAN;
++ ~IEEE80211_CHAN_NO_IR;
+ } else {
+ if (ch->beacon_found)
+- ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN);
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ }
+ }
+ }
+@@ -260,11 +259,11 @@ ath_reg_apply_active_scan_flags(struct w
+ */
+ if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+ ch = &sband->channels[11]; /* CH 12 */
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ ch = &sband->channels[12]; /* CH 13 */
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ return;
+ }
- /*for FW LPS*/
+@@ -278,17 +277,17 @@ ath_reg_apply_active_scan_flags(struct w
+ ch = &sband->channels[11]; /* CH 12 */
+ reg_rule = freq_reg_info(wiphy, ch->center_freq);
+ if (!IS_ERR(reg_rule)) {
+- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ }
-@@ -518,6 +519,7 @@ void rtl_swlps_beacon(struct ieee80211_h
- "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed);
+ ch = &sband->channels[12]; /* CH 13 */
+ reg_rule = freq_reg_info(wiphy, ch->center_freq);
+ if (!IS_ERR(reg_rule)) {
+- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
}
}
-+EXPORT_SYMBOL_GPL(rtl_swlps_beacon);
- void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
- {
-@@ -611,6 +613,19 @@ void rtl_swlps_rf_sleep(struct ieee80211
- MSECS(sleep_intv * mac->vif->bss_conf.beacon_int - 40));
+@@ -320,8 +319,8 @@ static void ath_reg_apply_radar_flags(st
+ */
+ if (!(ch->flags & IEEE80211_CHAN_DISABLED))
+ ch->flags |= IEEE80211_CHAN_RADAR |
+- IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR;
+ }
}
-+void rtl_lps_change_work_callback(struct work_struct *work)
-+{
-+ struct rtl_works *rtlworks =
-+ container_of(work, struct rtl_works, lps_change_work);
-+ struct ieee80211_hw *hw = rtlworks->hw;
-+ struct rtl_priv *rtlpriv = rtl_priv(hw);
-+
-+ if (rtlpriv->enter_ps)
-+ rtl_lps_enter(hw);
-+ else
-+ rtl_lps_leave(hw);
-+}
-+EXPORT_SYMBOL_GPL(rtl_lps_change_work_callback);
-
- void rtl_swlps_wq_callback(void *data)
- {
-@@ -922,3 +937,4 @@ void rtl_p2p_info(struct ieee80211_hw *h
- else
- rtl_p2p_noa_ie(hw, data, len - FCS_LEN);
- }
-+EXPORT_SYMBOL_GPL(rtl_p2p_info);
---- a/drivers/net/wireless/rtlwifi/usb.c
-+++ b/drivers/net/wireless/rtlwifi/usb.c
-@@ -32,6 +32,13 @@
- #include "ps.h"
- #include "rtl8192c/fw_common.h"
- #include <linux/export.h>
-+#include <linux/module.h>
-+
-+MODULE_AUTHOR("lizhaoming <chaoming_li@realsil.com.cn>");
-+MODULE_AUTHOR("Realtek WlanFAE <wlanfae@realtek.com>");
-+MODULE_AUTHOR("Larry Finger <Larry.FInger@lwfinger.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("USB basic driver for rtlwifi");
-
- #define REALTEK_USB_VENQT_READ 0xC0
- #define REALTEK_USB_VENQT_WRITE 0x40
-@@ -1070,6 +1077,8 @@ int rtl_usb_probe(struct usb_interface *
- spin_lock_init(&rtlpriv->locks.usb_lock);
- INIT_WORK(&rtlpriv->works.fill_h2c_cmd,
- rtl_fill_h2c_cmd_work_callback);
-+ INIT_WORK(&rtlpriv->works.lps_change_work,
-+ rtl_lps_change_work_callback);
-
- rtlpriv->usb_data_index = 0;
- init_completion(&rtlpriv->firmware_loading_complete);
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -64,7 +64,6 @@ struct ath_node;
+--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+@@ -812,7 +812,7 @@ static s32 brcmf_p2p_run_escan(struct br
+ struct ieee80211_channel *chan = request->channels[i];
- struct ath_config {
- u16 txpowlimit;
-- u8 cabqReadytime;
- };
+ if (chan->flags & (IEEE80211_CHAN_RADAR |
+- IEEE80211_CHAN_PASSIVE_SCAN))
++ IEEE80211_CHAN_NO_IR))
+ continue;
- /*************************/
-@@ -72,17 +71,12 @@ struct ath_config {
- /*************************/
+ chanspecs[i] = channel_to_chanspec(&p2p->cfg->d11inf,
+--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+@@ -202,9 +202,9 @@ static struct ieee80211_supported_band _
+
+ /* This is to override regulatory domains defined in cfg80211 module (reg.c)
+ * By default world regulatory domain defined in reg.c puts the flags
+- * NL80211_RRF_PASSIVE_SCAN and NL80211_RRF_NO_IBSS for 5GHz channels (for
+- * 36..48 and 149..165). With respect to these flags, wpa_supplicant doesn't
+- * start p2p operations on 5GHz channels. All the changes in world regulatory
++ * NL80211_RRF_NO_IR for 5GHz channels (for * 36..48 and 149..165).
++ * With respect to these flags, wpa_supplicant doesn't * start p2p
++ * operations on 5GHz channels. All the changes in world regulatory
+ * domain are to be done here.
+ */
+ static const struct ieee80211_regdomain brcmf_regdom = {
+@@ -5197,10 +5197,10 @@ static s32 brcmf_construct_reginfo(struc
+ if (channel & WL_CHAN_RADAR)
+ band_chan_arr[index].flags |=
+ (IEEE80211_CHAN_RADAR |
+- IEEE80211_CHAN_NO_IBSS);
++ IEEE80211_CHAN_NO_IR);
+ if (channel & WL_CHAN_PASSIVE)
+ band_chan_arr[index].flags |=
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ IEEE80211_CHAN_NO_IR;
+ }
+ }
+ if (!update)
+--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+@@ -59,23 +59,20 @@
+
+ #define BRCM_2GHZ_2412_2462 REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
+ #define BRCM_2GHZ_2467_2472 REG_RULE(2467-10, 2472+10, 20, 0, 19, \
+- NL80211_RRF_PASSIVE_SCAN | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+
+ #define BRCM_5GHZ_5180_5240 REG_RULE(5180-10, 5240+10, 40, 0, 21, \
+- NL80211_RRF_PASSIVE_SCAN | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+ #define BRCM_5GHZ_5260_5320 REG_RULE(5260-10, 5320+10, 40, 0, 21, \
+- NL80211_RRF_PASSIVE_SCAN | \
++ NL80211_RRF_NO_IR | \
+ NL80211_RRF_DFS | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+ #define BRCM_5GHZ_5500_5700 REG_RULE(5500-10, 5700+10, 40, 0, 21, \
+- NL80211_RRF_PASSIVE_SCAN | \
++ NL80211_RRF_NO_IR | \
+ NL80211_RRF_DFS | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+ #define BRCM_5GHZ_5745_5825 REG_RULE(5745-10, 5825+10, 40, 0, 21, \
+- NL80211_RRF_PASSIVE_SCAN | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+
+ static const struct ieee80211_regdomain brcms_regdom_x2 = {
+ .n_reg_rules = 6,
+@@ -395,7 +392,7 @@ brcms_c_channel_set_chanspec(struct brcm
+ brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
+
+ brcms_b_set_chanspec(wlc->hw, chanspec,
+- !!(ch->flags & IEEE80211_CHAN_PASSIVE_SCAN),
++ !!(ch->flags & IEEE80211_CHAN_NO_IR),
+ &txpwr);
+ }
- #define ATH_TXBUF_RESET(_bf) do { \
-- (_bf)->bf_stale = false; \
- (_bf)->bf_lastbf = NULL; \
- (_bf)->bf_next = NULL; \
- memset(&((_bf)->bf_state), 0, \
- sizeof(struct ath_buf_state)); \
- } while (0)
+@@ -657,8 +654,8 @@ static void brcms_reg_apply_radar_flags(
+ */
+ if (!(ch->flags & IEEE80211_CHAN_DISABLED))
+ ch->flags |= IEEE80211_CHAN_RADAR |
+- IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR;
+ }
+ }
--#define ATH_RXBUF_RESET(_bf) do { \
-- (_bf)->bf_stale = false; \
-- } while (0)
--
- /**
- * enum buffer_type - Buffer type flags
- *
-@@ -137,7 +131,8 @@ int ath_descdma_setup(struct ath_softc *
- #define ATH_AGGR_ENCRYPTDELIM 10
- /* minimum h/w qdepth to be sustained to maximize aggregation */
- #define ATH_AGGR_MIN_QDEPTH 2
--#define ATH_AMPDU_SUBFRAME_DEFAULT 32
-+/* minimum h/w qdepth for non-aggregated traffic */
-+#define ATH_NON_AGGR_MIN_QDEPTH 8
-
- #define IEEE80211_SEQ_SEQ_SHIFT 4
- #define IEEE80211_SEQ_MAX 4096
-@@ -174,12 +169,6 @@ int ath_descdma_setup(struct ath_softc *
-
- #define ATH_TX_COMPLETE_POLL_INT 1000
-
--enum ATH_AGGR_STATUS {
-- ATH_AGGR_DONE,
-- ATH_AGGR_BAW_CLOSED,
-- ATH_AGGR_LIMITED,
--};
--
- #define ATH_TXFIFO_DEPTH 8
- struct ath_txq {
- int mac80211_qnum; /* mac80211 queue number, -1 means not mac80211 Q */
-@@ -201,10 +190,10 @@ struct ath_txq {
-
- struct ath_atx_ac {
- struct ath_txq *txq;
-- int sched;
- struct list_head list;
- struct list_head tid_q;
- bool clear_ps_filter;
-+ bool sched;
+@@ -688,14 +685,13 @@ brcms_reg_apply_beaconing_flags(struct w
+ if (IS_ERR(rule))
+ continue;
+
+- if (!(rule->flags & NL80211_RRF_NO_IBSS))
+- ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
+- if (!(rule->flags & NL80211_RRF_PASSIVE_SCAN))
++ if (!(rule->flags & NL80211_RRF_NO_IR))
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
++ if (!(rule->flags & NL80211_RRF_NO_IR))
+ ch->flags &=
+- ~IEEE80211_CHAN_PASSIVE_SCAN;
++ ~IEEE80211_CHAN_NO_IR;
+ } else if (ch->beacon_found) {
+- ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN);
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ }
+ }
+ }
+--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+@@ -125,13 +125,13 @@ static struct ieee80211_channel brcms_2g
+ CHAN2GHZ(10, 2457, IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN2GHZ(11, 2462, IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN2GHZ(12, 2467,
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
++ IEEE80211_CHAN_NO_IR |
+ IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN2GHZ(13, 2472,
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
++ IEEE80211_CHAN_NO_IR |
+ IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN2GHZ(14, 2484,
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
++ IEEE80211_CHAN_NO_IR |
+ IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS |
+ IEEE80211_CHAN_NO_OFDM)
};
+@@ -144,51 +144,51 @@ static struct ieee80211_channel brcms_5g
+ CHAN5GHZ(48, IEEE80211_CHAN_NO_HT40PLUS),
+ /* UNII-2 */
+ CHAN5GHZ(52,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
+ CHAN5GHZ(56,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN5GHZ(60,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
+ CHAN5GHZ(64,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
+ /* MID */
+ CHAN5GHZ(100,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
+ CHAN5GHZ(104,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN5GHZ(108,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
+ CHAN5GHZ(112,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN5GHZ(116,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
+ CHAN5GHZ(120,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN5GHZ(124,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
+ CHAN5GHZ(128,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN5GHZ(132,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40MINUS),
+ CHAN5GHZ(136,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS),
+ CHAN5GHZ(140,
+- IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS |
++ IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_HT40PLUS |
+ IEEE80211_CHAN_NO_HT40MINUS),
+ /* UNII-3 */
+ CHAN5GHZ(149, IEEE80211_CHAN_NO_HT40MINUS),
+--- a/drivers/net/wireless/cw1200/scan.c
++++ b/drivers/net/wireless/cw1200/scan.c
+@@ -197,9 +197,9 @@ void cw1200_scan_work(struct work_struct
+ if ((*it)->band != first->band)
+ break;
+ if (((*it)->flags ^ first->flags) &
+- IEEE80211_CHAN_PASSIVE_SCAN)
++ IEEE80211_CHAN_NO_IR)
+ break;
+- if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
++ if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
+ (*it)->max_power != first->max_power)
+ break;
+ }
+@@ -210,7 +210,7 @@ void cw1200_scan_work(struct work_struct
+ else
+ scan.max_tx_rate = WSM_TRANSMIT_RATE_1;
+ scan.num_probes =
+- (first->flags & IEEE80211_CHAN_PASSIVE_SCAN) ? 0 : 2;
++ (first->flags & IEEE80211_CHAN_NO_IR) ? 0 : 2;
+ scan.num_ssids = priv->scan.n_ssids;
+ scan.ssids = &priv->scan.ssids[0];
+ scan.num_channels = it - priv->scan.curr;
+@@ -233,7 +233,7 @@ void cw1200_scan_work(struct work_struct
+ }
+ for (i = 0; i < scan.num_channels; ++i) {
+ scan.ch[i].number = priv->scan.curr[i]->hw_value;
+- if (priv->scan.curr[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN) {
++ if (priv->scan.curr[i]->flags & IEEE80211_CHAN_NO_IR) {
+ scan.ch[i].min_chan_time = 50;
+ scan.ch[i].max_chan_time = 100;
+ } else {
+@@ -241,7 +241,7 @@ void cw1200_scan_work(struct work_struct
+ scan.ch[i].max_chan_time = 25;
+ }
+ }
+- if (!(first->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
++ if (!(first->flags & IEEE80211_CHAN_NO_IR) &&
+ priv->scan.output_power != first->max_power) {
+ priv->scan.output_power = first->max_power;
+ wsm_set_output_power(priv,
+--- a/drivers/net/wireless/ipw2x00/ipw2100.c
++++ b/drivers/net/wireless/ipw2x00/ipw2100.c
+@@ -1934,10 +1934,10 @@ static int ipw2100_wdev_init(struct net_
+ bg_band->channels[i].max_power = geo->bg[i].max_power;
+ if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
+ bg_band->channels[i].flags |=
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ IEEE80211_CHAN_NO_IR;
+ if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
+ bg_band->channels[i].flags |=
+- IEEE80211_CHAN_NO_IBSS;
++ IEEE80211_CHAN_NO_IR;
+ if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
+ bg_band->channels[i].flags |=
+ IEEE80211_CHAN_RADAR;
+--- a/drivers/net/wireless/ipw2x00/ipw2200.c
++++ b/drivers/net/wireless/ipw2x00/ipw2200.c
+@@ -11472,10 +11472,10 @@ static int ipw_wdev_init(struct net_devi
+ bg_band->channels[i].max_power = geo->bg[i].max_power;
+ if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
+ bg_band->channels[i].flags |=
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ IEEE80211_CHAN_NO_IR;
+ if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
+ bg_band->channels[i].flags |=
+- IEEE80211_CHAN_NO_IBSS;
++ IEEE80211_CHAN_NO_IR;
+ if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
+ bg_band->channels[i].flags |=
+ IEEE80211_CHAN_RADAR;
+@@ -11511,10 +11511,10 @@ static int ipw_wdev_init(struct net_devi
+ a_band->channels[i].max_power = geo->a[i].max_power;
+ if (geo->a[i].flags & LIBIPW_CH_PASSIVE_ONLY)
+ a_band->channels[i].flags |=
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ IEEE80211_CHAN_NO_IR;
+ if (geo->a[i].flags & LIBIPW_CH_NO_IBSS)
+ a_band->channels[i].flags |=
+- IEEE80211_CHAN_NO_IBSS;
++ IEEE80211_CHAN_NO_IR;
+ if (geo->a[i].flags & LIBIPW_CH_RADAR_DETECT)
+ a_band->channels[i].flags |=
+ IEEE80211_CHAN_RADAR;
+--- a/drivers/net/wireless/iwlegacy/3945-mac.c
++++ b/drivers/net/wireless/iwlegacy/3945-mac.c
+@@ -1595,7 +1595,7 @@ il3945_get_channels_for_scan(struct il_p
+ * and use long active_dwell time.
+ */
+ if (!is_active || il_is_channel_passive(ch_info) ||
+- (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {
++ (chan->flags & IEEE80211_CHAN_NO_IR)) {
+ scan_ch->type = 0; /* passive */
+ if (IL_UCODE_API(il->ucode_ver) == 1)
+ scan_ch->active_dwell =
+--- a/drivers/net/wireless/iwlegacy/4965-mac.c
++++ b/drivers/net/wireless/iwlegacy/4965-mac.c
+@@ -805,7 +805,7 @@ il4965_get_channels_for_scan(struct il_p
+ }
- struct ath_frame_info {
-@@ -212,14 +201,24 @@ struct ath_frame_info {
- int framelen;
- enum ath9k_key_type keytype;
- u8 keyix;
-- u8 retries;
- u8 rtscts_rate;
-+ u8 retries : 7;
-+ u8 baw_tracked : 1;
-+};
-+
-+struct ath_rxbuf {
-+ struct list_head list;
-+ struct sk_buff *bf_mpdu;
-+ void *bf_desc;
-+ dma_addr_t bf_daddr;
-+ dma_addr_t bf_buf_addr;
+ if (!is_active || il_is_channel_passive(ch_info) ||
+- (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
++ (chan->flags & IEEE80211_CHAN_NO_IR))
+ scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
+ else
+ scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
+--- a/drivers/net/wireless/iwlegacy/common.c
++++ b/drivers/net/wireless/iwlegacy/common.c
+@@ -3447,10 +3447,10 @@ il_init_geos(struct il_priv *il)
+
+ if (il_is_channel_valid(ch)) {
+ if (!(ch->flags & EEPROM_CHANNEL_IBSS))
+- geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
++ geo_ch->flags |= IEEE80211_CHAN_NO_IR;
+
+ if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
+- geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
++ geo_ch->flags |= IEEE80211_CHAN_NO_IR;
+
+ if (ch->flags & EEPROM_CHANNEL_RADAR)
+ geo_ch->flags |= IEEE80211_CHAN_RADAR;
+--- a/drivers/net/wireless/iwlegacy/debug.c
++++ b/drivers/net/wireless/iwlegacy/debug.c
+@@ -567,12 +567,12 @@ il_dbgfs_channels_read(struct file *file
+ flags & IEEE80211_CHAN_RADAR ?
+ " (IEEE 802.11h required)" : "",
+ ((channels[i].
+- flags & IEEE80211_CHAN_NO_IBSS) ||
++ flags & IEEE80211_CHAN_NO_IR) ||
+ (channels[i].
+ flags & IEEE80211_CHAN_RADAR)) ? "" :
+ ", IBSS",
+ channels[i].
+- flags & IEEE80211_CHAN_PASSIVE_SCAN ?
++ flags & IEEE80211_CHAN_NO_IR ?
+ "passive only" : "active/passive");
+ }
+ supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);
+@@ -594,12 +594,12 @@ il_dbgfs_channels_read(struct file *file
+ flags & IEEE80211_CHAN_RADAR ?
+ " (IEEE 802.11h required)" : "",
+ ((channels[i].
+- flags & IEEE80211_CHAN_NO_IBSS) ||
++ flags & IEEE80211_CHAN_NO_IR) ||
+ (channels[i].
+ flags & IEEE80211_CHAN_RADAR)) ? "" :
+ ", IBSS",
+ channels[i].
+- flags & IEEE80211_CHAN_PASSIVE_SCAN ?
++ flags & IEEE80211_CHAN_NO_IR ?
+ "passive only" : "active/passive");
+ }
+ ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
++++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+@@ -352,12 +352,12 @@ static ssize_t iwl_dbgfs_channels_read(s
+ channels[i].max_power,
+ channels[i].flags & IEEE80211_CHAN_RADAR ?
+ " (IEEE 802.11h required)" : "",
+- ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
++ ((channels[i].flags & IEEE80211_CHAN_NO_IR)
+ || (channels[i].flags &
+ IEEE80211_CHAN_RADAR)) ? "" :
+ ", IBSS",
+ channels[i].flags &
+- IEEE80211_CHAN_PASSIVE_SCAN ?
++ IEEE80211_CHAN_NO_IR ?
+ "passive only" : "active/passive");
+ }
+ supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);
+@@ -375,12 +375,12 @@ static ssize_t iwl_dbgfs_channels_read(s
+ channels[i].max_power,
+ channels[i].flags & IEEE80211_CHAN_RADAR ?
+ " (IEEE 802.11h required)" : "",
+- ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
++ ((channels[i].flags & IEEE80211_CHAN_NO_IR)
+ || (channels[i].flags &
+ IEEE80211_CHAN_RADAR)) ? "" :
+ ", IBSS",
+ channels[i].flags &
+- IEEE80211_CHAN_PASSIVE_SCAN ?
++ IEEE80211_CHAN_NO_IR ?
+ "passive only" : "active/passive");
+ }
+ ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+--- a/drivers/net/wireless/iwlwifi/dvm/scan.c
++++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
+@@ -544,7 +544,7 @@ static int iwl_get_channels_for_scan(str
+ channel = chan->hw_value;
+ scan_ch->channel = cpu_to_le16(channel);
+
+- if (!is_active || (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
++ if (!is_active || (chan->flags & IEEE80211_CHAN_NO_IR))
+ scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
+ else
+ scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
+--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
++++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+@@ -614,10 +614,10 @@ static int iwl_init_channel_map(struct d
+ channel->flags = IEEE80211_CHAN_NO_HT40;
+
+ if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS))
+- channel->flags |= IEEE80211_CHAN_NO_IBSS;
++ channel->flags |= IEEE80211_CHAN_NO_IR;
+
+ if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
+- channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
++ channel->flags |= IEEE80211_CHAN_NO_IR;
+
+ if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
+ channel->flags |= IEEE80211_CHAN_RADAR;
+--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
++++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+@@ -223,10 +223,10 @@ static int iwl_init_channel_map(struct d
+ channel->flags |= IEEE80211_CHAN_NO_160MHZ;
+
+ if (!(ch_flags & NVM_CHANNEL_IBSS))
+- channel->flags |= IEEE80211_CHAN_NO_IBSS;
++ channel->flags |= IEEE80211_CHAN_NO_IR;
+
+ if (!(ch_flags & NVM_CHANNEL_ACTIVE))
+- channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
++ channel->flags |= IEEE80211_CHAN_NO_IR;
+
+ if (ch_flags & NVM_CHANNEL_RADAR)
+ channel->flags |= IEEE80211_CHAN_RADAR;
+--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
++++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
+@@ -192,7 +192,7 @@ static void iwl_mvm_scan_fill_channels(s
+ for (i = 0; i < cmd->channel_count; i++) {
+ chan->channel = cpu_to_le16(req->channels[i]->hw_value);
+ chan->type = cpu_to_le32(type);
+- if (req->channels[i]->flags & IEEE80211_CHAN_PASSIVE_SCAN)
++ if (req->channels[i]->flags & IEEE80211_CHAN_NO_IR)
+ chan->type &= cpu_to_le32(~SCAN_CHANNEL_TYPE_ACTIVE);
+ chan->active_dwell = cpu_to_le16(active_dwell);
+ chan->passive_dwell = cpu_to_le16(passive_dwell);
+@@ -642,7 +642,7 @@ static void iwl_build_channel_cfg(struct
+ channels->iter_count[index] = cpu_to_le16(1);
+ channels->iter_interval[index] = 0;
+
+- if (!(s_band->channels[i].flags & IEEE80211_CHAN_PASSIVE_SCAN))
++ if (!(s_band->channels[i].flags & IEEE80211_CHAN_NO_IR))
+ channels->type[index] |=
+ cpu_to_le32(IWL_SCAN_OFFLOAD_CHANNEL_ACTIVE);
+
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -159,7 +159,7 @@ static const struct ieee80211_regdomain
+ .reg_rules = {
+ REG_RULE(2412-10, 2462+10, 40, 0, 20, 0),
+ REG_RULE(5725-10, 5850+10, 40, 0, 30,
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
++ NL80211_RRF_NO_IR),
+ }
};
- struct ath_buf_state {
- u8 bf_type;
- u8 bfs_paprd;
- u8 ndelim;
-+ bool stale;
- u16 seqno;
- unsigned long bfs_paprd_timestamp;
- };
-@@ -233,7 +232,6 @@ struct ath_buf {
- 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, for DMA */
-- bool bf_stale;
- struct ieee80211_tx_rate rates[4];
- struct ath_buf_state bf_state;
- };
-@@ -241,16 +239,18 @@ struct ath_buf {
- struct ath_atx_tid {
- struct list_head list;
- struct sk_buff_head buf_q;
-+ struct sk_buff_head retry_q;
- struct ath_node *an;
- struct ath_atx_ac *ac;
- unsigned long tx_buf[BITS_TO_LONGS(ATH_TID_MAX_BUFS)];
-- int bar_index;
- u16 seq_start;
- u16 seq_next;
- u16 baw_size;
-- int tidno;
-+ u8 tidno;
- int baw_head; /* first un-acked tx buffer */
- int baw_tail; /* next unused tx buffer slot */
-+
-+ s8 bar_index;
- bool sched;
- bool paused;
- bool active;
-@@ -262,12 +262,13 @@ struct ath_node {
- struct ieee80211_vif *vif; /* interface with which we're associated */
- struct ath_atx_tid tid[IEEE80211_NUM_TIDS];
- struct ath_atx_ac ac[IEEE80211_NUM_ACS];
-- int ps_key;
-
- u16 maxampdu;
- u8 mpdudensity;
-+ s8 ps_key;
-
- bool sleeping;
-+ bool no_ps_filter;
-
- #if defined(CPTCFG_MAC80211_DEBUGFS) && defined(CPTCFG_ATH9K_DEBUGFS)
- struct dentry *node_stat;
-@@ -317,6 +318,7 @@ struct ath_rx {
- struct ath_descdma rxdma;
- struct ath_rx_edma rx_edma[ATH9K_RX_QUEUE_MAX];
-
-+ struct ath_rxbuf *buf_hold;
- struct sk_buff *frag;
-
- u32 ampdu_ref;
-@@ -367,6 +369,7 @@ void ath9k_release_buffered_frames(struc
- /********/
-
- struct ath_vif {
-+ struct ath_node mcast_node;
- int av_bslot;
- bool primary_sta_vif;
- __le64 tsf_adjust; /* TSF adjustment for staggered beacons */
-@@ -459,6 +462,7 @@ void ath_check_ani(struct ath_softc *sc)
- int ath_update_survey_stats(struct ath_softc *sc);
- void ath_update_survey_nf(struct ath_softc *sc, int channel);
- void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
-+void ath_ps_full_sleep(unsigned long data);
+@@ -1485,7 +1485,7 @@ static void hw_scan_work(struct work_str
+ req->channels[hwsim->scan_chan_idx]->center_freq);
- /**********/
- /* BTCOEX */
-@@ -585,19 +589,14 @@ static inline void ath_fill_led_pin(stru
- #define ATH_ANT_DIV_COMB_MAX_COUNT 100
- #define ATH_ANT_DIV_COMB_ALT_ANT_RATIO 30
- #define ATH_ANT_DIV_COMB_ALT_ANT_RATIO2 20
-+#define ATH_ANT_DIV_COMB_ALT_ANT_RATIO_LOW_RSSI 50
-+#define ATH_ANT_DIV_COMB_ALT_ANT_RATIO2_LOW_RSSI 50
-
- #define ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA -1
- #define ATH_ANT_DIV_COMB_LNA1_DELTA_HI -4
- #define ATH_ANT_DIV_COMB_LNA1_DELTA_MID -2
- #define ATH_ANT_DIV_COMB_LNA1_DELTA_LOW 2
-
--enum ath9k_ant_div_comb_lna_conf {
-- ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2,
-- ATH_ANT_DIV_COMB_LNA2,
-- ATH_ANT_DIV_COMB_LNA1,
-- ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2,
--};
--
- struct ath_ant_comb {
- u16 count;
- u16 total_pkt_count;
-@@ -614,27 +613,36 @@ struct ath_ant_comb {
- int rssi_first;
- int rssi_second;
- int rssi_third;
-+ int ant_ratio;
-+ int ant_ratio2;
- bool alt_good;
- int quick_scan_cnt;
-- int main_conf;
-+ enum ath9k_ant_div_comb_lna_conf main_conf;
- enum ath9k_ant_div_comb_lna_conf first_quick_scan_conf;
- enum ath9k_ant_div_comb_lna_conf second_quick_scan_conf;
- bool first_ratio;
- bool second_ratio;
- unsigned long scan_start_time;
-+
-+ /*
-+ * Card-specific config values.
-+ */
-+ int low_rssi_thresh;
-+ int fast_div_bias;
+ hwsim->tmp_chan = req->channels[hwsim->scan_chan_idx];
+- if (hwsim->tmp_chan->flags & IEEE80211_CHAN_PASSIVE_SCAN ||
++ if (hwsim->tmp_chan->flags & IEEE80211_CHAN_NO_IR ||
+ !req->n_ssids) {
+ dwell = 120;
+ } else {
+--- a/drivers/net/wireless/mwifiex/cfg80211.c
++++ b/drivers/net/wireless/mwifiex/cfg80211.c
+@@ -50,24 +50,24 @@ static const struct ieee80211_regdomain
+ REG_RULE(2412-10, 2462+10, 40, 3, 20, 0),
+ /* Channel 12 - 13 */
+ REG_RULE(2467-10, 2472+10, 20, 3, 20,
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
++ NL80211_RRF_NO_IR),
+ /* Channel 14 */
+ REG_RULE(2484-10, 2484+10, 20, 3, 20,
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
++ NL80211_RRF_NO_IR |
+ NL80211_RRF_NO_OFDM),
+ /* Channel 36 - 48 */
+ REG_RULE(5180-10, 5240+10, 40, 3, 20,
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
++ NL80211_RRF_NO_IR),
+ /* Channel 149 - 165 */
+ REG_RULE(5745-10, 5825+10, 40, 3, 20,
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS),
++ NL80211_RRF_NO_IR),
+ /* Channel 52 - 64 */
+ REG_RULE(5260-10, 5320+10, 40, 3, 30,
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
++ NL80211_RRF_NO_IR |
+ NL80211_RRF_DFS),
+ /* Channel 100 - 140 */
+ REG_RULE(5500-10, 5700+10, 40, 3, 30,
+- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS |
++ NL80211_RRF_NO_IR |
+ NL80211_RRF_DFS),
+ }
};
+@@ -1968,7 +1968,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiph
+ user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
+ user_scan_cfg->chan_list[i].radio_type = chan->band;
+
+- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
++ if (chan->flags & IEEE80211_CHAN_NO_IR)
+ user_scan_cfg->chan_list[i].scan_type =
+ MWIFIEX_SCAN_TYPE_PASSIVE;
+ else
+--- a/drivers/net/wireless/mwifiex/scan.c
++++ b/drivers/net/wireless/mwifiex/scan.c
+@@ -515,14 +515,14 @@ mwifiex_scan_create_channel_list(struct
+ scan_chan_list[chan_idx].max_scan_time =
+ cpu_to_le16((u16) user_scan_in->
+ chan_list[0].scan_time);
+- else if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
++ else if (ch->flags & IEEE80211_CHAN_NO_IR)
+ scan_chan_list[chan_idx].max_scan_time =
+ cpu_to_le16(adapter->passive_scan_time);
+ else
+ scan_chan_list[chan_idx].max_scan_time =
+ cpu_to_le16(adapter->active_scan_time);
- void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs);
--void ath_ant_comb_update(struct ath_softc *sc);
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
+ scan_chan_list[chan_idx].chan_scan_mode_bitmap
+ |= MWIFIEX_PASSIVE_SCAN;
+ else
+--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
++++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
+@@ -146,7 +146,7 @@ void rt2x00queue_remove_l2pad(struct sk_
+ * @local: frame is not from mac80211
+ */
+ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
+- bool local);
++ struct ieee80211_sta *sta, bool local);
- /********************/
- /* Main driver core */
- /********************/
+ /**
+ * rt2x00queue_update_beacon - Send new beacon from mac80211
+--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
++++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
+@@ -90,7 +90,7 @@ static int rt2x00mac_tx_rts_cts(struct r
+ frag_skb->data, data_length, tx_info,
+ (struct ieee80211_rts *)(skb->data));
+
+- retval = rt2x00queue_write_tx_frame(queue, skb, true);
++ retval = rt2x00queue_write_tx_frame(queue, skb, NULL, true);
+ if (retval) {
+ dev_kfree_skb_any(skb);
+ rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n");
+@@ -151,7 +151,7 @@ void rt2x00mac_tx(struct ieee80211_hw *h
+ goto exit_fail;
+ }
--#define ATH9K_PCI_CUS198 0x0001
--#define ATH9K_PCI_CUS230 0x0002
--#define ATH9K_PCI_CUS217 0x0004
--#define ATH9K_PCI_WOW 0x0008
-+#define ATH9K_PCI_CUS198 0x0001
-+#define ATH9K_PCI_CUS230 0x0002
-+#define ATH9K_PCI_CUS217 0x0004
-+#define ATH9K_PCI_WOW 0x0008
-+#define ATH9K_PCI_BT_ANT_DIV 0x0010
-+#define ATH9K_PCI_D3_L1_WAR 0x0020
+- if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
++ if (unlikely(rt2x00queue_write_tx_frame(queue, skb, control->sta, false)))
+ goto exit_fail;
- /*
- * Default cache line size, in bytes.
-@@ -717,6 +725,7 @@ struct ath_softc {
- struct work_struct hw_check_work;
- struct work_struct hw_reset_work;
- struct completion paprd_complete;
-+ wait_queue_head_t tx_wait;
+ /*
+--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
++++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
+@@ -635,7 +635,7 @@ static void rt2x00queue_bar_check(struct
+ }
- unsigned int hw_busy_count;
- unsigned long sc_flags;
-@@ -753,6 +762,7 @@ struct ath_softc {
- struct delayed_work tx_complete_work;
- struct delayed_work hw_pll_work;
- struct timer_list rx_poll_timer;
-+ struct timer_list sleep_timer;
+ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
+- bool local)
++ struct ieee80211_sta *sta, bool local)
+ {
+ struct ieee80211_tx_info *tx_info;
+ struct queue_entry *entry;
+@@ -649,7 +649,7 @@ int rt2x00queue_write_tx_frame(struct da
+ * after that we are free to use the skb->cb array
+ * for our information.
+ */
+- rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL);
++ rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, sta);
- #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
- struct ath_btcoex btcoex;
-@@ -926,7 +936,6 @@ void ath9k_deinit_device(struct ath_soft
- void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
- void ath9k_reload_chainmask_settings(struct ath_softc *sc);
-
--bool ath9k_uses_beacons(int type);
- void ath9k_spectral_scan_trigger(struct ieee80211_hw *hw);
- int ath9k_spectral_scan_config(struct ieee80211_hw *hw,
- enum spectral_mode spectral_mode);
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -270,25 +270,29 @@ static const struct file_operations fops
- .llseek = default_llseek,
+ /*
+ * All information is retrieved from the skb->cb array,
+--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
++++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
+@@ -416,7 +416,7 @@ static int rtl8187_init_urbs(struct ieee
+ struct rtl8187_rx_info *info;
+ int ret = 0;
+
+- while (skb_queue_len(&priv->rx_queue) < 16) {
++ while (skb_queue_len(&priv->rx_queue) < 32) {
+ skb = __dev_alloc_skb(RTL8187_MAX_RX, GFP_KERNEL);
+ if (!skb) {
+ ret = -ENOMEM;
+--- a/drivers/net/wireless/rtlwifi/base.c
++++ b/drivers/net/wireless/rtlwifi/base.c
+@@ -1078,8 +1078,8 @@ u8 rtl_is_special_data(struct ieee80211_
+
+ ip = (struct iphdr *)((u8 *) skb->data + mac_hdr_len +
+ SNAP_SIZE + PROTOC_TYPE_SIZE);
+- ether_type = *(u16 *) ((u8 *) skb->data + mac_hdr_len + SNAP_SIZE);
+- /* ether_type = ntohs(ether_type); */
++ ether_type = be16_to_cpu(*(__be16 *)((u8 *)skb->data + mac_hdr_len +
++ SNAP_SIZE));
+
+ if (ETH_P_IP == ether_type) {
+ if (IPPROTO_UDP == ip->protocol) {
+--- a/drivers/net/wireless/rtlwifi/regd.c
++++ b/drivers/net/wireless/rtlwifi/regd.c
+@@ -59,30 +59,27 @@ static struct country_code_to_enum_rd al
+ */
+ #define RTL819x_2GHZ_CH12_13 \
+ REG_RULE(2467-10, 2472+10, 40, 0, 20,\
+- NL80211_RRF_PASSIVE_SCAN)
++ NL80211_RRF_NO_IR)
+
+ #define RTL819x_2GHZ_CH14 \
+ REG_RULE(2484-10, 2484+10, 40, 0, 20, \
+- NL80211_RRF_PASSIVE_SCAN | \
++ NL80211_RRF_NO_IR | \
+ NL80211_RRF_NO_OFDM)
+
+ /* 5G chan 36 - chan 64*/
+ #define RTL819x_5GHZ_5150_5350 \
+ REG_RULE(5150-10, 5350+10, 40, 0, 30, \
+- NL80211_RRF_PASSIVE_SCAN | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+
+ /* 5G chan 100 - chan 165*/
+ #define RTL819x_5GHZ_5470_5850 \
+ REG_RULE(5470-10, 5850+10, 40, 0, 30, \
+- NL80211_RRF_PASSIVE_SCAN | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+
+ /* 5G chan 149 - chan 165*/
+ #define RTL819x_5GHZ_5725_5850 \
+ REG_RULE(5725-10, 5850+10, 40, 0, 30, \
+- NL80211_RRF_PASSIVE_SCAN | \
+- NL80211_RRF_NO_IBSS)
++ NL80211_RRF_NO_IR)
+
+ #define RTL819x_5GHZ_ALL \
+ (RTL819x_5GHZ_5150_5350, RTL819x_5GHZ_5470_5850)
+@@ -185,16 +182,15 @@ static void _rtl_reg_apply_beaconing_fla
+ *regulatory_hint().
+ */
+
+- if (!(reg_rule->flags & NL80211_RRF_NO_IBSS))
+- ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
++ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ if (!(reg_rule->
+- flags & NL80211_RRF_PASSIVE_SCAN))
++ flags & NL80211_RRF_NO_IR))
+ ch->flags &=
+- ~IEEE80211_CHAN_PASSIVE_SCAN;
++ ~IEEE80211_CHAN_NO_IR;
+ } else {
+ if (ch->beacon_found)
+- ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN);
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ }
+ }
+ }
+@@ -219,11 +215,11 @@ static void _rtl_reg_apply_active_scan_f
+ */
+ if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+ ch = &sband->channels[11]; /* CH 12 */
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ ch = &sband->channels[12]; /* CH 13 */
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ return;
+ }
+
+@@ -237,17 +233,17 @@ static void _rtl_reg_apply_active_scan_f
+ ch = &sband->channels[11]; /* CH 12 */
+ reg_rule = freq_reg_info(wiphy, ch->center_freq);
+ if (!IS_ERR(reg_rule)) {
+- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ }
+
+ ch = &sband->channels[12]; /* CH 13 */
+ reg_rule = freq_reg_info(wiphy, ch->center_freq);
+ if (!IS_ERR(reg_rule)) {
+- if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
+- if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+- ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
++ if (!(reg_rule->flags & NL80211_RRF_NO_IR))
++ if (ch->flags & IEEE80211_CHAN_NO_IR)
++ ch->flags &= ~IEEE80211_CHAN_NO_IR;
+ }
+ }
+
+@@ -284,8 +280,8 @@ static void _rtl_reg_apply_radar_flags(s
+ */
+ if (!(ch->flags & IEEE80211_CHAN_DISABLED))
+ ch->flags |= IEEE80211_CHAN_RADAR |
+- IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_NO_IR;
+ }
+ }
+
+--- a/drivers/net/wireless/ti/wl12xx/scan.c
++++ b/drivers/net/wireless/ti/wl12xx/scan.c
+@@ -47,7 +47,7 @@ static int wl1271_get_scan_channels(stru
+ * In active scans, we only scan channels not
+ * marked as passive.
+ */
+- (passive || !(flags & IEEE80211_CHAN_PASSIVE_SCAN))) {
++ (passive || !(flags & IEEE80211_CHAN_NO_IR))) {
+ wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ",
+ req->channels[i]->band,
+ req->channels[i]->center_freq);
+--- a/drivers/net/wireless/ti/wlcore/cmd.c
++++ b/drivers/net/wireless/ti/wlcore/cmd.c
+@@ -1688,7 +1688,7 @@ int wlcore_cmd_regdomain_config_locked(s
+
+ if (channel->flags & (IEEE80211_CHAN_DISABLED |
+ IEEE80211_CHAN_RADAR |
+- IEEE80211_CHAN_PASSIVE_SCAN))
++ IEEE80211_CHAN_NO_IR))
+ continue;
+
+ ch_bit_idx = wlcore_get_reg_conf_ch_idx(b, ch);
+--- a/drivers/net/wireless/ti/wlcore/main.c
++++ b/drivers/net/wireless/ti/wlcore/main.c
+@@ -91,8 +91,7 @@ static void wl1271_reg_notify(struct wip
+ continue;
+
+ if (ch->flags & IEEE80211_CHAN_RADAR)
+- ch->flags |= IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN;
++ ch->flags |= IEEE80211_CHAN_NO_IR;
+
+ }
+
+--- a/drivers/net/wireless/ti/wlcore/scan.c
++++ b/drivers/net/wireless/ti/wlcore/scan.c
+@@ -189,14 +189,14 @@ wlcore_scan_get_channels(struct wl1271 *
+ flags = req_channels[i]->flags;
+
+ if (force_passive)
+- flags |= IEEE80211_CHAN_PASSIVE_SCAN;
++ flags |= IEEE80211_CHAN_NO_IR;
+
+ if ((req_channels[i]->band == band) &&
+ !(flags & IEEE80211_CHAN_DISABLED) &&
+ (!!(flags & IEEE80211_CHAN_RADAR) == radar) &&
+ /* if radar is set, we ignore the passive flag */
+ (radar ||
+- !!(flags & IEEE80211_CHAN_PASSIVE_SCAN) == passive)) {
++ !!(flags & IEEE80211_CHAN_NO_IR) == passive)) {
+
+
+ if (flags & IEEE80211_CHAN_RADAR) {
+@@ -221,7 +221,7 @@ wlcore_scan_get_channels(struct wl1271 *
+ (band == IEEE80211_BAND_2GHZ) &&
+ (channels[j].channel >= 12) &&
+ (channels[j].channel <= 14) &&
+- (flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
++ (flags & IEEE80211_CHAN_NO_IR) &&
+ !force_passive) {
+ /* pactive channels treated as DFS */
+ channels[j].flags = SCAN_CHANNEL_FLAGS_DFS;
+@@ -244,7 +244,7 @@ wlcore_scan_get_channels(struct wl1271 *
+ max_dwell_time_active,
+ flags & IEEE80211_CHAN_RADAR ?
+ ", DFS" : "",
+- flags & IEEE80211_CHAN_PASSIVE_SCAN ?
++ flags & IEEE80211_CHAN_NO_IR ?
+ ", PASSIVE" : "");
+ j++;
+ }
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -91,9 +91,8 @@ enum ieee80211_band {
+ * Channel flags set by the regulatory control code.
+ *
+ * @IEEE80211_CHAN_DISABLED: This channel is disabled.
+- * @IEEE80211_CHAN_PASSIVE_SCAN: Only passive scanning is permitted
+- * on this channel.
+- * @IEEE80211_CHAN_NO_IBSS: IBSS is not allowed on this channel.
++ * @IEEE80211_CHAN_NO_IR: do not initiate radiation, this includes
++ * sending probe requests or beaconing.
+ * @IEEE80211_CHAN_RADAR: Radar detection is required on this channel.
+ * @IEEE80211_CHAN_NO_HT40PLUS: extension channel above this channel
+ * is not permitted.
+@@ -113,8 +112,8 @@ enum ieee80211_band {
+ */
+ enum ieee80211_channel_flags {
+ IEEE80211_CHAN_DISABLED = 1<<0,
+- IEEE80211_CHAN_PASSIVE_SCAN = 1<<1,
+- IEEE80211_CHAN_NO_IBSS = 1<<2,
++ IEEE80211_CHAN_NO_IR = 1<<1,
++ /* hole at 1<<2 */
+ IEEE80211_CHAN_RADAR = 1<<3,
+ IEEE80211_CHAN_NO_HT40PLUS = 1<<4,
+ IEEE80211_CHAN_NO_HT40MINUS = 1<<5,
+@@ -4149,6 +4148,7 @@ void cfg80211_radar_event(struct wiphy *
+ /**
+ * cfg80211_cac_event - Channel availability check (CAC) event
+ * @netdev: network device
++ * @chandef: chandef for the current channel
+ * @event: type of event
+ * @gfp: context flags
+ *
+@@ -4157,6 +4157,7 @@ void cfg80211_radar_event(struct wiphy *
+ * also by full-MAC drivers.
+ */
+ void cfg80211_cac_event(struct net_device *netdev,
++ const struct cfg80211_chan_def *chandef,
+ enum nl80211_radar_event event, gfp_t gfp);
+
+
+--- a/include/uapi/linux/nl80211.h
++++ b/include/uapi/linux/nl80211.h
+@@ -1508,6 +1508,9 @@ enum nl80211_commands {
+ * to react to radar events, e.g. initiate a channel switch or leave the
+ * IBSS network.
+ *
++ * @NL80211_ATTR_SUPPORT_5_10_MHZ: A flag indicating that the device supports
++ * 5 MHz and 10 MHz channel bandwidth.
++ *
+ * @NL80211_ATTR_MAX: highest attribute number currently defined
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+ */
+@@ -1824,6 +1827,8 @@ enum nl80211_attrs {
+
+ NL80211_ATTR_HANDLE_DFS,
+
++ NL80211_ATTR_SUPPORT_5_10_MHZ,
++
+ /* add attributes here, update the policy in nl80211.c */
+
+ __NL80211_ATTR_AFTER_LAST,
+@@ -2224,10 +2229,9 @@ enum nl80211_band_attr {
+ * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
+ * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
+ * regulatory domain.
+- * @NL80211_FREQUENCY_ATTR_PASSIVE_SCAN: Only passive scanning is
+- * permitted on this channel in current regulatory domain.
+- * @NL80211_FREQUENCY_ATTR_NO_IBSS: IBSS networks are not permitted
+- * on this channel in current regulatory domain.
++ * @NL80211_FREQUENCY_ATTR_NO_IR: no mechanisms that initiate radiation
++ * are permitted on this channel, this includes sending probe
++ * requests, or modes of operation that require beaconing.
+ * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
+ * on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
+@@ -2254,8 +2258,8 @@ enum nl80211_frequency_attr {
+ __NL80211_FREQUENCY_ATTR_INVALID,
+ NL80211_FREQUENCY_ATTR_FREQ,
+ NL80211_FREQUENCY_ATTR_DISABLED,
+- NL80211_FREQUENCY_ATTR_PASSIVE_SCAN,
+- NL80211_FREQUENCY_ATTR_NO_IBSS,
++ NL80211_FREQUENCY_ATTR_NO_IR,
++ __NL80211_FREQUENCY_ATTR_NO_IBSS,
+ NL80211_FREQUENCY_ATTR_RADAR,
+ NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
+ NL80211_FREQUENCY_ATTR_DFS_STATE,
+@@ -2271,6 +2275,9 @@ enum nl80211_frequency_attr {
+ };
+
+ #define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
++#define NL80211_FREQUENCY_ATTR_PASSIVE_SCAN NL80211_FREQUENCY_ATTR_NO_IR
++#define NL80211_FREQUENCY_ATTR_NO_IBSS NL80211_FREQUENCY_ATTR_NO_IR
++#define NL80211_FREQUENCY_ATTR_NO_IR NL80211_FREQUENCY_ATTR_NO_IR
+
+ /**
+ * enum nl80211_bitrate_attr - bitrate attributes
+@@ -2413,8 +2420,9 @@ enum nl80211_sched_scan_match_attr {
+ * @NL80211_RRF_DFS: DFS support is required to be used
+ * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links
+ * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links
+- * @NL80211_RRF_PASSIVE_SCAN: passive scan is required
+- * @NL80211_RRF_NO_IBSS: no IBSS is allowed
++ * @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed,
++ * this includes probe requests or modes of operation that require
++ * beaconing.
+ */
+ enum nl80211_reg_rule_flags {
+ NL80211_RRF_NO_OFDM = 1<<0,
+@@ -2424,10 +2432,17 @@ enum nl80211_reg_rule_flags {
+ NL80211_RRF_DFS = 1<<4,
+ NL80211_RRF_PTP_ONLY = 1<<5,
+ NL80211_RRF_PTMP_ONLY = 1<<6,
+- NL80211_RRF_PASSIVE_SCAN = 1<<7,
+- NL80211_RRF_NO_IBSS = 1<<8,
++ NL80211_RRF_NO_IR = 1<<7,
++ __NL80211_RRF_NO_IBSS = 1<<8,
};
--static ssize_t read_file_ant_diversity(struct file *file, char __user *user_buf,
-- size_t count, loff_t *ppos)
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
++#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
++#define NL80211_RRF_NO_IBSS NL80211_RRF_NO_IR
++#define NL80211_RRF_NO_IR NL80211_RRF_NO_IR
+
-+static ssize_t read_file_bt_ant_diversity(struct file *file,
-+ char __user *user_buf,
-+ size_t count, loff_t *ppos)
- {
- struct ath_softc *sc = file->private_data;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- char buf[32];
- unsigned int len;
++/* For backport compatibility with older userspace */
++#define NL80211_RRF_NO_IR_ALL (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS)
++
+ /**
+ * enum nl80211_dfs_regions - regulatory DFS regions
+ *
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -1050,6 +1050,7 @@ static int ieee80211_stop_ap(struct wiph
+ struct ieee80211_local *local = sdata->local;
+ struct beacon_data *old_beacon;
+ struct probe_resp *old_probe_resp;
++ struct cfg80211_chan_def chandef;
+
+ old_beacon = rtnl_dereference(sdata->u.ap.beacon);
+ if (!old_beacon)
+@@ -1091,8 +1092,10 @@ static int ieee80211_stop_ap(struct wiph
+ ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
+
+ if (sdata->wdev.cac_started) {
++ chandef = sdata->vif.bss_conf.chandef;
+ cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
+- cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED,
++ cfg80211_cac_event(sdata->dev, &chandef,
++ NL80211_RADAR_CAC_ABORTED,
+ GFP_KERNEL);
+ }
+
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -749,6 +749,7 @@ static void ieee80211_do_stop(struct iee
+ u32 hw_reconf_flags = 0;
+ int i, flushed;
+ struct ps_data *ps;
++ struct cfg80211_chan_def chandef;
+
+ clear_bit(SDATA_STATE_RUNNING, &sdata->state);
+
+@@ -828,11 +829,13 @@ static void ieee80211_do_stop(struct iee
+ cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
+
+ if (sdata->wdev.cac_started) {
++ chandef = sdata->vif.bss_conf.chandef;
+ WARN_ON(local->suspended);
+ mutex_lock(&local->iflist_mtx);
+ ieee80211_vif_release_channel(sdata);
+ mutex_unlock(&local->iflist_mtx);
+- cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_ABORTED,
++ cfg80211_cac_event(sdata->dev, &chandef,
++ NL80211_RADAR_CAC_ABORTED,
+ GFP_KERNEL);
+ }
+
+@@ -1340,7 +1343,6 @@ static void ieee80211_setup_sdata(struct
+ sdata->vif.bss_conf.bssid = NULL;
+ break;
+ case NL80211_IFTYPE_AP_VLAN:
+- break;
+ case NL80211_IFTYPE_P2P_DEVICE:
+ sdata->vif.bss_conf.bssid = sdata->vif.addr;
+ break;
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -1398,10 +1398,12 @@ void ieee80211_dfs_cac_timer_work(struct
+ struct ieee80211_sub_if_data *sdata =
+ container_of(delayed_work, struct ieee80211_sub_if_data,
+ dfs_cac_timer_work);
++ struct cfg80211_chan_def chandef = sdata->vif.bss_conf.chandef;
+
+ ieee80211_vif_release_channel(sdata);
+-
+- cfg80211_cac_event(sdata->dev, NL80211_RADAR_CAC_FINISHED, GFP_KERNEL);
++ cfg80211_cac_event(sdata->dev, &chandef,
++ NL80211_RADAR_CAC_FINISHED,
++ GFP_KERNEL);
+ }
+
+ /* MLME */
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -729,9 +729,7 @@ static void ieee80211_release_reorder_fr
+ lockdep_assert_held(&tid_agg_rx->reorder_lock);
+
+ while (ieee80211_sn_less(tid_agg_rx->head_seq_num, head_seq_num)) {
+- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
+- tid_agg_rx->ssn) %
+- tid_agg_rx->buf_size;
++ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
+ ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,
+ frames);
+ }
+@@ -757,8 +755,7 @@ static void ieee80211_sta_reorder_releas
+ lockdep_assert_held(&tid_agg_rx->reorder_lock);
+
+ /* release the buffer until next missing frame */
+- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
+- tid_agg_rx->ssn) % tid_agg_rx->buf_size;
++ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
+ if (!tid_agg_rx->reorder_buf[index] &&
+ tid_agg_rx->stored_mpdu_num) {
+ /*
+@@ -793,15 +790,11 @@ static void ieee80211_sta_reorder_releas
+ } else while (tid_agg_rx->reorder_buf[index]) {
+ ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,
+ frames);
+- index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
+- tid_agg_rx->ssn) %
+- tid_agg_rx->buf_size;
++ index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
+ }
-- len = sprintf(buf, "%d\n", common->antenna_diversity);
-+ len = sprintf(buf, "%d\n", common->bt_ant_diversity);
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+ if (tid_agg_rx->stored_mpdu_num) {
+- j = index = ieee80211_sn_sub(tid_agg_rx->head_seq_num,
+- tid_agg_rx->ssn) %
+- tid_agg_rx->buf_size;
++ j = index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
+
+ for (; j != (index - 1) % tid_agg_rx->buf_size;
+ j = (j + 1) % tid_agg_rx->buf_size) {
+@@ -861,8 +854,7 @@ static bool ieee80211_sta_manage_reorder
+
+ /* Now the new frame is always in the range of the reordering buffer */
+
+- index = ieee80211_sn_sub(mpdu_seq_num,
+- tid_agg_rx->ssn) % tid_agg_rx->buf_size;
++ index = mpdu_seq_num % tid_agg_rx->buf_size;
+
+ /* check if we already stored this frame */
+ if (tid_agg_rx->reorder_buf[index]) {
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -526,7 +526,7 @@ static int __ieee80211_start_scan(struct
+ ieee80211_hw_config(local, 0);
+
+ if ((req->channels[0]->flags &
+- IEEE80211_CHAN_PASSIVE_SCAN) ||
++ IEEE80211_CHAN_NO_IR) ||
+ !local->scan_req->n_ssids) {
+ next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
+ } else {
+@@ -572,7 +572,7 @@ ieee80211_scan_get_channel_time(struct i
+ * TODO: channel switching also consumes quite some time,
+ * add that delay as well to get a better estimation
+ */
+- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
++ if (chan->flags & IEEE80211_CHAN_NO_IR)
+ return IEEE80211_PASSIVE_CHANNEL_TIME;
+ return IEEE80211_PROBE_DELAY + IEEE80211_CHANNEL_TIME;
}
+@@ -696,7 +696,7 @@ static void ieee80211_scan_state_set_cha
+ *
+ * In any case, it is not necessary for a passive scan.
+ */
+- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN ||
++ if (chan->flags & IEEE80211_CHAN_NO_IR ||
+ !local->scan_req->n_ssids) {
+ *next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
+ local->next_scan_state = SCAN_DECISION;
+@@ -881,7 +881,7 @@ int ieee80211_request_ibss_scan(struct i
+ struct ieee80211_channel *tmp_ch =
+ &local->hw.wiphy->bands[band]->channels[i];
+
+- if (tmp_ch->flags & (IEEE80211_CHAN_NO_IBSS |
++ if (tmp_ch->flags & (IEEE80211_CHAN_NO_IR |
+ IEEE80211_CHAN_DISABLED))
+ continue;
+
+@@ -895,7 +895,7 @@ int ieee80211_request_ibss_scan(struct i
+
+ local->int_scan_req->n_channels = n_ch;
+ } else {
+- if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IBSS |
++ if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IR |
+ IEEE80211_CHAN_DISABLED)))
+ goto unlock;
--static ssize_t write_file_ant_diversity(struct file *file,
-- const char __user *user_buf,
-- size_t count, loff_t *ppos)
-+static ssize_t write_file_bt_ant_diversity(struct file *file,
-+ const char __user *user_buf,
-+ size_t count, loff_t *ppos)
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1728,8 +1728,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
+ * radar detection by itself. We can do that later by adding a
+ * monitor flag interfaces used for AP support.
+ */
+- if ((chan->flags & (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_RADAR |
+- IEEE80211_CHAN_PASSIVE_SCAN)))
++ if ((chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR)))
+ goto fail_rcu;
+
+ ieee80211_xmit(sdata, skb, chan->band);
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -2259,14 +2259,17 @@ u64 ieee80211_calculate_rx_timestamp(str
+ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
{
- struct ath_softc *sc = file->private_data;
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- unsigned long antenna_diversity;
-+ struct ath9k_hw_capabilities *pCap = &sc->sc_ah->caps;
-+ unsigned long bt_ant_diversity;
- char buf[32];
- ssize_t len;
-
-@@ -296,26 +300,147 @@ static ssize_t write_file_ant_diversity(
- if (copy_from_user(buf, user_buf, len))
- return -EFAULT;
-
-- if (!AR_SREV_9565(sc->sc_ah))
-+ if (!(pCap->hw_caps & ATH9K_HW_CAP_BT_ANT_DIV))
- goto exit;
-
- buf[len] = '\0';
-- if (strict_strtoul(buf, 0, &antenna_diversity))
-+ if (kstrtoul(buf, 0, &bt_ant_diversity))
- return -EINVAL;
+ struct ieee80211_sub_if_data *sdata;
++ struct cfg80211_chan_def chandef;
-- common->antenna_diversity = !!antenna_diversity;
-+ common->bt_ant_diversity = !!bt_ant_diversity;
- ath9k_ps_wakeup(sc);
-- ath_ant_comb_update(sc);
-- ath_dbg(common, CONFIG, "Antenna diversity: %d\n",
-- common->antenna_diversity);
-+ ath9k_hw_set_bt_ant_diversity(sc->sc_ah, common->bt_ant_diversity);
-+ ath_dbg(common, CONFIG, "Enable WLAN/BT RX Antenna diversity: %d\n",
-+ common->bt_ant_diversity);
- ath9k_ps_restore(sc);
- exit:
- return count;
+ mutex_lock(&local->iflist_mtx);
+ list_for_each_entry(sdata, &local->interfaces, list) {
+ cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);
+
+ if (sdata->wdev.cac_started) {
++ chandef = sdata->vif.bss_conf.chandef;
+ ieee80211_vif_release_channel(sdata);
+ cfg80211_cac_event(sdata->dev,
++ &chandef,
+ NL80211_RADAR_CAC_ABORTED,
+ GFP_KERNEL);
+ }
+--- a/net/wireless/chan.c
++++ b/net/wireless/chan.c
+@@ -277,6 +277,32 @@ void cfg80211_set_dfs_state(struct wiphy
+ width, dfs_state);
}
--static const struct file_operations fops_ant_diversity = {
-- .read = read_file_ant_diversity,
-- .write = write_file_ant_diversity,
-+static const struct file_operations fops_bt_ant_diversity = {
-+ .read = read_file_bt_ant_diversity,
-+ .write = write_file_bt_ant_diversity,
-+ .open = simple_open,
-+ .owner = THIS_MODULE,
-+ .llseek = default_llseek,
-+};
-+
-+#endif
-+
-+void ath9k_debug_stat_ant(struct ath_softc *sc,
-+ struct ath_hw_antcomb_conf *div_ant_conf,
-+ int main_rssi_avg, int alt_rssi_avg)
++static u32 cfg80211_get_start_freq(u32 center_freq,
++ u32 bandwidth)
+{
-+ struct ath_antenna_stats *as_main = &sc->debug.stats.ant_stats[ANT_MAIN];
-+ struct ath_antenna_stats *as_alt = &sc->debug.stats.ant_stats[ANT_ALT];
++ u32 start_freq;
+
-+ as_main->lna_attempt_cnt[div_ant_conf->main_lna_conf]++;
-+ as_alt->lna_attempt_cnt[div_ant_conf->alt_lna_conf]++;
++ if (bandwidth <= 20)
++ start_freq = center_freq;
++ else
++ start_freq = center_freq - bandwidth/2 + 10;
+
-+ as_main->rssi_avg = main_rssi_avg;
-+ as_alt->rssi_avg = alt_rssi_avg;
++ return start_freq;
+}
+
-+static ssize_t read_file_antenna_diversity(struct file *file,
-+ char __user *user_buf,
-+ size_t count, loff_t *ppos)
++static u32 cfg80211_get_end_freq(u32 center_freq,
++ u32 bandwidth)
+{
-+ struct ath_softc *sc = file->private_data;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath9k_hw_capabilities *pCap = &ah->caps;
-+ struct ath_antenna_stats *as_main = &sc->debug.stats.ant_stats[ANT_MAIN];
-+ struct ath_antenna_stats *as_alt = &sc->debug.stats.ant_stats[ANT_ALT];
-+ struct ath_hw_antcomb_conf div_ant_conf;
-+ unsigned int len = 0, size = 1024;
-+ ssize_t retval = 0;
-+ char *buf;
-+ char *lna_conf_str[4] = {"LNA1_MINUS_LNA2",
-+ "LNA2",
-+ "LNA1",
-+ "LNA1_PLUS_LNA2"};
-+
-+ buf = kzalloc(size, GFP_KERNEL);
-+ if (buf == NULL)
-+ return -ENOMEM;
-+
-+ if (!(pCap->hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB)) {
-+ len += snprintf(buf + len, size - len, "%s\n",
-+ "Antenna Diversity Combining is disabled");
-+ goto exit;
-+ }
++ u32 end_freq;
+
-+ ath9k_ps_wakeup(sc);
-+ ath9k_hw_antdiv_comb_conf_get(ah, &div_ant_conf);
-+ len += snprintf(buf + len, size - len, "Current MAIN config : %s\n",
-+ lna_conf_str[div_ant_conf.main_lna_conf]);
-+ len += snprintf(buf + len, size - len, "Current ALT config : %s\n",
-+ lna_conf_str[div_ant_conf.alt_lna_conf]);
-+ len += snprintf(buf + len, size - len, "Average MAIN RSSI : %d\n",
-+ as_main->rssi_avg);
-+ len += snprintf(buf + len, size - len, "Average ALT RSSI : %d\n\n",
-+ as_alt->rssi_avg);
-+ ath9k_ps_restore(sc);
++ if (bandwidth <= 20)
++ end_freq = center_freq;
++ else
++ end_freq = center_freq + bandwidth/2 - 10;
+
-+ len += snprintf(buf + len, size - len, "Packet Receive Cnt:\n");
-+ len += snprintf(buf + len, size - len, "-------------------\n");
-+
-+ len += snprintf(buf + len, size - len, "%30s%15s\n",
-+ "MAIN", "ALT");
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "TOTAL COUNT",
-+ as_main->recv_cnt,
-+ as_alt->recv_cnt);
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA1",
-+ as_main->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA1],
-+ as_alt->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA1]);
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA2",
-+ as_main->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA2],
-+ as_alt->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA2]);
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA1 + LNA2",
-+ as_main->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2],
-+ as_alt->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2]);
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA1 - LNA2",
-+ as_main->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2],
-+ as_alt->lna_recv_cnt[ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2]);
-+
-+ len += snprintf(buf + len, size - len, "\nLNA Config Attempts:\n");
-+ len += snprintf(buf + len, size - len, "--------------------\n");
-+
-+ len += snprintf(buf + len, size - len, "%30s%15s\n",
-+ "MAIN", "ALT");
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA1",
-+ as_main->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA1],
-+ as_alt->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA1]);
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA2",
-+ as_main->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA2],
-+ as_alt->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA2]);
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA1 + LNA2",
-+ as_main->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2],
-+ as_alt->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2]);
-+ len += snprintf(buf + len, size - len, "%-14s:%15d%15d\n",
-+ "LNA1 - LNA2",
-+ as_main->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2],
-+ as_alt->lna_attempt_cnt[ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2]);
-+
-+exit:
-+ if (len > size)
-+ len = size;
-+
-+ retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-+ kfree(buf);
-+
-+ return retval;
++ return end_freq;
+}
+
-+static const struct file_operations fops_antenna_diversity = {
-+ .read = read_file_antenna_diversity,
- .open = simple_open,
- .owner = THIS_MODULE,
- .llseek = default_llseek,
-@@ -607,6 +732,28 @@ static ssize_t read_file_xmit(struct fil
- return retval;
+ static int cfg80211_get_chans_dfs_required(struct wiphy *wiphy,
+ u32 center_freq,
+ u32 bandwidth)
+@@ -284,13 +310,8 @@ static int cfg80211_get_chans_dfs_requir
+ struct ieee80211_channel *c;
+ u32 freq, start_freq, end_freq;
+
+- if (bandwidth <= 20) {
+- start_freq = center_freq;
+- end_freq = center_freq;
+- } else {
+- start_freq = center_freq - bandwidth/2 + 10;
+- end_freq = center_freq + bandwidth/2 - 10;
+- }
++ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
++ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
+
+ for (freq = start_freq; freq <= end_freq; freq += 20) {
+ c = ieee80211_get_channel(wiphy, freq);
+@@ -330,33 +351,159 @@ int cfg80211_chandef_dfs_required(struct
}
+ EXPORT_SYMBOL(cfg80211_chandef_dfs_required);
+
+-static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy,
+- u32 center_freq, u32 bandwidth,
+- u32 prohibited_flags)
++static int cfg80211_get_chans_dfs_usable(struct wiphy *wiphy,
++ u32 center_freq,
++ u32 bandwidth)
+ {
+ struct ieee80211_channel *c;
+ u32 freq, start_freq, end_freq;
++ int count = 0;
-+static ssize_t print_queue(struct ath_softc *sc, struct ath_txq *txq,
-+ char *buf, ssize_t size)
-+{
-+ ssize_t len = 0;
-+
-+ ath_txq_lock(sc, txq);
-+
-+ len += snprintf(buf + len, size - len, "%s: %d ",
-+ "qnum", txq->axq_qnum);
-+ len += snprintf(buf + len, size - len, "%s: %2d ",
-+ "qdepth", txq->axq_depth);
-+ len += snprintf(buf + len, size - len, "%s: %2d ",
-+ "ampdu-depth", txq->axq_ampdu_depth);
-+ len += snprintf(buf + len, size - len, "%s: %3d ",
-+ "pending", txq->pending_frames);
-+ len += snprintf(buf + len, size - len, "%s: %d\n",
-+ "stopped", txq->stopped);
-+
-+ ath_txq_unlock(sc, txq);
-+ return len;
+- if (bandwidth <= 20) {
+- start_freq = center_freq;
+- end_freq = center_freq;
+- } else {
+- start_freq = center_freq - bandwidth/2 + 10;
+- end_freq = center_freq + bandwidth/2 - 10;
++ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
++ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
++
++ /*
++ * Check entire range of channels for the bandwidth.
++ * Check all channels are DFS channels (DFS_USABLE or
++ * DFS_AVAILABLE). Return number of usable channels
++ * (require CAC). Allow DFS and non-DFS channel mix.
++ */
++ for (freq = start_freq; freq <= end_freq; freq += 20) {
++ c = ieee80211_get_channel(wiphy, freq);
++ if (!c)
++ return -EINVAL;
++
++ if (c->flags & IEEE80211_CHAN_DISABLED)
++ return -EINVAL;
++
++ if (c->flags & IEEE80211_CHAN_RADAR) {
++ if (c->dfs_state == NL80211_DFS_UNAVAILABLE)
++ return -EINVAL;
++
++ if (c->dfs_state == NL80211_DFS_USABLE)
++ count++;
++ }
++ }
++
++ return count;
+}
+
- static ssize_t read_file_queues(struct file *file, char __user *user_buf,
- size_t count, loff_t *ppos)
- {
-@@ -624,24 +771,13 @@ static ssize_t read_file_queues(struct f
-
- for (i = 0; i < IEEE80211_NUM_ACS; i++) {
- txq = sc->tx.txq_map[i];
-- len += snprintf(buf + len, size - len, "(%s): ", qname[i]);
--
-- ath_txq_lock(sc, txq);
--
-- len += snprintf(buf + len, size - len, "%s: %d ",
-- "qnum", txq->axq_qnum);
-- len += snprintf(buf + len, size - len, "%s: %2d ",
-- "qdepth", txq->axq_depth);
-- len += snprintf(buf + len, size - len, "%s: %2d ",
-- "ampdu-depth", txq->axq_ampdu_depth);
-- len += snprintf(buf + len, size - len, "%s: %3d ",
-- "pending", txq->pending_frames);
-- len += snprintf(buf + len, size - len, "%s: %d\n",
-- "stopped", txq->stopped);
--
-- ath_txq_unlock(sc, txq);
-+ len += snprintf(buf + len, size - len, "(%s): ", qname[i]);
-+ len += print_queue(sc, txq, buf + len, size - len);
- }
-
-+ len += snprintf(buf + len, size - len, "(CAB): ");
-+ len += print_queue(sc, sc->beacon.cabq, buf + len, size - len);
++bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy,
++ const struct cfg80211_chan_def *chandef)
++{
++ int width;
++ int r1, r2 = 0;
+
- if (len > size)
- len = size;
-
-@@ -1818,9 +1954,11 @@ int ath9k_init_debug(struct ath_hw *ah)
- sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
- debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
- sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
-- debugfs_create_file("diversity", S_IRUSR | S_IWUSR,
-- sc->debug.debugfs_phy, sc, &fops_ant_diversity);
-+ debugfs_create_file("antenna_diversity", S_IRUSR,
-+ sc->debug.debugfs_phy, sc, &fops_antenna_diversity);
- #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-+ debugfs_create_file("bt_ant_diversity", S_IRUSR | S_IWUSR,
-+ sc->debug.debugfs_phy, sc, &fops_bt_ant_diversity);
- debugfs_create_file("btcoex", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_btcoex);
- #endif
---- a/net/mac80211/ibss.c
-+++ b/net/mac80211/ibss.c
-@@ -30,13 +30,14 @@
-
- #define IEEE80211_IBSS_MERGE_INTERVAL (30 * HZ)
- #define IEEE80211_IBSS_INACTIVITY_LIMIT (60 * HZ)
-+#define IEEE80211_IBSS_RSN_INACTIVITY_LIMIT (10 * HZ)
-
- #define IEEE80211_IBSS_MAX_STA_ENTRIES 128
-
-
- static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
- const u8 *bssid, const int beacon_int,
-- struct ieee80211_channel *chan,
-+ struct cfg80211_chan_def *req_chandef,
- const u32 basic_rates,
- const u16 capability, u64 tsf,
- bool creator)
-@@ -51,6 +52,7 @@ static void __ieee80211_sta_join_ibss(st
- u32 bss_change;
- u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
- struct cfg80211_chan_def chandef;
-+ struct ieee80211_channel *chan;
- struct beacon_data *presp;
- int frame_len;
-
-@@ -81,7 +83,9 @@ static void __ieee80211_sta_join_ibss(st
-
- sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
-
-- chandef = ifibss->chandef;
-+ /* make a copy of the chandef, it could be modified below. */
-+ chandef = *req_chandef;
-+ chan = chandef.chan;
- if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {
- chandef.width = NL80211_CHAN_WIDTH_20;
- chandef.center_freq1 = chan->center_freq;
-@@ -259,10 +263,12 @@ static void ieee80211_sta_join_ibss(stru
- struct cfg80211_bss *cbss =
- container_of((void *)bss, struct cfg80211_bss, priv);
- struct ieee80211_supported_band *sband;
-+ struct cfg80211_chan_def chandef;
- u32 basic_rates;
- int i, j;
- u16 beacon_int = cbss->beacon_interval;
- const struct cfg80211_bss_ies *ies;
-+ enum nl80211_channel_type chan_type;
- u64 tsf;
-
- sdata_assert_lock(sdata);
-@@ -270,6 +276,26 @@ static void ieee80211_sta_join_ibss(stru
- if (beacon_int < 10)
- beacon_int = 10;
-
-+ switch (sdata->u.ibss.chandef.width) {
-+ case NL80211_CHAN_WIDTH_20_NOHT:
-+ case NL80211_CHAN_WIDTH_20:
-+ case NL80211_CHAN_WIDTH_40:
-+ chan_type = cfg80211_get_chandef_type(&sdata->u.ibss.chandef);
-+ cfg80211_chandef_create(&chandef, cbss->channel, chan_type);
-+ break;
-+ case NL80211_CHAN_WIDTH_5:
-+ case NL80211_CHAN_WIDTH_10:
-+ cfg80211_chandef_create(&chandef, cbss->channel,
-+ NL80211_CHAN_WIDTH_20_NOHT);
-+ chandef.width = sdata->u.ibss.chandef.width;
++ if (WARN_ON(!cfg80211_chandef_valid(chandef)))
++ return false;
++
++ width = cfg80211_chandef_get_width(chandef);
++ if (width < 0)
++ return false;
++
++ r1 = cfg80211_get_chans_dfs_usable(wiphy, chandef->center_freq1,
++ width);
++
++ if (r1 < 0)
++ return false;
++
++ switch (chandef->width) {
++ case NL80211_CHAN_WIDTH_80P80:
++ WARN_ON(!chandef->center_freq2);
++ r2 = cfg80211_get_chans_dfs_usable(wiphy,
++ chandef->center_freq2,
++ width);
++ if (r2 < 0)
++ return false;
+ break;
+ default:
-+ /* fall back to 20 MHz for unsupported modes */
-+ cfg80211_chandef_create(&chandef, cbss->channel,
-+ NL80211_CHAN_WIDTH_20_NOHT);
++ WARN_ON(chandef->center_freq2);
+ break;
+ }
+
++ return (r1 + r2 > 0);
++}
++
++
++static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy,
++ u32 center_freq,
++ u32 bandwidth)
++{
++ struct ieee80211_channel *c;
++ u32 freq, start_freq, end_freq;
++
++ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
++ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
++
++ /*
++ * Check entire range of channels for the bandwidth.
++ * If any channel in between is disabled or has not
++ * had gone through CAC return false
++ */
+ for (freq = start_freq; freq <= end_freq; freq += 20) {
+ c = ieee80211_get_channel(wiphy, freq);
+ if (!c)
+ return false;
+
+- /* check for radar flags */
+- if ((prohibited_flags & c->flags & IEEE80211_CHAN_RADAR) &&
++ if (c->flags & IEEE80211_CHAN_DISABLED)
++ return false;
++
++ if ((c->flags & IEEE80211_CHAN_RADAR) &&
+ (c->dfs_state != NL80211_DFS_AVAILABLE))
+ return false;
+ }
+
- sband = sdata->local->hw.wiphy->bands[cbss->channel->band];
-
- basic_rates = 0;
-@@ -294,7 +320,7 @@ static void ieee80211_sta_join_ibss(stru
-
- __ieee80211_sta_join_ibss(sdata, cbss->bssid,
- beacon_int,
-- cbss->channel,
-+ &chandef,
- basic_rates,
- cbss->capability,
- tsf, false);
-@@ -672,6 +698,33 @@ static int ieee80211_sta_active_ibss(str
- return active;
- }
-
-+static void ieee80211_ibss_sta_expire(struct ieee80211_sub_if_data *sdata)
++ return true;
++}
++
++static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy,
++ const struct cfg80211_chan_def *chandef)
+{
-+ struct ieee80211_local *local = sdata->local;
-+ struct sta_info *sta, *tmp;
-+ unsigned long exp_time = IEEE80211_IBSS_INACTIVITY_LIMIT;
-+ unsigned long exp_rsn_time = IEEE80211_IBSS_RSN_INACTIVITY_LIMIT;
++ int width;
++ int r;
+
-+ mutex_lock(&local->sta_mtx);
++ if (WARN_ON(!cfg80211_chandef_valid(chandef)))
++ return false;
+
+- /* check for the other flags */
+- if (c->flags & prohibited_flags & ~IEEE80211_CHAN_RADAR)
++ width = cfg80211_chandef_get_width(chandef);
++ if (width < 0)
++ return false;
+
-+ list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
-+ if (sdata != sta->sdata)
-+ continue;
++ r = cfg80211_get_chans_dfs_available(wiphy, chandef->center_freq1,
++ width);
+
-+ if (time_after(jiffies, sta->last_rx + exp_time) ||
-+ (time_after(jiffies, sta->last_rx + exp_rsn_time) &&
-+ sta->sta_state != IEEE80211_STA_AUTHORIZED)) {
-+ sta_dbg(sta->sdata, "expiring inactive %sSTA %pM\n",
-+ sta->sta_state != IEEE80211_STA_AUTHORIZED ?
-+ "not authorized " : "", sta->sta.addr);
++ /* If any of channels unavailable for cf1 just return */
++ if (!r)
++ return r;
+
-+ WARN_ON(__sta_info_destroy(sta));
-+ }
++ switch (chandef->width) {
++ case NL80211_CHAN_WIDTH_80P80:
++ WARN_ON(!chandef->center_freq2);
++ r = cfg80211_get_chans_dfs_available(wiphy,
++ chandef->center_freq2,
++ width);
++ default:
++ WARN_ON(chandef->center_freq2);
++ break;
+ }
+
-+ mutex_unlock(&local->sta_mtx);
++ return r;
+}
+
- /*
- * This function is called with state == IEEE80211_IBSS_MLME_JOINED
- */
-@@ -685,7 +738,7 @@ static void ieee80211_sta_merge_ibss(str
- mod_timer(&ifibss->timer,
- round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL));
-
-- ieee80211_sta_expire(sdata, IEEE80211_IBSS_INACTIVITY_LIMIT);
-+ ieee80211_ibss_sta_expire(sdata);
-
- if (time_before(jiffies, ifibss->last_scan_completed +
- IEEE80211_IBSS_MERGE_INTERVAL))
-@@ -736,7 +789,7 @@ static void ieee80211_sta_create_ibss(st
- sdata->drop_unencrypted = 0;
-
- __ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
-- ifibss->chandef.chan, ifibss->basic_rates,
-+ &ifibss->chandef, ifibss->basic_rates,
- capability, 0, true);
- }
-
-@@ -792,6 +845,17 @@ static void ieee80211_sta_find_ibss(stru
- return;
++
++static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy,
++ u32 center_freq, u32 bandwidth,
++ u32 prohibited_flags)
++{
++ struct ieee80211_channel *c;
++ u32 freq, start_freq, end_freq;
++
++ start_freq = cfg80211_get_start_freq(center_freq, bandwidth);
++ end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
++
++ for (freq = start_freq; freq <= end_freq; freq += 20) {
++ c = ieee80211_get_channel(wiphy, freq);
++ if (!c || c->flags & prohibited_flags)
+ return false;
}
-+ /* if a fixed bssid and a fixed freq have been provided create the IBSS
-+ * directly and do not waste time scanning
-+ */
-+ if (ifibss->fixed_bssid && ifibss->fixed_channel) {
-+ sdata_info(sdata, "Created IBSS using preconfigured BSSID %pM\n",
-+ bssid);
-+ ieee80211_sta_create_ibss(sdata);
-+ return;
+@@ -462,14 +609,19 @@ bool cfg80211_reg_can_beacon(struct wiph
+ struct cfg80211_chan_def *chandef)
+ {
+ bool res;
++ u32 prohibited_flags = IEEE80211_CHAN_DISABLED |
++ IEEE80211_CHAN_NO_IR |
++ IEEE80211_CHAN_RADAR;
+
+ trace_cfg80211_reg_can_beacon(wiphy, chandef);
+
+- res = cfg80211_chandef_usable(wiphy, chandef,
+- IEEE80211_CHAN_DISABLED |
+- IEEE80211_CHAN_PASSIVE_SCAN |
+- IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_RADAR);
++ if (cfg80211_chandef_dfs_required(wiphy, chandef) > 0 &&
++ cfg80211_chandef_dfs_available(wiphy, chandef)) {
++ /* We can skip IEEE80211_CHAN_NO_IR if chandef dfs available */
++ prohibited_flags = IEEE80211_CHAN_DISABLED;
+ }
+
++ res = cfg80211_chandef_usable(wiphy, chandef, prohibited_flags);
+
+ trace_cfg80211_return_bool(res);
+ return res;
+--- a/net/wireless/core.h
++++ b/net/wireless/core.h
+@@ -382,6 +382,19 @@ int cfg80211_can_use_iftype_chan(struct
+ enum cfg80211_chan_mode chanmode,
+ u8 radar_detect);
+
++/**
++ * cfg80211_chandef_dfs_usable - checks if chandef is DFS usable
++ * @wiphy: the wiphy to validate against
++ * @chandef: the channel definition to check
++ *
++ * Checks if chandef is usable and we can/need start CAC on such channel.
++ *
++ * Return: Return true if all channels available and at least
++ * one channel require CAC (NL80211_DFS_USABLE)
++ */
++bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy,
++ const struct cfg80211_chan_def *chandef);
++
+ void cfg80211_set_dfs_state(struct wiphy *wiphy,
+ const struct cfg80211_chan_def *chandef,
+ enum nl80211_dfs_state dfs_state);
+--- a/net/wireless/genregdb.awk
++++ b/net/wireless/genregdb.awk
+@@ -107,10 +107,13 @@ active && /^[ \t]*\(/ {
+ } else if (flagarray[arg] == "PTMP-ONLY") {
+ flags = flags "\n\t\t\tNL80211_RRF_PTMP_ONLY | "
+ } else if (flagarray[arg] == "PASSIVE-SCAN") {
+- flags = flags "\n\t\t\tNL80211_RRF_PASSIVE_SCAN | "
++ flags = flags "\n\t\t\tNL80211_RRF_NO_IR | "
+ } else if (flagarray[arg] == "NO-IBSS") {
+- flags = flags "\n\t\t\tNL80211_RRF_NO_IBSS | "
++ flags = flags "\n\t\t\tNL80211_RRF_NO_IR | "
++ } else if (flagarray[arg] == "NO-IR") {
++ flags = flags "\n\t\t\tNL80211_RRF_NO_IR | "
+ }
+
- ibss_dbg(sdata, "sta_find_ibss: did not try to join ibss\n");
-
- /* Selected IBSS not found in current scan results - try to scan */
-@@ -1138,6 +1202,7 @@ int ieee80211_ibss_leave(struct ieee8021
- clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
- ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
- BSS_CHANGED_IBSS);
-+ ieee80211_vif_release_channel(sdata);
- synchronize_rcu();
- kfree(presp);
-
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -551,8 +551,7 @@ static void ar9003_hw_set_channel_regs(s
- if (IS_CHAN_HT40(chan)) {
- phymode |= AR_PHY_GC_DYN2040_EN;
- /* Configure control (primary) channel at +-10MHz */
-- if ((chan->chanmode == CHANNEL_A_HT40PLUS) ||
-- (chan->chanmode == CHANNEL_G_HT40PLUS))
-+ if (IS_CHAN_HT40PLUS(chan))
- phymode |= AR_PHY_GC_DYN2040_PRI_CH;
+ }
+ flags = flags "0"
+ printf "\t\tREG_RULE(%d, %d, %d, %d, %d, %s),\n", start, end, bw, gain, power, flags
+--- a/net/wireless/ibss.c
++++ b/net/wireless/ibss.c
+@@ -274,7 +274,7 @@ int cfg80211_ibss_wext_join(struct cfg80
+
+ for (i = 0; i < sband->n_channels; i++) {
+ chan = &sband->channels[i];
+- if (chan->flags & IEEE80211_CHAN_NO_IBSS)
++ if (chan->flags & IEEE80211_CHAN_NO_IR)
+ continue;
+ if (chan->flags & IEEE80211_CHAN_DISABLED)
+ continue;
+@@ -345,7 +345,7 @@ int cfg80211_ibss_wext_siwfreq(struct ne
+ chan = ieee80211_get_channel(wdev->wiphy, freq);
+ if (!chan)
+ return -EINVAL;
+- if (chan->flags & IEEE80211_CHAN_NO_IBSS ||
++ if (chan->flags & IEEE80211_CHAN_NO_IR ||
+ chan->flags & IEEE80211_CHAN_DISABLED)
+ return -EINVAL;
+ }
+--- a/net/wireless/mesh.c
++++ b/net/wireless/mesh.c
+@@ -141,8 +141,7 @@ int __cfg80211_join_mesh(struct cfg80211
+
+ for (i = 0; i < sband->n_channels; i++) {
+ chan = &sband->channels[i];
+- if (chan->flags & (IEEE80211_CHAN_NO_IBSS |
+- IEEE80211_CHAN_PASSIVE_SCAN |
++ if (chan->flags & (IEEE80211_CHAN_NO_IR |
+ IEEE80211_CHAN_DISABLED |
+ IEEE80211_CHAN_RADAR))
+ continue;
+--- a/net/wireless/mlme.c
++++ b/net/wireless/mlme.c
+@@ -763,12 +763,12 @@ void cfg80211_radar_event(struct wiphy *
+ EXPORT_SYMBOL(cfg80211_radar_event);
+
+ void cfg80211_cac_event(struct net_device *netdev,
++ const struct cfg80211_chan_def *chandef,
+ enum nl80211_radar_event event, gfp_t gfp)
+ {
+ struct wireless_dev *wdev = netdev->ieee80211_ptr;
+ struct wiphy *wiphy = wdev->wiphy;
+ struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+- struct cfg80211_chan_def chandef;
+ unsigned long timeout;
+
+ trace_cfg80211_cac_event(netdev, event);
+@@ -779,14 +779,12 @@ void cfg80211_cac_event(struct net_devic
+ if (WARN_ON(!wdev->channel))
+ return;
+- cfg80211_chandef_create(&chandef, wdev->channel, NL80211_CHAN_NO_HT);
+-
+ switch (event) {
+ case NL80211_RADAR_CAC_FINISHED:
+ timeout = wdev->cac_start_time +
+ msecs_to_jiffies(IEEE80211_DFS_MIN_CAC_TIME_MS);
+ WARN_ON(!time_after_eq(jiffies, timeout));
+- cfg80211_set_dfs_state(wiphy, &chandef, NL80211_DFS_AVAILABLE);
++ cfg80211_set_dfs_state(wiphy, chandef, NL80211_DFS_AVAILABLE);
+ break;
+ case NL80211_RADAR_CAC_ABORTED:
+ break;
+@@ -796,6 +794,6 @@ void cfg80211_cac_event(struct net_devic
}
-@@ -565,7 +564,7 @@ static void ar9003_hw_set_channel_regs(s
- REG_WRITE(ah, AR_PHY_GEN_CTRL, phymode);
-
- /* Configure MAC for 20/40 operation */
-- ath9k_hw_set11nmac2040(ah);
-+ ath9k_hw_set11nmac2040(ah, chan);
-
- /* global transmit timeout (25 TUs default)*/
- REG_WRITE(ah, AR_GTXTO, 25 << AR_GTXTO_TIMEOUT_LIMIT_S);
-@@ -632,6 +631,22 @@ static void ar9003_hw_override_ini(struc
-
- REG_SET_BIT(ah, AR_PHY_CCK_DETECT,
- AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV);
-+
-+ if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
-+ REG_WRITE(ah, AR_GLB_SWREG_DISCONT_MODE,
-+ AR_GLB_SWREG_DISCONT_EN_BT_WLAN);
-+
-+ if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
-+ AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL))
-+ ah->enabled_cals |= TX_IQ_CAL;
-+ else
-+ ah->enabled_cals &= ~TX_IQ_CAL;
-+
-+ if (REG_READ(ah, AR_PHY_CL_CAL_CTL) & AR_PHY_CL_CAL_ENABLE)
-+ ah->enabled_cals |= TX_CL_CAL;
-+ else
-+ ah->enabled_cals &= ~TX_CL_CAL;
+ wdev->cac_started = false;
+
+- nl80211_radar_notify(rdev, &chandef, event, netdev, gfp);
++ nl80211_radar_notify(rdev, chandef, event, netdev, gfp);
+ }
+ EXPORT_SYMBOL(cfg80211_cac_event);
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -545,12 +545,12 @@ static int nl80211_msg_put_channel(struc
+ if ((chan->flags & IEEE80211_CHAN_DISABLED) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_DISABLED))
+ goto nla_put_failure;
+- if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
+- nla_put_flag(msg, NL80211_FREQUENCY_ATTR_PASSIVE_SCAN))
+- goto nla_put_failure;
+- if ((chan->flags & IEEE80211_CHAN_NO_IBSS) &&
+- nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IBSS))
+- goto nla_put_failure;
++ if (chan->flags & IEEE80211_CHAN_NO_IR) {
++ if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IR))
++ goto nla_put_failure;
++ if (nla_put_flag(msg, __NL80211_FREQUENCY_ATTR_NO_IBSS))
++ goto nla_put_failure;
+ }
+ if (chan->flags & IEEE80211_CHAN_RADAR) {
+ if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))
+ goto nla_put_failure;
+@@ -1229,7 +1229,7 @@ static int nl80211_send_wiphy(struct cfg
+ nla_put_flag(msg, NL80211_ATTR_TDLS_EXTERNAL_SETUP))
+ goto nla_put_failure;
+ if ((dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_5_10_MHZ) &&
+- nla_put_flag(msg, WIPHY_FLAG_SUPPORTS_5_10_MHZ))
++ nla_put_flag(msg, NL80211_ATTR_SUPPORT_5_10_MHZ))
+ goto nla_put_failure;
+
+ state->split_start++;
+@@ -2170,7 +2170,7 @@ static inline u64 wdev_id(struct wireles
}
- static void ar9003_hw_prog_ini(struct ath_hw *ah,
-@@ -667,41 +682,22 @@ static int ar9550_hw_get_modes_txgain_in
+ static int nl80211_send_chandef(struct sk_buff *msg,
+- struct cfg80211_chan_def *chandef)
++ const struct cfg80211_chan_def *chandef)
{
- int ret;
-
-- switch (chan->chanmode) {
-- case CHANNEL_A:
-- case CHANNEL_A_HT20:
-- if (chan->channel <= 5350)
-- ret = 1;
-- else if ((chan->channel > 5350) && (chan->channel <= 5600))
-- ret = 3;
-+ if (IS_CHAN_2GHZ(chan)) {
-+ if (IS_CHAN_HT40(chan))
-+ return 7;
- else
-- ret = 5;
-- break;
--
-- case CHANNEL_A_HT40PLUS:
-- case CHANNEL_A_HT40MINUS:
-- if (chan->channel <= 5350)
-- ret = 2;
-- else if ((chan->channel > 5350) && (chan->channel <= 5600))
-- ret = 4;
-- else
-- ret = 6;
-- break;
-+ return 8;
-+ }
+ WARN_ON(!cfg80211_chandef_valid(chandef));
-- case CHANNEL_G:
-- case CHANNEL_G_HT20:
-- case CHANNEL_B:
-- ret = 8;
-- break;
-+ if (chan->channel <= 5350)
-+ ret = 1;
-+ else if ((chan->channel > 5350) && (chan->channel <= 5600))
-+ ret = 3;
-+ else
-+ ret = 5;
+@@ -5653,7 +5653,7 @@ static int nl80211_start_radar_detection
+ if (err == 0)
+ return -EINVAL;
-- case CHANNEL_G_HT40PLUS:
-- case CHANNEL_G_HT40MINUS:
-- ret = 7;
-- break;
--
-- default:
-- ret = -EINVAL;
-- }
-+ if (IS_CHAN_HT40(chan))
-+ ret++;
+- if (chandef.chan->dfs_state != NL80211_DFS_USABLE)
++ if (!cfg80211_chandef_dfs_usable(wdev->wiphy, &chandef))
+ return -EINVAL;
- return ret;
- }
-@@ -712,28 +708,10 @@ static int ar9003_hw_process_ini(struct
- unsigned int regWrites = 0, i;
- u32 modesIndex;
-
-- switch (chan->chanmode) {
-- case CHANNEL_A:
-- case CHANNEL_A_HT20:
-- modesIndex = 1;
-- break;
-- case CHANNEL_A_HT40PLUS:
-- case CHANNEL_A_HT40MINUS:
-- modesIndex = 2;
-- break;
-- case CHANNEL_G:
-- case CHANNEL_G_HT20:
-- case CHANNEL_B:
-- modesIndex = 4;
-- break;
-- case CHANNEL_G_HT40PLUS:
-- case CHANNEL_G_HT40MINUS:
-- modesIndex = 3;
-- break;
--
-- default:
-- return -EINVAL;
-- }
-+ if (IS_CHAN_5GHZ(chan))
-+ modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;
-+ else
-+ modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;
+ if (!rdev->ops->start_radar_detection)
+@@ -10882,7 +10882,7 @@ EXPORT_SYMBOL(cfg80211_cqm_txe_notify);
- /*
- * SOC, MAC, BB, RADIO initvals.
-@@ -814,29 +792,12 @@ static int ar9003_hw_process_ini(struct
- if (chan->channel == 2484)
- ar9003_hw_prog_ini(ah, &ah->iniCckfirJapan2484, 1);
-
-- if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
-- REG_WRITE(ah, AR_GLB_SWREG_DISCONT_MODE,
-- AR_GLB_SWREG_DISCONT_EN_BT_WLAN);
--
- ah->modes_index = modesIndex;
- ar9003_hw_override_ini(ah);
- ar9003_hw_set_channel_regs(ah, chan);
- ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
- ath9k_hw_apply_txpower(ah, chan, false);
-
-- if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
-- if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0,
-- AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL))
-- ah->enabled_cals |= TX_IQ_CAL;
-- else
-- ah->enabled_cals &= ~TX_IQ_CAL;
--
-- if (REG_READ(ah, AR_PHY_CL_CAL_CTL) & AR_PHY_CL_CAL_ENABLE)
-- ah->enabled_cals |= TX_CL_CAL;
-- else
-- ah->enabled_cals &= ~TX_CL_CAL;
-- }
--
- return 0;
- }
+ void
+ nl80211_radar_notify(struct cfg80211_registered_device *rdev,
+- struct cfg80211_chan_def *chandef,
++ const struct cfg80211_chan_def *chandef,
+ enum nl80211_radar_event event,
+ struct net_device *netdev, gfp_t gfp)
+ {
+--- a/net/wireless/nl80211.h
++++ b/net/wireless/nl80211.h
+@@ -70,7 +70,7 @@ int nl80211_send_mgmt(struct cfg80211_re
-@@ -848,8 +809,10 @@ static void ar9003_hw_set_rfmode(struct
- if (chan == NULL)
- return;
+ void
+ nl80211_radar_notify(struct cfg80211_registered_device *rdev,
+- struct cfg80211_chan_def *chandef,
++ const struct cfg80211_chan_def *chandef,
+ enum nl80211_radar_event event,
+ struct net_device *netdev, gfp_t gfp);
-- rfMode |= (IS_CHAN_B(chan) || IS_CHAN_G(chan))
-- ? AR_PHY_MODE_DYNAMIC : AR_PHY_MODE_OFDM;
-+ if (IS_CHAN_2GHZ(chan))
-+ rfMode |= AR_PHY_MODE_DYNAMIC;
-+ else
-+ rfMode |= AR_PHY_MODE_OFDM;
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -163,35 +163,29 @@ static const struct ieee80211_regdomain
+ REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
+ /* IEEE 802.11b/g, channels 12..13. */
+ REG_RULE(2467-10, 2472+10, 40, 6, 20,
+- NL80211_RRF_PASSIVE_SCAN |
+- NL80211_RRF_NO_IBSS),
++ NL80211_RRF_NO_IR),
+ /* IEEE 802.11 channel 14 - Only JP enables
+ * this and for 802.11b only */
+ REG_RULE(2484-10, 2484+10, 20, 6, 20,
+- NL80211_RRF_PASSIVE_SCAN |
+- NL80211_RRF_NO_IBSS |
++ NL80211_RRF_NO_IR |
+ NL80211_RRF_NO_OFDM),
+ /* IEEE 802.11a, channel 36..48 */
+ REG_RULE(5180-10, 5240+10, 160, 6, 20,
+- NL80211_RRF_PASSIVE_SCAN |
+- NL80211_RRF_NO_IBSS),
++ NL80211_RRF_NO_IR),
+
+ /* IEEE 802.11a, channel 52..64 - DFS required */
+ REG_RULE(5260-10, 5320+10, 160, 6, 20,
+- NL80211_RRF_PASSIVE_SCAN |
+- NL80211_RRF_NO_IBSS |
++ NL80211_RRF_NO_IR |
+ NL80211_RRF_DFS),
+
+ /* IEEE 802.11a, channel 100..144 - DFS required */
+ REG_RULE(5500-10, 5720+10, 160, 6, 20,
+- NL80211_RRF_PASSIVE_SCAN |
+- NL80211_RRF_NO_IBSS |
++ NL80211_RRF_NO_IR |
+ NL80211_RRF_DFS),
+
+ /* IEEE 802.11a, channel 149..165 */
+ REG_RULE(5745-10, 5825+10, 80, 6, 20,
+- NL80211_RRF_PASSIVE_SCAN |
+- NL80211_RRF_NO_IBSS),
++ NL80211_RRF_NO_IR),
+
+ /* IEEE 802.11ad (60gHz), channels 1..3 */
+ REG_RULE(56160+2160*1-1080, 56160+2160*3+1080, 2160, 0, 0, 0),
+@@ -698,10 +692,8 @@ regdom_intersect(const struct ieee80211_
+ static u32 map_regdom_flags(u32 rd_flags)
+ {
+ u32 channel_flags = 0;
+- if (rd_flags & NL80211_RRF_PASSIVE_SCAN)
+- channel_flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+- if (rd_flags & NL80211_RRF_NO_IBSS)
+- channel_flags |= IEEE80211_CHAN_NO_IBSS;
++ if (rd_flags & NL80211_RRF_NO_IR_ALL)
++ channel_flags |= IEEE80211_CHAN_NO_IR;
+ if (rd_flags & NL80211_RRF_DFS)
+ channel_flags |= IEEE80211_CHAN_RADAR;
+ if (rd_flags & NL80211_RRF_NO_OFDM)
+@@ -1066,13 +1058,8 @@ static void handle_reg_beacon(struct wip
+ chan_before.center_freq = chan->center_freq;
+ chan_before.flags = chan->flags;
+
+- if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) {
+- chan->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
+- channel_changed = true;
+- }
+-
+- if (chan->flags & IEEE80211_CHAN_NO_IBSS) {
+- chan->flags &= ~IEEE80211_CHAN_NO_IBSS;
++ if (chan->flags & IEEE80211_CHAN_NO_IR) {
++ chan->flags &= ~IEEE80211_CHAN_NO_IR;
+ channel_changed = true;
+ }
- if (IS_CHAN_A_FAST_CLOCK(ah, chan))
- rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);
-@@ -1173,6 +1136,10 @@ skip_ws_det:
- * is_on == 0 means MRC CCK is OFF (more noise imm)
- */
- bool is_on = param ? 1 : 0;
+--- /dev/null
++++ b/drivers/net/wireless/ath/ath9k/ar9003_wow.c
+@@ -0,0 +1,422 @@
++/*
++ * Copyright (c) 2012 Qualcomm Atheros, 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.
++ */
+
-+ if (ah->caps.rx_chainmask == 1)
-+ break;
++#include <linux/export.h>
++#include "ath9k.h"
++#include "reg.h"
++#include "hw-ops.h"
+
- REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
- AR_PHY_MRC_CCK_ENABLE, is_on);
- REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
-@@ -1273,12 +1240,11 @@ static void ar9003_hw_ani_cache_ini_regs
- aniState = &ah->ani;
- iniDef = &aniState->iniDef;
-
-- ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz/0x%x\n",
-+ ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz\n",
- ah->hw_version.macVersion,
- ah->hw_version.macRev,
- ah->opmode,
-- chan->channel,
-- chan->channelFlags);
-+ chan->channel);
-
- val = REG_READ(ah, AR_PHY_SFCORR);
- iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);
-@@ -1413,65 +1379,111 @@ static void ar9003_hw_antdiv_comb_conf_s
- REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
- }
-
--static void ar9003_hw_antctrl_shared_chain_lnadiv(struct ath_hw *ah,
-- bool enable)
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
++const char *ath9k_hw_wow_event_to_string(u32 wow_event)
++{
++ if (wow_event & AH_WOW_MAGIC_PATTERN_EN)
++ return "Magic pattern";
++ if (wow_event & AH_WOW_USER_PATTERN_EN)
++ return "User pattern";
++ if (wow_event & AH_WOW_LINK_CHANGE)
++ return "Link change";
++ if (wow_event & AH_WOW_BEACON_MISS)
++ return "Beacon miss";
++
++ return "unknown reason";
++}
++EXPORT_SYMBOL(ath9k_hw_wow_event_to_string);
+
-+static void ar9003_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
- {
-+ struct ath9k_hw_capabilities *pCap = &ah->caps;
- u8 ant_div_ctl1;
- u32 regval;
-
-- if (!AR_SREV_9565(ah))
-+ if (!AR_SREV_9485(ah) && !AR_SREV_9565(ah))
- return;
-
-- ah->shared_chain_lnadiv = enable;
-+ if (AR_SREV_9485(ah)) {
-+ regval = ar9003_hw_ant_ctrl_common_2_get(ah,
-+ IS_CHAN_2GHZ(ah->curchan));
-+ if (enable) {
-+ regval &= ~AR_SWITCH_TABLE_COM2_ALL;
-+ regval |= ah->config.ant_ctrl_comm2g_switch_enable;
-+ }
-+ REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM_2,
-+ AR_SWITCH_TABLE_COM2_ALL, regval);
-+ }
++static void ath9k_hw_set_powermode_wow_sleep(struct ath_hw *ah)
++{
++ struct ath_common *common = ath9k_hw_common(ah);
+
- ant_div_ctl1 = ah->eep_ops->get_eeprom(ah, EEP_ANT_DIV_CTL1);
-
-+ /*
-+ * Set MAIN/ALT LNA conf.
-+ * Set MAIN/ALT gain_tb.
-+ */
- regval = REG_READ(ah, AR_PHY_MC_GAIN_CTRL);
- regval &= (~AR_ANT_DIV_CTRL_ALL);
- regval |= (ant_div_ctl1 & 0x3f) << AR_ANT_DIV_CTRL_ALL_S;
-- regval &= ~AR_PHY_ANT_DIV_LNADIV;
-- regval |= ((ant_div_ctl1 >> 6) & 0x1) << AR_PHY_ANT_DIV_LNADIV_S;
--
-- if (enable)
-- regval |= AR_ANT_DIV_ENABLE;
--
- REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
-
-- regval = REG_READ(ah, AR_PHY_CCK_DETECT);
-- regval &= ~AR_FAST_DIV_ENABLE;
-- regval |= ((ant_div_ctl1 >> 7) & 0x1) << AR_FAST_DIV_ENABLE_S;
--
-- if (enable)
-- regval |= AR_FAST_DIV_ENABLE;
--
-- REG_WRITE(ah, AR_PHY_CCK_DETECT, regval);
--
-- if (enable) {
-- REG_SET_BIT(ah, AR_PHY_MC_GAIN_CTRL,
-- (1 << AR_PHY_ANT_SW_RX_PROT_S));
-- if (ah->curchan && IS_CHAN_2GHZ(ah->curchan))
-- REG_SET_BIT(ah, AR_PHY_RESTART,
-- AR_PHY_RESTART_ENABLE_DIV_M2FLAG);
-- REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV,
-- AR_BTCOEX_WL_LNADIV_FORCE_ON);
-- } else {
-- REG_CLR_BIT(ah, AR_PHY_MC_GAIN_CTRL, AR_ANT_DIV_ENABLE);
-- REG_CLR_BIT(ah, AR_PHY_MC_GAIN_CTRL,
-- (1 << AR_PHY_ANT_SW_RX_PROT_S));
-- REG_CLR_BIT(ah, AR_PHY_CCK_DETECT, AR_FAST_DIV_ENABLE);
-- REG_CLR_BIT(ah, AR_BTCOEX_WL_LNADIV,
-- AR_BTCOEX_WL_LNADIV_FORCE_ON);
--
-+ if (AR_SREV_9485_11_OR_LATER(ah)) {
-+ /*
-+ * Enable LNA diversity.
-+ */
- regval = REG_READ(ah, AR_PHY_MC_GAIN_CTRL);
-- regval &= ~(AR_PHY_ANT_DIV_MAIN_LNACONF |
-- AR_PHY_ANT_DIV_ALT_LNACONF |
-- AR_PHY_ANT_DIV_MAIN_GAINTB |
-- AR_PHY_ANT_DIV_ALT_GAINTB);
-- regval |= (AR_PHY_ANT_DIV_LNA1 << AR_PHY_ANT_DIV_MAIN_LNACONF_S);
-- regval |= (AR_PHY_ANT_DIV_LNA2 << AR_PHY_ANT_DIV_ALT_LNACONF_S);
-+ regval &= ~AR_PHY_ANT_DIV_LNADIV;
-+ regval |= ((ant_div_ctl1 >> 6) & 0x1) << AR_PHY_ANT_DIV_LNADIV_S;
-+ if (enable)
-+ regval |= AR_ANT_DIV_ENABLE;
-+
- REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
++ REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
+
-+ /*
-+ * Enable fast antenna diversity.
-+ */
-+ regval = REG_READ(ah, AR_PHY_CCK_DETECT);
-+ regval &= ~AR_FAST_DIV_ENABLE;
-+ regval |= ((ant_div_ctl1 >> 7) & 0x1) << AR_FAST_DIV_ENABLE_S;
-+ if (enable)
-+ regval |= AR_FAST_DIV_ENABLE;
-+
-+ REG_WRITE(ah, AR_PHY_CCK_DETECT, regval);
-+
-+ if (pCap->hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) {
-+ regval = REG_READ(ah, AR_PHY_MC_GAIN_CTRL);
-+ regval &= (~(AR_PHY_ANT_DIV_MAIN_LNACONF |
-+ AR_PHY_ANT_DIV_ALT_LNACONF |
-+ AR_PHY_ANT_DIV_ALT_GAINTB |
-+ AR_PHY_ANT_DIV_MAIN_GAINTB));
-+ /*
-+ * Set MAIN to LNA1 and ALT to LNA2 at the
-+ * beginning.
-+ */
-+ regval |= (ATH_ANT_DIV_COMB_LNA1 <<
-+ AR_PHY_ANT_DIV_MAIN_LNACONF_S);
-+ regval |= (ATH_ANT_DIV_COMB_LNA2 <<
-+ AR_PHY_ANT_DIV_ALT_LNACONF_S);
-+ REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
-+ }
-+ } else if (AR_SREV_9565(ah)) {
-+ if (enable) {
-+ REG_SET_BIT(ah, AR_PHY_MC_GAIN_CTRL,
-+ (1 << AR_PHY_ANT_SW_RX_PROT_S));
-+ if (ah->curchan && IS_CHAN_2GHZ(ah->curchan))
-+ REG_SET_BIT(ah, AR_PHY_RESTART,
-+ AR_PHY_RESTART_ENABLE_DIV_M2FLAG);
-+ REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV,
-+ AR_BTCOEX_WL_LNADIV_FORCE_ON);
-+ } else {
-+ REG_CLR_BIT(ah, AR_PHY_MC_GAIN_CTRL, AR_ANT_DIV_ENABLE);
-+ REG_CLR_BIT(ah, AR_PHY_MC_GAIN_CTRL,
-+ (1 << AR_PHY_ANT_SW_RX_PROT_S));
-+ REG_CLR_BIT(ah, AR_PHY_CCK_DETECT, AR_FAST_DIV_ENABLE);
-+ REG_CLR_BIT(ah, AR_BTCOEX_WL_LNADIV,
-+ AR_BTCOEX_WL_LNADIV_FORCE_ON);
-+
-+ regval = REG_READ(ah, AR_PHY_MC_GAIN_CTRL);
-+ regval &= ~(AR_PHY_ANT_DIV_MAIN_LNACONF |
-+ AR_PHY_ANT_DIV_ALT_LNACONF |
-+ AR_PHY_ANT_DIV_MAIN_GAINTB |
-+ AR_PHY_ANT_DIV_ALT_GAINTB);
-+ regval |= (ATH_ANT_DIV_COMB_LNA1 <<
-+ AR_PHY_ANT_DIV_MAIN_LNACONF_S);
-+ regval |= (ATH_ANT_DIV_COMB_LNA2 <<
-+ AR_PHY_ANT_DIV_ALT_LNACONF_S);
-+ REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
-+ }
- }
- }
-
-+#endif
++ /* set rx disable bit */
++ REG_WRITE(ah, AR_CR, AR_CR_RXD);
+
- static int ar9003_hw_fast_chan_change(struct ath_hw *ah,
- struct ath9k_channel *chan,
- u8 *ini_reloaded)
-@@ -1479,28 +1491,10 @@ static int ar9003_hw_fast_chan_change(st
- unsigned int regWrites = 0;
- u32 modesIndex;
-
-- switch (chan->chanmode) {
-- case CHANNEL_A:
-- case CHANNEL_A_HT20:
-- modesIndex = 1;
-- break;
-- case CHANNEL_A_HT40PLUS:
-- case CHANNEL_A_HT40MINUS:
-- modesIndex = 2;
-- break;
-- case CHANNEL_G:
-- case CHANNEL_G_HT20:
-- case CHANNEL_B:
-- modesIndex = 4;
-- break;
-- case CHANNEL_G_HT40PLUS:
-- case CHANNEL_G_HT40MINUS:
-- modesIndex = 3;
-- break;
--
-- default:
-- return -EINVAL;
-- }
-+ if (IS_CHAN_5GHZ(chan))
-+ modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;
-+ else
-+ modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;
-
- if (modesIndex == ah->modes_index) {
- *ini_reloaded = false;
-@@ -1518,6 +1512,18 @@ static int ar9003_hw_fast_chan_change(st
-
- REG_WRITE_ARRAY(&ah->iniModesTxGain, modesIndex, regWrites);
-
-+ if (AR_SREV_9462_20_OR_LATER(ah)) {
-+ /*
-+ * CUS217 mix LNA mode.
-+ */
-+ if (ar9003_hw_get_rx_gain_idx(ah) == 2) {
-+ REG_WRITE_ARRAY(&ah->ini_modes_rxgain_bb_core,
-+ 1, regWrites);
-+ REG_WRITE_ARRAY(&ah->ini_modes_rxgain_bb_postamble,
-+ modesIndex, regWrites);
-+ }
++ if (!ath9k_hw_wait(ah, AR_CR, AR_CR_RXE, 0, AH_WAIT_TIMEOUT)) {
++ ath_err(common, "Failed to stop Rx DMA in 10ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",
++ REG_READ(ah, AR_CR), REG_READ(ah, AR_DIAG_SW));
++ return;
+ }
+
- /*
- * For 5GHz channels requiring Fast Clock, apply
- * different modal values.
-@@ -1528,7 +1534,11 @@ static int ar9003_hw_fast_chan_change(st
- if (AR_SREV_9565(ah))
- REG_WRITE_ARRAY(&ah->iniModesFastClock, 1, regWrites);
-
-- REG_WRITE_ARRAY(&ah->iniAdditional, 1, regWrites);
-+ /*
-+ * JAPAN regulatory.
-+ */
-+ if (chan->channel == 2484)
-+ ar9003_hw_prog_ini(ah, &ah->iniCckfirJapan2484, 1);
-
- ah->modes_index = modesIndex;
- *ini_reloaded = true;
-@@ -1631,11 +1641,14 @@ void ar9003_hw_attach_phy_ops(struct ath
-
- ops->antdiv_comb_conf_get = ar9003_hw_antdiv_comb_conf_get;
- ops->antdiv_comb_conf_set = ar9003_hw_antdiv_comb_conf_set;
-- ops->antctrl_shared_chain_lnadiv = ar9003_hw_antctrl_shared_chain_lnadiv;
- ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
- ops->spectral_scan_trigger = ar9003_hw_spectral_scan_trigger;
- ops->spectral_scan_wait = ar9003_hw_spectral_scan_wait;
-
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-+ ops->set_bt_ant_diversity = ar9003_hw_set_bt_ant_diversity;
-+#endif
-+
- ar9003_hw_set_nf_limits(ah);
- ar9003_hw_set_radar_conf(ah);
- memcpy(ah->nf_regs, ar9300_cca_regs, sizeof(ah->nf_regs));
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -19,7 +19,7 @@
- #include "ath9k.h"
- #include "ar9003_mac.h"
-
--#define SKB_CB_ATHBUF(__skb) (*((struct ath_buf **)__skb->cb))
-+#define SKB_CB_ATHBUF(__skb) (*((struct ath_rxbuf **)__skb->cb))
-
- static inline bool ath9k_check_auto_sleep(struct ath_softc *sc)
- {
-@@ -35,15 +35,13 @@ static inline bool ath9k_check_auto_slee
- * buffer (or rx fifo). This can incorrectly acknowledge packets
- * to a sender if last desc is self-linked.
- */
--static void ath_rx_buf_link(struct ath_softc *sc, struct ath_buf *bf)
-+static void ath_rx_buf_link(struct ath_softc *sc, struct ath_rxbuf *bf)
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath_desc *ds;
- struct sk_buff *skb;
-
-- ATH_RXBUF_RESET(bf);
--
- ds = bf->bf_desc;
- ds->ds_link = 0; /* link to null */
- ds->ds_data = bf->bf_buf_addr;
-@@ -70,6 +68,14 @@ static void ath_rx_buf_link(struct ath_s
- sc->rx.rxlink = &ds->ds_link;
- }
-
-+static void ath_rx_buf_relink(struct ath_softc *sc, struct ath_rxbuf *bf)
++ REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_ON_INT);
++}
++
++static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah)
+{
-+ if (sc->rx.buf_hold)
-+ ath_rx_buf_link(sc, sc->rx.buf_hold);
++ struct ath_common *common = ath9k_hw_common(ah);
++ u8 sta_mac_addr[ETH_ALEN], ap_mac_addr[ETH_ALEN];
++ u32 ctl[13] = {0};
++ u32 data_word[KAL_NUM_DATA_WORDS];
++ u8 i;
++ u32 wow_ka_data_word0;
++
++ memcpy(sta_mac_addr, common->macaddr, ETH_ALEN);
++ memcpy(ap_mac_addr, common->curbssid, ETH_ALEN);
++
++ /* set the transmit buffer */
++ ctl[0] = (KAL_FRAME_LEN | (MAX_RATE_POWER << 16));
++ ctl[1] = 0;
++ ctl[3] = 0xb; /* OFDM_6M hardware value for this rate */
++ ctl[4] = 0;
++ ctl[7] = (ah->txchainmask) << 2;
++ ctl[2] = 0xf << 16; /* tx_tries 0 */
++
++ for (i = 0; i < KAL_NUM_DESC_WORDS; i++)
++ REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
++
++ REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + i * 4), ctl[i]);
++
++ data_word[0] = (KAL_FRAME_TYPE << 2) | (KAL_FRAME_SUB_TYPE << 4) |
++ (KAL_TO_DS << 8) | (KAL_DURATION_ID << 16);
++ data_word[1] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
++ (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
++ data_word[2] = (sta_mac_addr[1] << 24) | (sta_mac_addr[0] << 16) |
++ (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
++ data_word[3] = (sta_mac_addr[5] << 24) | (sta_mac_addr[4] << 16) |
++ (sta_mac_addr[3] << 8) | (sta_mac_addr[2]);
++ data_word[4] = (ap_mac_addr[3] << 24) | (ap_mac_addr[2] << 16) |
++ (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);
++ data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);
++
++ if (AR_SREV_9462_20(ah)) {
++ /* AR9462 2.0 has an extra descriptor word (time based
++ * discard) compared to other chips */
++ REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0);
++ wow_ka_data_word0 = AR_WOW_TXBUF(13);
++ } else {
++ wow_ka_data_word0 = AR_WOW_TXBUF(12);
++ }
++
++ for (i = 0; i < KAL_NUM_DATA_WORDS; i++)
++ REG_WRITE(ah, (wow_ka_data_word0 + i*4), data_word[i]);
+
-+ sc->rx.buf_hold = bf;
+}
+
- static void ath_setdefantenna(struct ath_softc *sc, u32 antenna)
- {
- /* XXX block beacon interrupts */
-@@ -106,18 +112,17 @@ static bool ath_rx_edma_buf_link(struct
- struct ath_hw *ah = sc->sc_ah;
- struct ath_rx_edma *rx_edma;
- struct sk_buff *skb;
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
-
- rx_edma = &sc->rx.rx_edma[qtype];
- if (skb_queue_len(&rx_edma->rx_fifo) >= rx_edma->rx_fifo_hwsize)
- return false;
-
-- bf = list_first_entry(&sc->rx.rxbuf, struct ath_buf, list);
-+ bf = list_first_entry(&sc->rx.rxbuf, struct ath_rxbuf, list);
- list_del_init(&bf->list);
-
- skb = bf->bf_mpdu;
-
-- ATH_RXBUF_RESET(bf);
- memset(skb->data, 0, ah->caps.rx_status_len);
- dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
- ah->caps.rx_status_len, DMA_TO_DEVICE);
-@@ -133,7 +138,7 @@ static void ath_rx_addbuffer_edma(struct
- enum ath9k_rx_qtype qtype)
- {
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- struct ath_buf *bf, *tbf;
-+ struct ath_rxbuf *bf, *tbf;
-
- if (list_empty(&sc->rx.rxbuf)) {
- ath_dbg(common, QUEUE, "No free rx buf available\n");
-@@ -149,7 +154,7 @@ static void ath_rx_addbuffer_edma(struct
- static void ath_rx_remove_buffer(struct ath_softc *sc,
- enum ath9k_rx_qtype qtype)
- {
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
- struct ath_rx_edma *rx_edma;
- struct sk_buff *skb;
-
-@@ -166,7 +171,7 @@ static void ath_rx_edma_cleanup(struct a
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
-
- ath_rx_remove_buffer(sc, ATH9K_RX_QUEUE_LP);
- ath_rx_remove_buffer(sc, ATH9K_RX_QUEUE_HP);
-@@ -185,7 +190,7 @@ static void ath_rx_edma_cleanup(struct a
-
- static void ath_rx_edma_init_queue(struct ath_rx_edma *rx_edma, int size)
- {
-- skb_queue_head_init(&rx_edma->rx_fifo);
-+ __skb_queue_head_init(&rx_edma->rx_fifo);
- rx_edma->rx_fifo_hwsize = size;
- }
-
-@@ -194,7 +199,7 @@ static int ath_rx_edma_init(struct ath_s
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- struct ath_hw *ah = sc->sc_ah;
- struct sk_buff *skb;
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
- int error = 0, i;
- u32 size;
-
-@@ -206,7 +211,7 @@ static int ath_rx_edma_init(struct ath_s
- ath_rx_edma_init_queue(&sc->rx.rx_edma[ATH9K_RX_QUEUE_HP],
- ah->caps.rx_hp_qdepth);
-
-- size = sizeof(struct ath_buf) * nbufs;
-+ size = sizeof(struct ath_rxbuf) * nbufs;
- bf = devm_kzalloc(sc->dev, size, GFP_KERNEL);
- if (!bf)
- return -ENOMEM;
-@@ -266,7 +271,7 @@ int ath_rx_init(struct ath_softc *sc, in
- {
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- struct sk_buff *skb;
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
- int error = 0;
-
- spin_lock_init(&sc->sc_pcu_lock);
-@@ -327,7 +332,7 @@ void ath_rx_cleanup(struct ath_softc *sc
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- struct sk_buff *skb;
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
-
- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
- ath_rx_edma_cleanup(sc);
-@@ -422,7 +427,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
- int ath_startrecv(struct ath_softc *sc)
- {
- struct ath_hw *ah = sc->sc_ah;
-- struct ath_buf *bf, *tbf;
-+ struct ath_rxbuf *bf, *tbf;
-
- if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
- ath_edma_start_recv(sc);
-@@ -432,6 +437,7 @@ int ath_startrecv(struct ath_softc *sc)
- if (list_empty(&sc->rx.rxbuf))
- goto start_recv;
-
-+ sc->rx.buf_hold = NULL;
- sc->rx.rxlink = NULL;
- list_for_each_entry_safe(bf, tbf, &sc->rx.rxbuf, list) {
- ath_rx_buf_link(sc, bf);
-@@ -441,7 +447,7 @@ int ath_startrecv(struct ath_softc *sc)
- if (list_empty(&sc->rx.rxbuf))
- goto start_recv;
-
-- bf = list_first_entry(&sc->rx.rxbuf, struct ath_buf, list);
-+ bf = list_first_entry(&sc->rx.rxbuf, struct ath_rxbuf, list);
- ath9k_hw_putrxbuf(ah, bf->bf_daddr);
- ath9k_hw_rxena(ah);
-
-@@ -597,13 +603,13 @@ static void ath_rx_ps(struct ath_softc *
- static bool ath_edma_get_buffers(struct ath_softc *sc,
- enum ath9k_rx_qtype qtype,
- struct ath_rx_status *rs,
-- struct ath_buf **dest)
-+ struct ath_rxbuf **dest)
- {
- struct ath_rx_edma *rx_edma = &sc->rx.rx_edma[qtype];
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- struct sk_buff *skb;
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
- int ret;
-
- skb = skb_peek(&rx_edma->rx_fifo);
-@@ -647,11 +653,11 @@ static bool ath_edma_get_buffers(struct
- return true;
- }
-
--static struct ath_buf *ath_edma_get_next_rx_buf(struct ath_softc *sc,
-+static struct ath_rxbuf *ath_edma_get_next_rx_buf(struct ath_softc *sc,
- struct ath_rx_status *rs,
- enum ath9k_rx_qtype qtype)
- {
-- struct ath_buf *bf = NULL;
-+ struct ath_rxbuf *bf = NULL;
-
- while (ath_edma_get_buffers(sc, qtype, rs, &bf)) {
- if (!bf)
-@@ -662,13 +668,13 @@ static struct ath_buf *ath_edma_get_next
- return NULL;
- }
-
--static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
-+static struct ath_rxbuf *ath_get_next_rx_buf(struct ath_softc *sc,
- struct ath_rx_status *rs)
- {
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath_desc *ds;
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
- int ret;
-
- if (list_empty(&sc->rx.rxbuf)) {
-@@ -676,7 +682,10 @@ static struct ath_buf *ath_get_next_rx_b
- return NULL;
- }
-
-- bf = list_first_entry(&sc->rx.rxbuf, struct ath_buf, list);
-+ bf = list_first_entry(&sc->rx.rxbuf, struct ath_rxbuf, list);
-+ if (bf == sc->rx.buf_hold)
-+ return NULL;
++void ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
++ u8 *user_mask, int pattern_count,
++ int pattern_len)
++{
++ int i;
++ u32 pattern_val, mask_val;
++ u32 set, clr;
+
- ds = bf->bf_desc;
-
- /*
-@@ -693,7 +702,7 @@ static struct ath_buf *ath_get_next_rx_b
- ret = ath9k_hw_rxprocdesc(ah, ds, rs);
- if (ret == -EINPROGRESS) {
- struct ath_rx_status trs;
-- struct ath_buf *tbf;
-+ struct ath_rxbuf *tbf;
- struct ath_desc *tds;
-
- memset(&trs, 0, sizeof(trs));
-@@ -702,7 +711,7 @@ static struct ath_buf *ath_get_next_rx_b
- return NULL;
- }
-
-- tbf = list_entry(bf->list.next, struct ath_buf, list);
-+ tbf = list_entry(bf->list.next, struct ath_rxbuf, list);
-
- /*
- * On some hardware the descriptor status words could
-@@ -755,7 +764,6 @@ static bool ath9k_rx_accept(struct ath_c
- bool is_mc, is_valid_tkip, strip_mic, mic_error;
- struct ath_hw *ah = common->ah;
- __le16 fc;
-- u8 rx_status_len = ah->caps.rx_status_len;
-
- fc = hdr->frame_control;
-
-@@ -777,25 +785,6 @@ static bool ath9k_rx_accept(struct ath_c
- !test_bit(rx_stats->rs_keyix, common->ccmp_keymap))
- rx_stats->rs_status &= ~ATH9K_RXERR_KEYMISS;
-
-- if (!rx_stats->rs_datalen) {
-- RX_STAT_INC(rx_len_err);
-- 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)) {
-- RX_STAT_INC(rx_len_err);
-- return false;
-- }
--
-- /* Only use error bits from the last fragment */
-- if (rx_stats->rs_more)
-- return true;
--
- mic_error = is_valid_tkip && !ieee80211_is_ctl(fc) &&
- !ieee80211_has_morefrags(fc) &&
- !(le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG) &&
-@@ -814,8 +803,6 @@ static bool ath9k_rx_accept(struct ath_c
- rxs->flag |= RX_FLAG_FAILED_FCS_CRC;
- mic_error = false;
- }
-- if (rx_stats->rs_status & ATH9K_RXERR_PHY)
-- return false;
-
- if ((rx_stats->rs_status & ATH9K_RXERR_DECRYPT) ||
- (!is_mc && (rx_stats->rs_status & ATH9K_RXERR_KEYMISS))) {
-@@ -898,129 +885,65 @@ static int ath9k_process_rate(struct ath
-
- 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_rx_status *rx_stats,
-+ struct ieee80211_rx_status *rxs)
- {
- struct ath_softc *sc = hw->priv;
- struct ath_hw *ah = common->ah;
- int last_rssi;
- int rssi = rx_stats->rs_rssi;
-
-- if (!rx_stats->is_mybeacon ||
-- ((ah->opmode != NL80211_IFTYPE_STATION) &&
-- (ah->opmode != NL80211_IFTYPE_ADHOC)))
-+ /*
-+ * RSSI is not available for subframes in an A-MPDU.
-+ */
-+ if (rx_stats->rs_moreaggr) {
-+ rxs->flag |= RX_FLAG_NO_SIGNAL_VAL;
- return;
--
-- if (rx_stats->rs_rssi != ATH9K_RSSI_BAD && !rx_stats->rs_moreaggr)
-- ATH_RSSI_LPF(sc->last_rssi, rx_stats->rs_rssi);
--
-- last_rssi = sc->last_rssi;
-- if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-- rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
-- if (rssi < 0)
-- rssi = 0;
--
-- /* Update Beacon RSSI, this is used by ANI. */
-- ah->stats.avgbrssi = 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_softc *sc,
-- struct ieee80211_hdr *hdr,
-- struct ath_rx_status *rx_stats,
-- struct ieee80211_rx_status *rx_status,
-- bool *decrypt_error)
--{
-- struct ieee80211_hw *hw = sc->hw;
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
-- bool discard_current = sc->rx.discard_next;
--
-- sc->rx.discard_next = rx_stats->rs_more;
-- if (discard_current)
-- return -EINVAL;
-+ }
-
- /*
-- * everything but the rate is checked here, the rate check is done
-- * separately to avoid doing two lookups for a rate for each frame.
-+ * Check if the RSSI for the last subframe in an A-MPDU
-+ * or an unaggregated frame is valid.
- */
-- if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error))
-- return -EINVAL;
--
-- /* Only use status info from the last fragment */
-- if (rx_stats->rs_more)
-- return 0;
-+ if (rx_stats->rs_rssi == ATH9K_RSSI_BAD) {
-+ rxs->flag |= RX_FLAG_NO_SIGNAL_VAL;
++ /* FIXME: should check count by querying the hardware capability */
++ if (pattern_count >= MAX_NUM_PATTERN)
+ return;
++
++ REG_SET_BIT(ah, AR_WOW_PATTERN, BIT(pattern_count));
++
++ /* set the registers for pattern */
++ for (i = 0; i < MAX_PATTERN_SIZE; i += 4) {
++ memcpy(&pattern_val, user_pattern, 4);
++ REG_WRITE(ah, (AR_WOW_TB_PATTERN(pattern_count) + i),
++ pattern_val);
++ user_pattern += 4;
+ }
-
-- if (ath9k_process_rate(common, hw, rx_stats, rx_status))
-- return -EINVAL;
-+ /*
-+ * Update Beacon RSSI, this is used by ANI.
-+ */
-+ if (rx_stats->is_mybeacon &&
-+ ((ah->opmode == NL80211_IFTYPE_STATION) ||
-+ (ah->opmode == NL80211_IFTYPE_ADHOC))) {
-+ ATH_RSSI_LPF(sc->last_rssi, rx_stats->rs_rssi);
-+ last_rssi = sc->last_rssi;
-
-- ath9k_process_rssi(common, hw, hdr, rx_stats);
-+ if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-+ rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
-+ if (rssi < 0)
-+ rssi = 0;
-
-- rx_status->band = hw->conf.chandef.chan->band;
-- rx_status->freq = hw->conf.chandef.chan->center_freq;
-- rx_status->signal = ah->noise + rx_stats->rs_rssi;
-- rx_status->antenna = rx_stats->rs_antenna;
-- rx_status->flag |= RX_FLAG_MACTIME_END;
-- if (rx_stats->rs_moreaggr)
-- rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
-+ ah->stats.avgbrssi = rssi;
++
++ /* set the registers for mask */
++ for (i = 0; i < MAX_PATTERN_MASK_SIZE; i += 4) {
++ memcpy(&mask_val, user_mask, 4);
++ REG_WRITE(ah, (AR_WOW_TB_MASK(pattern_count) + i), mask_val);
++ user_mask += 4;
+ }
-
-- sc->rx.discard_next = false;
-- return 0;
-+ rxs->signal = ah->noise + rx_stats->rs_rssi;
- }
-
--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)
-+static void ath9k_process_tsf(struct ath_rx_status *rs,
-+ struct ieee80211_rx_status *rxs,
-+ u64 tsf)
- {
-- struct ath_hw *ah = common->ah;
-- struct ieee80211_hdr *hdr;
-- int hdrlen, padpos, padsize;
-- u8 keyix;
-- __le16 fc;
-+ u32 tsf_lower = tsf & 0xffffffff;
-
-- /* 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 = ieee80211_hdrlen(fc);
-+ rxs->mactime = (tsf & ~0xffffffffULL) | rs->rs_tstamp;
-+ if (rs->rs_tstamp > tsf_lower &&
-+ unlikely(rs->rs_tstamp - tsf_lower > 0x10000000))
-+ rxs->mactime -= 0x100000000ULL;
-
-- /* 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;
-+ if (rs->rs_tstamp < tsf_lower &&
-+ unlikely(tsf_lower - rs->rs_tstamp > 0x10000000))
-+ rxs->mactime += 0x100000000ULL;
- }
-
- #ifdef CPTCFG_ATH9K_DEBUGFS
-@@ -1133,6 +1056,234 @@ static int ath_process_fft(struct ath_so
- #endif
- }
-
-+static bool ath9k_is_mybeacon(struct ath_softc *sc, struct ieee80211_hdr *hdr)
-+{
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
+
-+ if (ieee80211_is_beacon(hdr->frame_control)) {
-+ RX_STAT_INC(rx_beacons);
-+ if (!is_zero_ether_addr(common->curbssid) &&
-+ ether_addr_equal(hdr->addr3, common->curbssid))
-+ return true;
++ /* set the pattern length to be matched
++ *
++ * AR_WOW_LENGTH1_REG1
++ * bit 31:24 pattern 0 length
++ * bit 23:16 pattern 1 length
++ * bit 15:8 pattern 2 length
++ * bit 7:0 pattern 3 length
++ *
++ * AR_WOW_LENGTH1_REG2
++ * bit 31:24 pattern 4 length
++ * bit 23:16 pattern 5 length
++ * bit 15:8 pattern 6 length
++ * bit 7:0 pattern 7 length
++ *
++ * the below logic writes out the new
++ * pattern length for the corresponding
++ * pattern_count, while masking out the
++ * other fields
++ */
++
++ ah->wow_event_mask |= BIT(pattern_count + AR_WOW_PAT_FOUND_SHIFT);
++
++ if (pattern_count < 4) {
++ /* Pattern 0-3 uses AR_WOW_LENGTH1 register */
++ set = (pattern_len & AR_WOW_LENGTH_MAX) <<
++ AR_WOW_LEN1_SHIFT(pattern_count);
++ clr = AR_WOW_LENGTH1_MASK(pattern_count);
++ REG_RMW(ah, AR_WOW_LENGTH1, set, clr);
++ } else {
++ /* Pattern 4-7 uses AR_WOW_LENGTH2 register */
++ set = (pattern_len & AR_WOW_LENGTH_MAX) <<
++ AR_WOW_LEN2_SHIFT(pattern_count);
++ clr = AR_WOW_LENGTH2_MASK(pattern_count);
++ REG_RMW(ah, AR_WOW_LENGTH2, set, clr);
+ }
+
-+ return false;
+}
++EXPORT_SYMBOL(ath9k_hw_wow_apply_pattern);
+
-+/*
-+ * 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_softc *sc,
-+ struct sk_buff *skb,
-+ struct ath_rx_status *rx_stats,
-+ struct ieee80211_rx_status *rx_status,
-+ bool *decrypt_error, u64 tsf)
++u32 ath9k_hw_wow_wakeup(struct ath_hw *ah)
+{
-+ struct ieee80211_hw *hw = sc->hw;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ struct ieee80211_hdr *hdr;
-+ bool discard_current = sc->rx.discard_next;
-+ int ret = 0;
++ u32 wow_status = 0;
++ u32 val = 0, rval;
+
+ /*
-+ * Discard corrupt descriptors which are marked in
-+ * ath_get_next_rx_buf().
++ * read the WoW status register to know
++ * the wakeup reason
+ */
-+ sc->rx.discard_next = rx_stats->rs_more;
-+ if (discard_current)
-+ return -EINVAL;
++ rval = REG_READ(ah, AR_WOW_PATTERN);
++ val = AR_WOW_STATUS(rval);
+
+ /*
-+ * Discard zero-length packets.
++ * mask only the WoW events that we have enabled. Sometimes
++ * we have spurious WoW events from the AR_WOW_PATTERN
++ * register. This mask will clean it up.
+ */
-+ if (!rx_stats->rs_datalen) {
-+ RX_STAT_INC(rx_len_err);
-+ return -EINVAL;
-+ }
+
-+ /*
-+ * 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 - ah->caps.rx_status_len)) {
-+ RX_STAT_INC(rx_len_err);
-+ return -EINVAL;
++ val &= ah->wow_event_mask;
++
++ if (val) {
++ if (val & AR_WOW_MAGIC_PAT_FOUND)
++ wow_status |= AH_WOW_MAGIC_PATTERN_EN;
++ if (AR_WOW_PATTERN_FOUND(val))
++ wow_status |= AH_WOW_USER_PATTERN_EN;
++ if (val & AR_WOW_KEEP_ALIVE_FAIL)
++ wow_status |= AH_WOW_LINK_CHANGE;
++ if (val & AR_WOW_BEACON_FAIL)
++ wow_status |= AH_WOW_BEACON_MISS;
+ }
+
-+ /* Only use status info from the last fragment */
-+ if (rx_stats->rs_more)
-+ return 0;
-+
+ /*
-+ * Return immediately if the RX descriptor has been marked
-+ * as corrupt based on the various error bits.
-+ *
-+ * This is different from the other corrupt descriptor
-+ * condition handled above.
++ * set and clear WOW_PME_CLEAR registers for the chip to
++ * generate next wow signal.
++ * disable D3 before accessing other registers ?
+ */
-+ if (rx_stats->rs_status & ATH9K_RXERR_CORRUPT_DESC) {
-+ ret = -EINVAL;
-+ goto exit;
-+ }
-+
-+ hdr = (struct ieee80211_hdr *) (skb->data + ah->caps.rx_status_len);
+
-+ ath9k_process_tsf(rx_stats, rx_status, tsf);
-+ ath_debug_stat_rx(sc, rx_stats);
++ /* do we need to check the bit value 0x01000000 (7-10) ?? */
++ REG_RMW(ah, AR_PCIE_PM_CTRL, AR_PMCTRL_WOW_PME_CLR,
++ AR_PMCTRL_PWR_STATE_D1D3);
+
+ /*
-+ * Process PHY errors and return so that the packet
-+ * can be dropped.
++ * clear all events
+ */
-+ if (rx_stats->rs_status & ATH9K_RXERR_PHY) {
-+ ath9k_dfs_process_phyerr(sc, hdr, rx_stats, rx_status->mactime);
-+ if (ath_process_fft(sc, hdr, rx_stats, rx_status->mactime))
-+ RX_STAT_INC(rx_spectral);
-+
-+ ret = -EINVAL;
-+ goto exit;
-+ }
++ REG_WRITE(ah, AR_WOW_PATTERN,
++ AR_WOW_CLEAR_EVENTS(REG_READ(ah, AR_WOW_PATTERN)));
+
+ /*
-+ * everything but the rate is checked here, the rate check is done
-+ * separately to avoid doing two lookups for a rate for each frame.
++ * restore the beacon threshold to init value
+ */
-+ if (!ath9k_rx_accept(common, hdr, rx_status, rx_stats, decrypt_error)) {
-+ ret = -EINVAL;
-+ goto exit;
-+ }
-+
-+ rx_stats->is_mybeacon = ath9k_is_mybeacon(sc, hdr);
-+ if (rx_stats->is_mybeacon) {
-+ sc->hw_busy_count = 0;
-+ ath_start_rx_poll(sc, 3);
-+ }
-+
-+ if (ath9k_process_rate(common, hw, rx_stats, rx_status)) {
-+ ret =-EINVAL;
-+ goto exit;
-+ }
-+
-+ ath9k_process_rssi(common, hw, rx_stats, rx_status);
++ REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);
+
-+ rx_status->band = hw->conf.chandef.chan->band;
-+ rx_status->freq = hw->conf.chandef.chan->center_freq;
-+ rx_status->antenna = rx_stats->rs_antenna;
-+ rx_status->flag |= RX_FLAG_MACTIME_END;
++ /*
++ * Restore the way the PCI-E reset, Power-On-Reset, external
++ * PCIE_POR_SHORT pins are tied to its original value.
++ * Previously just before WoW sleep, we untie the PCI-E
++ * reset to our Chip's Power On Reset so that any PCI-E
++ * reset from the bus will not reset our chip
++ */
++ if (ah->is_pciexpress)
++ ath9k_hw_configpcipowersave(ah, false);
+
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-+ if (ieee80211_is_data_present(hdr->frame_control) &&
-+ !ieee80211_is_qos_nullfunc(hdr->frame_control))
-+ sc->rx.num_pkts++;
-+#endif
++ ah->wow_event_mask = 0;
+
-+exit:
-+ sc->rx.discard_next = false;
-+ return ret;
++ return wow_status;
+}
++EXPORT_SYMBOL(ath9k_hw_wow_wakeup);
+
-+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)
++void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)
+{
-+ 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 = ieee80211_hdrlen(fc);
-+
-+ /* 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;
++ u32 wow_event_mask;
++ u32 set, clr;
+
-+ 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;
++ /*
++ * wow_event_mask is a mask to the AR_WOW_PATTERN register to
++ * indicate which WoW events we have enabled. The WoW events
++ * are from the 'pattern_enable' in this function and
++ * 'pattern_count' of ath9k_hw_wow_apply_pattern()
++ */
++ wow_event_mask = ah->wow_event_mask;
+
-+ if (test_bit(keyix, common->keymap))
-+ rxs->flag |= RX_FLAG_DECRYPTED;
++ /*
++ * Untie Power-on-Reset from the PCI-E-Reset. When we are in
++ * WOW sleep, we do want the Reset from the PCI-E to disturb
++ * our hw state
++ */
++ if (ah->is_pciexpress) {
++ /*
++ * we need to untie the internal POR (power-on-reset)
++ * to the external PCI-E reset. We also need to tie
++ * the PCI-E Phy reset to the PCI-E reset.
++ */
++ set = AR_WA_RESET_EN | AR_WA_POR_SHORT;
++ clr = AR_WA_UNTIE_RESET_EN | AR_WA_D3_L1_DISABLE;
++ REG_RMW(ah, AR_WA, set, clr);
+ }
-+ 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;
-+}
+
-+/*
-+ * Run the LNA combining algorithm only in these cases:
-+ *
-+ * Standalone WLAN cards with both LNA/Antenna diversity
-+ * enabled in the EEPROM.
-+ *
-+ * WLAN+BT cards which are in the supported card list
-+ * in ath_pci_id_table and the user has loaded the
-+ * driver with "bt_ant_diversity" set to true.
-+ */
-+static void ath9k_antenna_check(struct ath_softc *sc,
-+ struct ath_rx_status *rs)
-+{
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath9k_hw_capabilities *pCap = &ah->caps;
-+ struct ath_common *common = ath9k_hw_common(ah);
++ /*
++ * set the power states appropriately and enable PME
++ */
++ set = AR_PMCTRL_HOST_PME_EN | AR_PMCTRL_PWR_PM_CTRL_ENA |
++ AR_PMCTRL_AUX_PWR_DET | AR_PMCTRL_WOW_PME_CLR;
+
-+ if (!(ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB))
-+ return;
++ /*
++ * set and clear WOW_PME_CLEAR registers for the chip
++ * to generate next wow signal.
++ */
++ REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
++ clr = AR_PMCTRL_WOW_PME_CLR;
++ REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
+
+ /*
-+ * All MPDUs in an aggregate will use the same LNA
-+ * as the first MPDU.
++ * Setup for:
++ * - beacon misses
++ * - magic pattern
++ * - keep alive timeout
++ * - pattern matching
+ */
-+ if (rs->rs_isaggr && !rs->rs_firstaggr)
-+ return;
+
+ /*
-+ * Change the default rx antenna if rx diversity
-+ * chooses the other antenna 3 times in a row.
++ * Program default values for pattern backoff, aifs/slot/KAL count,
++ * beacon miss timeout, KAL timeout, etc.
+ */
-+ if (sc->rx.defant != rs->rs_antenna) {
-+ if (++sc->rx.rxotherant >= 3)
-+ ath_setdefantenna(sc, rs->rs_antenna);
-+ } else {
-+ sc->rx.rxotherant = 0;
-+ }
++ set = AR_WOW_BACK_OFF_SHIFT(AR_WOW_PAT_BACKOFF);
++ REG_SET_BIT(ah, AR_WOW_PATTERN, set);
+
-+ if (pCap->hw_caps & ATH9K_HW_CAP_BT_ANT_DIV) {
-+ if (common->bt_ant_diversity)
-+ ath_ant_comb_scan(sc, rs);
-+ } else {
-+ ath_ant_comb_scan(sc, rs);
-+ }
-+}
++ set = AR_WOW_AIFS_CNT(AR_WOW_CNT_AIFS_CNT) |
++ AR_WOW_SLOT_CNT(AR_WOW_CNT_SLOT_CNT) |
++ AR_WOW_KEEP_ALIVE_CNT(AR_WOW_CNT_KA_CNT);
++ REG_SET_BIT(ah, AR_WOW_COUNT, set);
+
- static void ath9k_apply_ampdu_details(struct ath_softc *sc,
- struct ath_rx_status *rs, struct ieee80211_rx_status *rxs)
- {
-@@ -1153,21 +1304,18 @@ static void ath9k_apply_ampdu_details(st
-
- int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
- {
-- struct ath_buf *bf;
-+ struct ath_rxbuf *bf;
- struct sk_buff *skb = NULL, *requeue_skb, *hdr_skb;
- struct ieee80211_rx_status *rxs;
- struct ath_hw *ah = sc->sc_ah;
- struct ath_common *common = ath9k_hw_common(ah);
- struct ieee80211_hw *hw = sc->hw;
-- struct ieee80211_hdr *hdr;
- int retval;
- struct ath_rx_status rs;
- 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;
- u64 tsf = 0;
-- u32 tsf_lower = 0;
- unsigned long flags;
- dma_addr_t new_buf_addr;
-
-@@ -1179,7 +1327,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
- qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
-
- tsf = ath9k_hw_gettsf64(ah);
-- tsf_lower = tsf & 0xffffffff;
-
- do {
- bool decrypt_error = false;
-@@ -1206,55 +1353,14 @@ int ath_rx_tasklet(struct ath_softc *sc,
- else
- hdr_skb = skb;
-
-- hdr = (struct ieee80211_hdr *) (hdr_skb->data + rx_status_len);
- rxs = IEEE80211_SKB_RXCB(hdr_skb);
-- if (ieee80211_is_beacon(hdr->frame_control)) {
-- RX_STAT_INC(rx_beacons);
-- if (!is_zero_ether_addr(common->curbssid) &&
-- ether_addr_equal(hdr->addr3, common->curbssid))
-- rs.is_mybeacon = true;
-- else
-- rs.is_mybeacon = false;
-- }
-- else
-- rs.is_mybeacon = false;
--
-- if (ieee80211_is_data_present(hdr->frame_control) &&
-- !ieee80211_is_qos_nullfunc(hdr->frame_control))
-- sc->rx.num_pkts++;
--
-- ath_debug_stat_rx(sc, &rs);
--
- memset(rxs, 0, sizeof(struct ieee80211_rx_status));
-
-- rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
-- if (rs.rs_tstamp > tsf_lower &&
-- unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
-- rxs->mactime -= 0x100000000ULL;
--
-- if (rs.rs_tstamp < tsf_lower &&
-- unlikely(tsf_lower - rs.rs_tstamp > 0x10000000))
-- rxs->mactime += 0x100000000ULL;
--
-- if (rs.rs_phyerr == ATH9K_PHYERR_RADAR)
-- ath9k_dfs_process_phyerr(sc, hdr, &rs, rxs->mactime);
--
-- if (rs.rs_status & ATH9K_RXERR_PHY) {
-- if (ath_process_fft(sc, hdr, &rs, rxs->mactime)) {
-- RX_STAT_INC(rx_spectral);
-- goto requeue_drop_frag;
-- }
-- }
--
-- retval = ath9k_rx_skb_preprocess(sc, hdr, &rs, rxs,
-- &decrypt_error);
-+ retval = ath9k_rx_skb_preprocess(sc, hdr_skb, &rs, rxs,
-+ &decrypt_error, tsf);
- if (retval)
- goto requeue_drop_frag;
-
-- if (rs.is_mybeacon) {
-- sc->hw_busy_count = 0;
-- ath_start_rx_poll(sc, 3);
-- }
- /* Ensure we always have an skb to requeue once we are done
- * processing the current buffer's skb */
- requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC);
-@@ -1308,8 +1414,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
- sc->rx.frag = skb;
- goto requeue;
- }
-- if (rs.rs_status & ATH9K_RXERR_CORRUPT_DESC)
-- goto requeue_drop_frag;
-
- if (sc->rx.frag) {
- int space = skb->len - skb_tailroom(hdr_skb);
-@@ -1328,22 +1432,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
- skb = hdr_skb;
- }
-
--
-- if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) {
--
-- /*
-- * change the default rx antenna if rx diversity
-- * chooses the other antenna 3 times in a row.
-- */
-- if (sc->rx.defant != rs.rs_antenna) {
-- if (++sc->rx.rxotherant >= 3)
-- ath_setdefantenna(sc, rs.rs_antenna);
-- } else {
-- sc->rx.rxotherant = 0;
-- }
--
-- }
--
- if (rxs->flag & RX_FLAG_MMIC_STRIPPED)
- skb_trim(skb, skb->len - 8);
-
-@@ -1355,8 +1443,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
- ath_rx_ps(sc, skb, rs.is_mybeacon);
- spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
-
-- if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx == 3)
-- ath_ant_comb_scan(sc, &rs);
-+ ath9k_antenna_check(sc, &rs);
-
- ath9k_apply_ampdu_details(sc, &rs, rxs);
-
-@@ -1375,7 +1462,7 @@ requeue:
- if (edma) {
- ath_rx_edma_buf_link(sc, qtype);
- } else {
-- ath_rx_buf_link(sc, bf);
-+ ath_rx_buf_relink(sc, bf);
- ath9k_hw_rxena(ah);
- }
- } while (1);
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -53,9 +53,9 @@ static int ath9k_btcoex_enable;
- module_param_named(btcoex_enable, ath9k_btcoex_enable, int, 0444);
- MODULE_PARM_DESC(btcoex_enable, "Enable wifi-BT coexistence");
-
--static int ath9k_enable_diversity;
--module_param_named(enable_diversity, ath9k_enable_diversity, int, 0444);
--MODULE_PARM_DESC(enable_diversity, "Enable Antenna diversity for AR9565");
-+static int ath9k_bt_ant_diversity;
-+module_param_named(bt_ant_diversity, ath9k_bt_ant_diversity, int, 0444);
-+MODULE_PARM_DESC(bt_ant_diversity, "Enable WLAN/BT RX antenna diversity");
-
- bool is_ath9k_unloaded;
- /* We use the hw_value as an index into our private channel structure */
-@@ -339,7 +339,6 @@ int ath_descdma_setup(struct ath_softc *
- {
- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- u8 *ds;
-- struct ath_buf *bf;
- int i, bsize, desc_len;
-
- ath_dbg(common, CONFIG, "%s DMA: %u buffers %u desc/buf\n",
-@@ -391,33 +390,68 @@ int ath_descdma_setup(struct ath_softc *
- ito64(dd->dd_desc_paddr), /*XXX*/(u32) dd->dd_desc_len);
-
- /* allocate buffers */
-- bsize = sizeof(struct ath_buf) * nbuf;
-- bf = devm_kzalloc(sc->dev, bsize, GFP_KERNEL);
-- if (!bf)
-- return -ENOMEM;
-+ if (is_tx) {
-+ struct ath_buf *bf;
-+
-+ bsize = sizeof(struct ath_buf) * nbuf;
-+ bf = devm_kzalloc(sc->dev, bsize, GFP_KERNEL);
-+ if (!bf)
-+ return -ENOMEM;
-+
-+ for (i = 0; i < nbuf; i++, bf++, ds += (desc_len * ndesc)) {
-+ bf->bf_desc = ds;
-+ bf->bf_daddr = DS2PHYS(dd, ds);
-+
-+ if (!(sc->sc_ah->caps.hw_caps &
-+ ATH9K_HW_CAP_4KB_SPLITTRANS)) {
-+ /*
-+ * Skip descriptor addresses which can cause 4KB
-+ * boundary crossing (addr + length) with a 32 dword
-+ * descriptor fetch.
-+ */
-+ while (ATH_DESC_4KB_BOUND_CHECK(bf->bf_daddr)) {
-+ BUG_ON((caddr_t) bf->bf_desc >=
-+ ((caddr_t) dd->dd_desc +
-+ dd->dd_desc_len));
-+
-+ ds += (desc_len * ndesc);
-+ bf->bf_desc = ds;
-+ bf->bf_daddr = DS2PHYS(dd, ds);
-+ }
-+ }
-+ list_add_tail(&bf->list, head);
-+ }
-+ } else {
-+ struct ath_rxbuf *bf;
-
-- for (i = 0; i < nbuf; i++, bf++, ds += (desc_len * ndesc)) {
-- bf->bf_desc = ds;
-- bf->bf_daddr = DS2PHYS(dd, ds);
--
-- if (!(sc->sc_ah->caps.hw_caps &
-- ATH9K_HW_CAP_4KB_SPLITTRANS)) {
-- /*
-- * Skip descriptor addresses which can cause 4KB
-- * boundary crossing (addr + length) with a 32 dword
-- * descriptor fetch.
-- */
-- while (ATH_DESC_4KB_BOUND_CHECK(bf->bf_daddr)) {
-- BUG_ON((caddr_t) bf->bf_desc >=
-- ((caddr_t) dd->dd_desc +
-- dd->dd_desc_len));
--
-- ds += (desc_len * ndesc);
-- bf->bf_desc = ds;
-- bf->bf_daddr = DS2PHYS(dd, ds);
-+ bsize = sizeof(struct ath_rxbuf) * nbuf;
-+ bf = devm_kzalloc(sc->dev, bsize, GFP_KERNEL);
-+ if (!bf)
-+ return -ENOMEM;
-+
-+ for (i = 0; i < nbuf; i++, bf++, ds += (desc_len * ndesc)) {
-+ bf->bf_desc = ds;
-+ bf->bf_daddr = DS2PHYS(dd, ds);
-+
-+ if (!(sc->sc_ah->caps.hw_caps &
-+ ATH9K_HW_CAP_4KB_SPLITTRANS)) {
-+ /*
-+ * Skip descriptor addresses which can cause 4KB
-+ * boundary crossing (addr + length) with a 32 dword
-+ * descriptor fetch.
-+ */
-+ while (ATH_DESC_4KB_BOUND_CHECK(bf->bf_daddr)) {
-+ BUG_ON((caddr_t) bf->bf_desc >=
-+ ((caddr_t) dd->dd_desc +
-+ dd->dd_desc_len));
-+
-+ ds += (desc_len * ndesc);
-+ bf->bf_desc = ds;
-+ bf->bf_daddr = DS2PHYS(dd, ds);
-+ }
- }
-+ list_add_tail(&bf->list, head);
- }
-- list_add_tail(&bf->list, head);
- }
- return 0;
- }
-@@ -429,7 +463,6 @@ static int ath9k_init_queues(struct ath_
- sc->beacon.beaconq = ath9k_hw_beaconq_setup(sc->sc_ah);
- sc->beacon.cabq = ath_txq_setup(sc, ATH9K_TX_QUEUE_CAB, 0);
-
-- sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
- ath_cabq_update(sc);
-
- sc->tx.uapsdq = ath_txq_setup(sc, ATH9K_TX_QUEUE_UAPSD, 0);
-@@ -516,6 +549,7 @@ static void ath9k_init_misc(struct ath_s
- static void ath9k_init_platform(struct ath_softc *sc)
- {
- struct ath_hw *ah = sc->sc_ah;
-+ struct ath9k_hw_capabilities *pCap = &ah->caps;
- struct ath_common *common = ath9k_hw_common(ah);
-
- if (common->bus_ops->ath_bus_type != ATH_PCI)
-@@ -525,12 +559,27 @@ static void ath9k_init_platform(struct a
- ATH9K_PCI_CUS230)) {
- ah->config.xlna_gpio = 9;
- ah->config.xatten_margin_cfg = true;
-+ ah->config.alt_mingainidx = true;
-+ ah->config.ant_ctrl_comm2g_switch_enable = 0x000BBB88;
-+ sc->ant_comb.low_rssi_thresh = 20;
-+ sc->ant_comb.fast_div_bias = 3;
-
- ath_info(common, "Set parameters for %s\n",
- (sc->driver_data & ATH9K_PCI_CUS198) ?
- "CUS198" : "CUS230");
-- } else if (sc->driver_data & ATH9K_PCI_CUS217) {
-+ }
++ if (pattern_enable & AH_WOW_BEACON_MISS)
++ set = AR_WOW_BEACON_TIMO;
++ /* We are not using beacon miss, program a large value */
++ else
++ set = AR_WOW_BEACON_TIMO_MAX;
+
-+ if (sc->driver_data & ATH9K_PCI_CUS217)
- ath_info(common, "CUS217 card detected\n");
++ REG_WRITE(ah, AR_WOW_BCN_TIMO, set);
+
-+ if (sc->driver_data & ATH9K_PCI_BT_ANT_DIV) {
-+ pCap->hw_caps |= ATH9K_HW_CAP_BT_ANT_DIV;
-+ ath_info(common, "Set BT/WLAN RX diversity capability\n");
-+ }
++ /*
++ * Keep alive timo in ms except AR9280
++ */
++ if (!pattern_enable)
++ set = AR_WOW_KEEP_ALIVE_NEVER;
++ else
++ set = KAL_TIMEOUT * 32;
+
-+ if (sc->driver_data & ATH9K_PCI_D3_L1_WAR) {
-+ ah->config.pcie_waen = 0x0040473b;
-+ ath_info(common, "Enable WAR for ASPM D3/L1\n");
- }
- }
-
-@@ -584,6 +633,7 @@ static int ath9k_init_softc(u16 devid, s
- {
- struct ath9k_platform_data *pdata = sc->dev->platform_data;
- struct ath_hw *ah = NULL;
-+ struct ath9k_hw_capabilities *pCap;
- struct ath_common *common;
- int ret = 0, i;
- int csz = 0;
-@@ -600,8 +650,10 @@ static int ath9k_init_softc(u16 devid, s
- ah->reg_ops.rmw = ath9k_reg_rmw;
- atomic_set(&ah->intr_ref_cnt, -1);
- sc->sc_ah = ah;
-+ pCap = &ah->caps;
-
- sc->dfs_detector = dfs_pattern_detector_init(ah, NL80211_DFS_UNSET);
-+ init_waitqueue_head(&sc->tx_wait);
-
- if (!pdata) {
- ah->ah_flags |= AH_USE_EEPROM;
-@@ -631,11 +683,15 @@ static int ath9k_init_softc(u16 devid, s
- ath9k_init_platform(sc);
-
- /*
-- * Enable Antenna diversity only when BTCOEX is disabled
-- * and the user manually requests the feature.
-+ * Enable WLAN/BT RX Antenna diversity only when:
-+ *
-+ * - BTCOEX is disabled.
-+ * - the user manually requests the feature.
-+ * - the HW cap is set using the platform data.
- */
-- if (!common->btcoex_enabled && ath9k_enable_diversity)
-- common->antenna_diversity = 1;
-+ if (!common->btcoex_enabled && ath9k_bt_ant_diversity &&
-+ (pCap->hw_caps & ATH9K_HW_CAP_BT_ANT_DIV))
-+ common->bt_ant_diversity = 1;
-
- spin_lock_init(&common->cc_lock);
-
-@@ -646,6 +702,7 @@ static int ath9k_init_softc(u16 devid, s
- tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
- (unsigned long)sc);
-
-+ setup_timer(&sc->sleep_timer, ath_ps_full_sleep, (unsigned long)sc);
- INIT_WORK(&sc->hw_reset_work, ath_reset_work);
- INIT_WORK(&sc->hw_check_work, ath_hw_check);
- INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
-@@ -710,13 +767,15 @@ static void ath9k_init_band_txpower(stru
- struct ieee80211_supported_band *sband;
- struct ieee80211_channel *chan;
- struct ath_hw *ah = sc->sc_ah;
-+ struct cfg80211_chan_def chandef;
- int i;
-
- sband = &sc->sbands[band];
- for (i = 0; i < sband->n_channels; i++) {
- chan = &sband->channels[i];
- ah->curchan = &ah->channels[chan->hw_value];
-- ath9k_cmn_update_ichannel(ah->curchan, chan, NL80211_CHAN_HT20);
-+ cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_HT20);
-+ ath9k_cmn_get_channel(sc->hw, ah, &chandef);
- ath9k_hw_set_txpowerlimit(ah, MAX_RATE_POWER, true);
- }
- }
-@@ -802,7 +861,8 @@ void ath9k_set_hw_capab(struct ath_softc
- IEEE80211_HW_PS_NULLFUNC_STACK |
- IEEE80211_HW_SPECTRUM_MGMT |
- IEEE80211_HW_REPORTS_TX_ACK_STATUS |
-- IEEE80211_HW_SUPPORTS_RC_TABLE;
-+ IEEE80211_HW_SUPPORTS_RC_TABLE |
-+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
-
- if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
- hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
-@@ -968,6 +1028,7 @@ static void ath9k_deinit_softc(struct at
- if (ATH_TXQ_SETUP(sc, i))
- ath_tx_cleanupq(sc, &sc->tx.txq[i]);
-
-+ del_timer_sync(&sc->sleep_timer);
- ath9k_hw_deinit(sc->sc_ah);
- if (sc->dfs_detector != NULL)
- sc->dfs_detector->exit(sc->dfs_detector);
---- a/drivers/net/wireless/ath/carl9170/main.c
-+++ b/drivers/net/wireless/ath/carl9170/main.c
-@@ -1878,7 +1878,8 @@ void *carl9170_alloc(size_t priv_size)
- IEEE80211_HW_PS_NULLFUNC_STACK |
- IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |
- IEEE80211_HW_SUPPORTS_RC_TABLE |
-- IEEE80211_HW_SIGNAL_DBM;
-+ IEEE80211_HW_SIGNAL_DBM |
-+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
-
- if (!modparam_noht) {
- /*
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -6133,7 +6133,8 @@ static int rt2800_probe_hw_mode(struct r
- IEEE80211_HW_SUPPORTS_PS |
- IEEE80211_HW_PS_NULLFUNC_STACK |
- IEEE80211_HW_AMPDU_AGGREGATION |
-- IEEE80211_HW_REPORTS_TX_ACK_STATUS;
-+ IEEE80211_HW_REPORTS_TX_ACK_STATUS |
-+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
-
- /*
- * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -152,11 +152,14 @@ struct ieee80211_low_level_stats {
- * @IEEE80211_CHANCTX_CHANGE_WIDTH: The channel width changed
- * @IEEE80211_CHANCTX_CHANGE_RX_CHAINS: The number of RX chains changed
- * @IEEE80211_CHANCTX_CHANGE_RADAR: radar detection flag changed
-+ * @IEEE80211_CHANCTX_CHANGE_CHANNEL: switched to another operating channel,
-+ * this is used only with channel switching with CSA
- */
- enum ieee80211_chanctx_change {
- IEEE80211_CHANCTX_CHANGE_WIDTH = BIT(0),
- IEEE80211_CHANCTX_CHANGE_RX_CHAINS = BIT(1),
- IEEE80211_CHANCTX_CHANGE_RADAR = BIT(2),
-+ IEEE80211_CHANCTX_CHANGE_CHANNEL = BIT(3),
- };
-
- /**
-@@ -1080,6 +1083,7 @@ enum ieee80211_vif_flags {
- * @addr: address of this interface
- * @p2p: indicates whether this AP or STA interface is a p2p
- * interface, i.e. a GO or p2p-sta respectively
-+ * @csa_active: marks whether a channel switch is going on
- * @driver_flags: flags/capabilities the driver has for this interface,
- * these need to be set (or cleared) when the interface is added
- * or, if supported by the driver, the interface type is changed
-@@ -1102,6 +1106,7 @@ struct ieee80211_vif {
- struct ieee80211_bss_conf bss_conf;
- u8 addr[ETH_ALEN];
- bool p2p;
-+ bool csa_active;
-
- u8 cab_queue;
- u8 hw_queue[IEEE80211_NUM_ACS];
-@@ -1499,6 +1504,7 @@ enum ieee80211_hw_flags {
- IEEE80211_HW_SUPPORTS_RC_TABLE = 1<<24,
- IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25,
- IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26,
-+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 1<<27,
- };
-
- /**
-@@ -2633,6 +2639,16 @@ enum ieee80211_roc_type {
- * @ipv6_addr_change: IPv6 address assignment on the given interface changed.
- * Currently, this is only called for managed or P2P client interfaces.
- * This callback is optional; it must not sleep.
-+ *
-+ * @channel_switch_beacon: Starts a channel switch to a new channel.
-+ * Beacons are modified to include CSA or ECSA IEs before calling this
-+ * function. The corresponding count fields in these IEs must be
-+ * decremented, and when they reach zero the driver must call
-+ * ieee80211_csa_finish(). Drivers which use ieee80211_beacon_get()
-+ * get the csa counter decremented by mac80211, but must check if it is
-+ * zero using ieee80211_csa_is_complete() after the beacon has been
-+ * transmitted and then call ieee80211_csa_finish().
-+ *
- */
- struct ieee80211_ops {
- void (*tx)(struct ieee80211_hw *hw,
-@@ -2830,6 +2846,9 @@ struct ieee80211_ops {
- struct ieee80211_vif *vif,
- struct inet6_dev *idev);
- #endif
-+ void (*channel_switch_beacon)(struct ieee80211_hw *hw,
-+ struct ieee80211_vif *vif,
-+ struct cfg80211_chan_def *chandef);
- };
-
- /**
-@@ -3325,6 +3344,25 @@ static inline struct sk_buff *ieee80211_
- }
-
- /**
-+ * ieee80211_csa_finish - notify mac80211 about channel switch
-+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
-+ *
-+ * After a channel switch announcement was scheduled and the counter in this
-+ * announcement hit zero, this function must be called by the driver to
-+ * notify mac80211 that the channel can be changed.
-+ */
-+void ieee80211_csa_finish(struct ieee80211_vif *vif);
++ REG_WRITE(ah, AR_WOW_KEEP_ALIVE_TIMO, set);
+
-+/**
-+ * ieee80211_csa_is_complete - find out if counters reached zero
-+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
-+ *
-+ * This function returns whether the channel switch counters reached zero.
-+ */
-+bool ieee80211_csa_is_complete(struct ieee80211_vif *vif);
++ /*
++ * Keep alive delay in us. based on 'power on clock',
++ * therefore in usec
++ */
++ set = KAL_DELAY * 1000;
++ REG_WRITE(ah, AR_WOW_KEEP_ALIVE_DELAY, set);
+
++ /*
++ * Create keep alive pattern to respond to beacons
++ */
++ ath9k_wow_create_keep_alive_pattern(ah);
+
-+/**
- * ieee80211_proberesp_get - retrieve a Probe Response template
- * @hw: pointer obtained from ieee80211_alloc_hw().
- * @vif: &struct ieee80211_vif pointer from the add_interface callback.
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -854,8 +854,8 @@ static int ieee80211_set_probe_resp(stru
- return 0;
- }
-
--static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
-- struct cfg80211_beacon_data *params)
-+int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
-+ struct cfg80211_beacon_data *params)
- {
- struct beacon_data *new, *old;
- int new_head_len, new_tail_len;
-@@ -1018,6 +1018,12 @@ static int ieee80211_change_beacon(struc
-
- sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-
-+ /* don't allow changing the beacon while CSA is in place - offset
-+ * of channel switch counter may change
++ /*
++ * Configure MAC WoW Registers
+ */
-+ if (sdata->vif.csa_active)
-+ return -EBUSY;
-+
- old = rtnl_dereference(sdata->u.ap.beacon);
- if (!old)
- return -ENOENT;
-@@ -1042,6 +1048,10 @@ static int ieee80211_stop_ap(struct wiph
- return -ENOENT;
- old_probe_resp = rtnl_dereference(sdata->u.ap.probe_resp);
-
-+ /* abort any running channel switch */
-+ sdata->vif.csa_active = false;
-+ cancel_work_sync(&sdata->csa_finalize_work);
-+
- /* turn off carrier for this interface and dependent VLANs */
- list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
- netif_carrier_off(vlan->dev);
-@@ -2784,6 +2794,178 @@ static int ieee80211_start_radar_detecti
- return 0;
- }
-
-+static struct cfg80211_beacon_data *
-+cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon)
-+{
-+ struct cfg80211_beacon_data *new_beacon;
-+ u8 *pos;
-+ int len;
++ set = 0;
++ /* Send keep alive timeouts anyway */
++ clr = AR_WOW_KEEP_ALIVE_AUTO_DIS;
+
-+ len = beacon->head_len + beacon->tail_len + beacon->beacon_ies_len +
-+ beacon->proberesp_ies_len + beacon->assocresp_ies_len +
-+ beacon->probe_resp_len;
++ if (pattern_enable & AH_WOW_LINK_CHANGE)
++ wow_event_mask |= AR_WOW_KEEP_ALIVE_FAIL;
++ else
++ set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
+
-+ new_beacon = kzalloc(sizeof(*new_beacon) + len, GFP_KERNEL);
-+ if (!new_beacon)
-+ return NULL;
++ set = AR_WOW_KEEP_ALIVE_FAIL_DIS;
++ REG_RMW(ah, AR_WOW_KEEP_ALIVE, set, clr);
+
-+ pos = (u8 *)(new_beacon + 1);
-+ if (beacon->head_len) {
-+ new_beacon->head_len = beacon->head_len;
-+ new_beacon->head = pos;
-+ memcpy(pos, beacon->head, beacon->head_len);
-+ pos += beacon->head_len;
-+ }
-+ if (beacon->tail_len) {
-+ new_beacon->tail_len = beacon->tail_len;
-+ new_beacon->tail = pos;
-+ memcpy(pos, beacon->tail, beacon->tail_len);
-+ pos += beacon->tail_len;
-+ }
-+ if (beacon->beacon_ies_len) {
-+ new_beacon->beacon_ies_len = beacon->beacon_ies_len;
-+ new_beacon->beacon_ies = pos;
-+ memcpy(pos, beacon->beacon_ies, beacon->beacon_ies_len);
-+ pos += beacon->beacon_ies_len;
-+ }
-+ if (beacon->proberesp_ies_len) {
-+ new_beacon->proberesp_ies_len = beacon->proberesp_ies_len;
-+ new_beacon->proberesp_ies = pos;
-+ memcpy(pos, beacon->proberesp_ies, beacon->proberesp_ies_len);
-+ pos += beacon->proberesp_ies_len;
-+ }
-+ if (beacon->assocresp_ies_len) {
-+ new_beacon->assocresp_ies_len = beacon->assocresp_ies_len;
-+ new_beacon->assocresp_ies = pos;
-+ memcpy(pos, beacon->assocresp_ies, beacon->assocresp_ies_len);
-+ pos += beacon->assocresp_ies_len;
-+ }
-+ if (beacon->probe_resp_len) {
-+ new_beacon->probe_resp_len = beacon->probe_resp_len;
-+ beacon->probe_resp = pos;
-+ memcpy(pos, beacon->probe_resp, beacon->probe_resp_len);
-+ pos += beacon->probe_resp_len;
++ /*
++ * we are relying on a bmiss failure. ensure we have
++ * enough threshold to prevent false positives
++ */
++ REG_RMW_FIELD(ah, AR_RSSI_THR, AR_RSSI_THR_BM_THR,
++ AR_WOW_BMISSTHRESHOLD);
++
++ set = 0;
++ clr = 0;
++
++ if (pattern_enable & AH_WOW_BEACON_MISS) {
++ set = AR_WOW_BEACON_FAIL_EN;
++ wow_event_mask |= AR_WOW_BEACON_FAIL;
++ } else {
++ clr = AR_WOW_BEACON_FAIL_EN;
+ }
+
-+ return new_beacon;
-+}
++ REG_RMW(ah, AR_WOW_BCN_EN, set, clr);
+
-+void ieee80211_csa_finalize_work(struct work_struct *work)
-+{
-+ struct ieee80211_sub_if_data *sdata =
-+ container_of(work, struct ieee80211_sub_if_data,
-+ csa_finalize_work);
-+ struct ieee80211_local *local = sdata->local;
-+ int err, changed;
++ set = 0;
++ clr = 0;
++ /*
++ * Enable the magic packet registers
++ */
++ if (pattern_enable & AH_WOW_MAGIC_PATTERN_EN) {
++ set = AR_WOW_MAGIC_EN;
++ wow_event_mask |= AR_WOW_MAGIC_PAT_FOUND;
++ } else {
++ clr = AR_WOW_MAGIC_EN;
++ }
++ set |= AR_WOW_MAC_INTR_EN;
++ REG_RMW(ah, AR_WOW_PATTERN, set, clr);
+
-+ if (!ieee80211_sdata_running(sdata))
-+ return;
++ REG_WRITE(ah, AR_WOW_PATTERN_MATCH_LT_256B,
++ AR_WOW_PATTERN_SUPPORTED);
+
-+ if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_AP))
-+ return;
++ /*
++ * Set the power states appropriately and enable PME
++ */
++ clr = 0;
++ set = AR_PMCTRL_PWR_STATE_D1D3 | AR_PMCTRL_HOST_PME_EN |
++ AR_PMCTRL_PWR_PM_CTRL_ENA;
+
-+ sdata->radar_required = sdata->csa_radar_required;
-+ err = ieee80211_vif_change_channel(sdata, &local->csa_chandef,
-+ &changed);
-+ if (WARN_ON(err < 0))
-+ return;
++ clr = AR_PCIE_PM_CTRL_ENA;
++ REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr);
+
-+ err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon);
-+ if (err < 0)
-+ return;
++ /*
++ * this is needed to prevent the chip waking up
++ * the host within 3-4 seconds with certain
++ * platform/BIOS. The fix is to enable
++ * D1 & D3 to match original definition and
++ * also match the OTP value. Anyway this
++ * is more related to SW WOW.
++ */
++ clr = AR_PMCTRL_PWR_STATE_D1D3;
++ REG_CLR_BIT(ah, AR_PCIE_PM_CTRL, clr);
+
-+ changed |= err;
-+ kfree(sdata->u.ap.next_beacon);
-+ sdata->u.ap.next_beacon = NULL;
-+ sdata->vif.csa_active = false;
++ set = AR_PMCTRL_PWR_STATE_D1D3_REAL;
++ REG_SET_BIT(ah, AR_PCIE_PM_CTRL, set);
+
-+ ieee80211_wake_queues_by_reason(&sdata->local->hw,
-+ IEEE80211_MAX_QUEUE_MAP,
-+ IEEE80211_QUEUE_STOP_REASON_CSA);
++ REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PRESERVE_SEQNUM);
+
-+ ieee80211_bss_info_change_notify(sdata, changed);
++ /* to bring down WOW power low margin */
++ set = BIT(13);
++ REG_SET_BIT(ah, AR_PCIE_PHY_REG3, set);
++ /* HW WoW */
++ clr = BIT(5);
++ REG_CLR_BIT(ah, AR_PCU_MISC_MODE3, clr);
+
-+ cfg80211_ch_switch_notify(sdata->dev, &local->csa_chandef);
++ ath9k_hw_set_powermode_wow_sleep(ah);
++ ah->wow_event_mask = wow_event_mask;
+}
++EXPORT_SYMBOL(ath9k_hw_wow_enable);
+--- /dev/null
++++ b/drivers/net/wireless/ath/ath9k/tx99.c
+@@ -0,0 +1,263 @@
++/*
++ * Copyright (c) 2013 Qualcomm Atheros, 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.
++ */
+
-+static int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
-+ struct cfg80211_csa_settings *params)
++#include "ath9k.h"
++
++static void ath9k_tx99_stop(struct ath_softc *sc)
+{
-+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+ struct ieee80211_local *local = sdata->local;
-+ struct ieee80211_chanctx_conf *chanctx_conf;
-+ struct ieee80211_chanctx *chanctx;
-+ int err, num_chanctx;
++ struct ath_hw *ah = sc->sc_ah;
++ struct ath_common *common = ath9k_hw_common(ah);
+
-+ if (!list_empty(&local->roc_list) || local->scanning)
-+ return -EBUSY;
++ ath_drain_all_txq(sc);
++ ath_startrecv(sc);
+
-+ if (sdata->wdev.cac_started)
-+ return -EBUSY;
++ ath9k_hw_set_interrupts(ah);
++ ath9k_hw_enable_interrupts(ah);
+
-+ if (cfg80211_chandef_identical(¶ms->chandef,
-+ &sdata->vif.bss_conf.chandef))
-+ return -EINVAL;
++ ieee80211_wake_queues(sc->hw);
+
-+ rcu_read_lock();
-+ chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
-+ if (!chanctx_conf) {
-+ rcu_read_unlock();
-+ return -EBUSY;
-+ }
++ kfree_skb(sc->tx99_skb);
++ sc->tx99_skb = NULL;
++ sc->tx99_state = false;
+
-+ /* don't handle for multi-VIF cases */
-+ chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf);
-+ if (chanctx->refcount > 1) {
-+ rcu_read_unlock();
-+ return -EBUSY;
-+ }
-+ num_chanctx = 0;
-+ list_for_each_entry_rcu(chanctx, &local->chanctx_list, list)
-+ num_chanctx++;
-+ rcu_read_unlock();
++ ath9k_hw_tx99_stop(sc->sc_ah);
++ ath_dbg(common, XMIT, "TX99 stopped\n");
++}
+
-+ if (num_chanctx > 1)
-+ return -EBUSY;
++static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)
++{
++ static u8 PN9Data[] = {0xff, 0x87, 0xb8, 0x59, 0xb7, 0xa1, 0xcc, 0x24,
++ 0x57, 0x5e, 0x4b, 0x9c, 0x0e, 0xe9, 0xea, 0x50,
++ 0x2a, 0xbe, 0xb4, 0x1b, 0xb6, 0xb0, 0x5d, 0xf1,
++ 0xe6, 0x9a, 0xe3, 0x45, 0xfd, 0x2c, 0x53, 0x18,
++ 0x0c, 0xca, 0xc9, 0xfb, 0x49, 0x37, 0xe5, 0xa8,
++ 0x51, 0x3b, 0x2f, 0x61, 0xaa, 0x72, 0x18, 0x84,
++ 0x02, 0x23, 0x23, 0xab, 0x63, 0x89, 0x51, 0xb3,
++ 0xe7, 0x8b, 0x72, 0x90, 0x4c, 0xe8, 0xfb, 0xc0};
++ u32 len = 1200;
++ struct ieee80211_hw *hw = sc->hw;
++ struct ieee80211_hdr *hdr;
++ struct ieee80211_tx_info *tx_info;
++ struct sk_buff *skb;
+
-+ /* don't allow another channel switch if one is already active. */
-+ if (sdata->vif.csa_active)
-+ return -EBUSY;
++ skb = alloc_skb(len, GFP_KERNEL);
++ if (!skb)
++ return NULL;
+
-+ /* only handle AP for now. */
-+ switch (sdata->vif.type) {
-+ case NL80211_IFTYPE_AP:
-+ break;
-+ default:
-+ return -EOPNOTSUPP;
-+ }
++ skb_put(skb, len);
+
-+ sdata->u.ap.next_beacon = cfg80211_beacon_dup(¶ms->beacon_after);
-+ if (!sdata->u.ap.next_beacon)
-+ return -ENOMEM;
++ memset(skb->data, 0, len);
+
-+ sdata->csa_counter_offset_beacon = params->counter_offset_beacon;
-+ sdata->csa_counter_offset_presp = params->counter_offset_presp;
-+ sdata->csa_radar_required = params->radar_required;
++ hdr = (struct ieee80211_hdr *)skb->data;
++ hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA);
++ hdr->duration_id = 0;
+
-+ if (params->block_tx)
-+ ieee80211_stop_queues_by_reason(&local->hw,
-+ IEEE80211_MAX_QUEUE_MAP,
-+ IEEE80211_QUEUE_STOP_REASON_CSA);
++ memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
++ memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
++ memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
+
-+ err = ieee80211_assign_beacon(sdata, ¶ms->beacon_csa);
-+ if (err < 0)
-+ return err;
++ hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
+
-+ local->csa_chandef = params->chandef;
-+ sdata->vif.csa_active = true;
++ tx_info = IEEE80211_SKB_CB(skb);
++ memset(tx_info, 0, sizeof(*tx_info));
++ tx_info->band = hw->conf.chandef.chan->band;
++ tx_info->flags = IEEE80211_TX_CTL_NO_ACK;
++ tx_info->control.vif = sc->tx99_vif;
+
-+ ieee80211_bss_info_change_notify(sdata, err);
-+ drv_channel_switch_beacon(sdata, ¶ms->chandef);
++ memcpy(skb->data + sizeof(*hdr), PN9Data, sizeof(PN9Data));
+
-+ return 0;
++ return skb;
+}
+
- static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
- struct ieee80211_channel *chan, bool offchan,
- unsigned int wait, const u8 *buf, size_t len,
-@@ -3332,7 +3514,7 @@ static int ieee80211_probe_client(struct
- return -EINVAL;
- }
- band = chanctx_conf->def.chan->band;
-- sta = sta_info_get(sdata, peer);
-+ sta = sta_info_get_bss(sdata, peer);
- if (sta) {
- qos = test_sta_flag(sta, WLAN_STA_WME);
- } else {
-@@ -3501,4 +3683,5 @@ struct cfg80211_ops mac80211_config_ops
- .get_et_strings = ieee80211_get_et_strings,
- .get_channel = ieee80211_cfg_get_channel,
- .start_radar_detection = ieee80211_start_radar_detection,
-+ .channel_switch = ieee80211_channel_switch,
- };
---- a/net/mac80211/chan.c
-+++ b/net/mac80211/chan.c
-@@ -410,6 +410,64 @@ int ieee80211_vif_use_channel(struct iee
- return ret;
- }
-
-+int ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata,
-+ const struct cfg80211_chan_def *chandef,
-+ u32 *changed)
++static void ath9k_tx99_deinit(struct ath_softc *sc)
+{
-+ struct ieee80211_local *local = sdata->local;
-+ struct ieee80211_chanctx_conf *conf;
-+ struct ieee80211_chanctx *ctx;
-+ int ret;
-+ u32 chanctx_changed = 0;
-+
-+ /* should never be called if not performing a channel switch. */
-+ if (WARN_ON(!sdata->vif.csa_active))
-+ return -EINVAL;
++ ath_reset(sc);
+
-+ if (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef,
-+ IEEE80211_CHAN_DISABLED))
-+ return -EINVAL;
++ ath9k_ps_wakeup(sc);
++ ath9k_tx99_stop(sc);
++ ath9k_ps_restore(sc);
++}
+
-+ mutex_lock(&local->chanctx_mtx);
-+ conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
-+ lockdep_is_held(&local->chanctx_mtx));
-+ if (!conf) {
-+ ret = -EINVAL;
-+ goto out;
-+ }
++static int ath9k_tx99_init(struct ath_softc *sc)
++{
++ struct ieee80211_hw *hw = sc->hw;
++ struct ath_hw *ah = sc->sc_ah;
++ struct ath_common *common = ath9k_hw_common(ah);
++ struct ath_tx_control txctl;
++ int r;
+
-+ ctx = container_of(conf, struct ieee80211_chanctx, conf);
-+ if (ctx->refcount != 1) {
-+ ret = -EINVAL;
-+ goto out;
++ if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
++ ath_err(common,
++ "driver is in invalid state unable to use TX99");
++ return -EINVAL;
+ }
+
-+ if (sdata->vif.bss_conf.chandef.width != chandef->width) {
-+ chanctx_changed = IEEE80211_CHANCTX_CHANGE_WIDTH;
-+ *changed |= BSS_CHANGED_BANDWIDTH;
-+ }
++ sc->tx99_skb = ath9k_build_tx99_skb(sc);
++ if (!sc->tx99_skb)
++ return -ENOMEM;
+
-+ sdata->vif.bss_conf.chandef = *chandef;
-+ ctx->conf.def = *chandef;
++ memset(&txctl, 0, sizeof(txctl));
++ txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
+
-+ chanctx_changed |= IEEE80211_CHANCTX_CHANGE_CHANNEL;
-+ drv_change_chanctx(local, ctx, chanctx_changed);
++ ath_reset(sc);
+
-+ if (!local->use_chanctx) {
-+ local->_oper_chandef = *chandef;
-+ ieee80211_hw_config(local, 0);
-+ }
++ ath9k_ps_wakeup(sc);
+
-+ ieee80211_recalc_chanctx_chantype(local, ctx);
-+ ieee80211_recalc_smps_chanctx(local, ctx);
-+ ieee80211_recalc_radar_chanctx(local, ctx);
++ ath9k_hw_disable_interrupts(ah);
++ atomic_set(&ah->intr_ref_cnt, -1);
++ ath_drain_all_txq(sc);
++ ath_stoprecv(sc);
+
-+ ret = 0;
-+ out:
-+ mutex_unlock(&local->chanctx_mtx);
-+ return ret;
-+}
++ sc->tx99_state = true;
+
- int ieee80211_vif_change_bandwidth(struct ieee80211_sub_if_data *sdata,
- const struct cfg80211_chan_def *chandef,
- u32 *changed)
---- a/net/mac80211/driver-ops.h
-+++ b/net/mac80211/driver-ops.h
-@@ -1104,4 +1104,17 @@ static inline void drv_ipv6_addr_change(
- }
- #endif
-
-+static inline void
-+drv_channel_switch_beacon(struct ieee80211_sub_if_data *sdata,
-+ struct cfg80211_chan_def *chandef)
-+{
-+ struct ieee80211_local *local = sdata->local;
++ ieee80211_stop_queues(hw);
+
-+ if (local->ops->channel_switch_beacon) {
-+ trace_drv_channel_switch_beacon(local, sdata, chandef);
-+ local->ops->channel_switch_beacon(&local->hw, &sdata->vif,
-+ chandef);
++ if (sc->tx99_power == MAX_RATE_POWER + 1)
++ sc->tx99_power = MAX_RATE_POWER;
++
++ ath9k_hw_tx99_set_txpower(ah, sc->tx99_power);
++ r = ath9k_tx99_send(sc, sc->tx99_skb, &txctl);
++ if (r) {
++ ath_dbg(common, XMIT, "Failed to xmit TX99 skb\n");
++ return r;
+ }
-+}
+
- #endif /* __MAC80211_DRIVER_OPS */
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -53,9 +53,6 @@ struct ieee80211_local;
- * increased memory use (about 2 kB of RAM per entry). */
- #define IEEE80211_FRAGMENT_MAX 4
-
--#define TU_TO_JIFFIES(x) (usecs_to_jiffies((x) * 1024))
--#define TU_TO_EXP_TIME(x) (jiffies + TU_TO_JIFFIES(x))
--
- /* power level hasn't been configured (or set to automatic) */
- #define IEEE80211_UNSET_POWER_LEVEL INT_MIN
-
-@@ -259,6 +256,8 @@ struct ieee80211_if_ap {
- struct beacon_data __rcu *beacon;
- struct probe_resp __rcu *probe_resp;
-
-+ /* to be used after channel switch. */
-+ struct cfg80211_beacon_data *next_beacon;
- struct list_head vlans;
-
- struct ps_data ps;
-@@ -713,6 +712,11 @@ struct ieee80211_sub_if_data {
-
- struct ieee80211_tx_queue_params tx_conf[IEEE80211_NUM_ACS];
-
-+ struct work_struct csa_finalize_work;
-+ int csa_counter_offset_beacon;
-+ int csa_counter_offset_presp;
-+ bool csa_radar_required;
++ ath_dbg(common, XMIT, "TX99 xmit started using %d ( %ddBm)\n",
++ sc->tx99_power,
++ sc->tx99_power / 2);
+
- /* used to reconfigure hardware SM PS */
- struct work_struct recalc_smps;
-
-@@ -1346,6 +1350,9 @@ void ieee80211_roc_notify_destroy(struct
- void ieee80211_sw_roc_work(struct work_struct *work);
- void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc);
-
-+/* channel switch handling */
-+void ieee80211_csa_finalize_work(struct work_struct *work);
++ /* We leave the harware awake as it will be chugging on */
+
- /* interface handling */
- int ieee80211_iface_init(void);
- void ieee80211_iface_exit(void);
-@@ -1367,6 +1374,8 @@ void ieee80211_del_virtual_monitor(struc
-
- bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata);
- void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata);
-+int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
-+ struct cfg80211_beacon_data *params);
-
- static inline bool ieee80211_sdata_running(struct ieee80211_sub_if_data *sdata)
- {
-@@ -1627,6 +1636,11 @@ int __must_check
- ieee80211_vif_change_bandwidth(struct ieee80211_sub_if_data *sdata,
- const struct cfg80211_chan_def *chandef,
- u32 *changed);
-+/* NOTE: only use ieee80211_vif_change_channel() for channel switch */
-+int __must_check
-+ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata,
-+ const struct cfg80211_chan_def *chandef,
-+ u32 *changed);
- void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata);
- void ieee80211_vif_vlan_copy_chanctx(struct ieee80211_sub_if_data *sdata);
- void ieee80211_vif_copy_chanctx_to_vlans(struct ieee80211_sub_if_data *sdata,
---- a/net/mac80211/trace.h
-+++ b/net/mac80211/trace.h
-@@ -1906,6 +1906,32 @@ TRACE_EVENT(api_radar_detected,
- )
- );
-
-+TRACE_EVENT(drv_channel_switch_beacon,
-+ TP_PROTO(struct ieee80211_local *local,
-+ struct ieee80211_sub_if_data *sdata,
-+ struct cfg80211_chan_def *chandef),
-+
-+ TP_ARGS(local, sdata, chandef),
-+
-+ TP_STRUCT__entry(
-+ LOCAL_ENTRY
-+ VIF_ENTRY
-+ CHANDEF_ENTRY
-+ ),
-+
-+ TP_fast_assign(
-+ LOCAL_ASSIGN;
-+ VIF_ASSIGN;
-+ CHANDEF_ASSIGN(chandef);
-+ ),
-+
-+ TP_printk(
-+ LOCAL_PR_FMT VIF_PR_FMT " channel switch to " CHANDEF_PR_FMT,
-+ LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG
-+ )
-+);
-+
-+
- #ifdef CPTCFG_MAC80211_MESSAGE_TRACING
- #undef TRACE_SYSTEM
- #define TRACE_SYSTEM mac80211_msg
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -1101,7 +1101,8 @@ ieee80211_tx_prepare(struct ieee80211_su
- tx->sta = rcu_dereference(sdata->u.vlan.sta);
- if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
- return TX_DROP;
-- } else if (info->flags & IEEE80211_TX_CTL_INJECTED ||
-+ } else if (info->flags & (IEEE80211_TX_CTL_INJECTED |
-+ IEEE80211_TX_INTFL_NL80211_FRAME_TX) ||
- tx->sdata->control_port_protocol == tx->skb->protocol) {
- tx->sta = sta_info_get_bss(sdata, hdr->addr1);
- }
-@@ -2326,6 +2327,81 @@ static int ieee80211_beacon_add_tim(stru
- return 0;
- }
-
-+void ieee80211_csa_finish(struct ieee80211_vif *vif)
++ return 0;
++}
++
++static ssize_t read_file_tx99(struct file *file, char __user *user_buf,
++ size_t count, loff_t *ppos)
+{
-+ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
++ struct ath_softc *sc = file->private_data;
++ char buf[3];
++ unsigned int len;
+
-+ ieee80211_queue_work(&sdata->local->hw,
-+ &sdata->csa_finalize_work);
++ len = sprintf(buf, "%d\n", sc->tx99_state);
++ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
-+EXPORT_SYMBOL(ieee80211_csa_finish);
+
-+static void ieee80211_update_csa(struct ieee80211_sub_if_data *sdata,
-+ struct beacon_data *beacon)
++static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
++ size_t count, loff_t *ppos)
+{
-+ struct probe_resp *resp;
-+ int counter_offset_beacon = sdata->csa_counter_offset_beacon;
-+ int counter_offset_presp = sdata->csa_counter_offset_presp;
++ struct ath_softc *sc = file->private_data;
++ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
++ char buf[32];
++ bool start;
++ ssize_t len;
++ int r;
+
-+ /* warn if the driver did not check for/react to csa completeness */
-+ if (WARN_ON(((u8 *)beacon->tail)[counter_offset_beacon] == 0))
-+ return;
++ if (sc->nvifs > 1)
++ return -EOPNOTSUPP;
+
-+ ((u8 *)beacon->tail)[counter_offset_beacon]--;
++ len = min(count, sizeof(buf) - 1);
++ if (copy_from_user(buf, user_buf, len))
++ return -EFAULT;
+
-+ if (sdata->vif.type == NL80211_IFTYPE_AP &&
-+ counter_offset_presp) {
-+ rcu_read_lock();
-+ resp = rcu_dereference(sdata->u.ap.probe_resp);
++ if (strtobool(buf, &start))
++ return -EINVAL;
+
-+ /* if nl80211 accepted the offset, this should not happen. */
-+ if (WARN_ON(!resp)) {
-+ rcu_read_unlock();
-+ return;
-+ }
-+ resp->data[counter_offset_presp]--;
-+ rcu_read_unlock();
++ if (start == sc->tx99_state) {
++ if (!start)
++ return count;
++ ath_dbg(common, XMIT, "Resetting TX99\n");
++ ath9k_tx99_deinit(sc);
+ }
-+}
+
-+bool ieee80211_csa_is_complete(struct ieee80211_vif *vif)
-+{
-+ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
-+ struct beacon_data *beacon = NULL;
-+ u8 *beacon_data;
-+ size_t beacon_data_len;
-+ int counter_beacon = sdata->csa_counter_offset_beacon;
-+ int ret = false;
-+
-+ if (!ieee80211_sdata_running(sdata))
-+ return false;
-+
-+ rcu_read_lock();
-+ if (vif->type == NL80211_IFTYPE_AP) {
-+ struct ieee80211_if_ap *ap = &sdata->u.ap;
-+
-+ beacon = rcu_dereference(ap->beacon);
-+ if (WARN_ON(!beacon || !beacon->tail))
-+ goto out;
-+ beacon_data = beacon->tail;
-+ beacon_data_len = beacon->tail_len;
-+ } else {
-+ WARN_ON(1);
-+ goto out;
++ if (!start) {
++ ath9k_tx99_deinit(sc);
++ return count;
+ }
+
-+ if (WARN_ON(counter_beacon > beacon_data_len))
-+ goto out;
-+
-+ if (beacon_data[counter_beacon] == 0)
-+ ret = true;
-+ out:
-+ rcu_read_unlock();
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL(ieee80211_csa_is_complete);
-+
- struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
- struct ieee80211_vif *vif,
- u16 *tim_offset, u16 *tim_length)
-@@ -2356,6 +2432,9 @@ struct sk_buff *ieee80211_beacon_get_tim
- struct beacon_data *beacon = rcu_dereference(ap->beacon);
-
- if (beacon) {
-+ if (sdata->vif.csa_active)
-+ ieee80211_update_csa(sdata, beacon);
-+
- /*
- * headroom, head length,
- * tail length and maximum TIM length
---- a/net/wireless/rdev-ops.h
-+++ b/net/wireless/rdev-ops.h
-@@ -923,4 +923,16 @@ static inline void rdev_crit_proto_stop(
- trace_rdev_return_void(&rdev->wiphy);
- }
-
-+static inline int rdev_channel_switch(struct cfg80211_registered_device *rdev,
-+ struct net_device *dev,
-+ struct cfg80211_csa_settings *params)
-+{
-+ int ret;
++ r = ath9k_tx99_init(sc);
++ if (r)
++ return r;
+
-+ trace_rdev_channel_switch(&rdev->wiphy, dev, params);
-+ ret = rdev->ops->channel_switch(&rdev->wiphy, dev, params);
-+ trace_rdev_return_int(&rdev->wiphy, ret);
-+ return ret;
++ return count;
+}
+
- #endif /* __CFG80211_RDEV_OPS */
---- a/net/wireless/trace.h
-+++ b/net/wireless/trace.h
-@@ -1841,6 +1841,39 @@ TRACE_EVENT(rdev_crit_proto_stop,
- WIPHY_PR_ARG, WDEV_PR_ARG)
- );
-
-+TRACE_EVENT(rdev_channel_switch,
-+ TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
-+ struct cfg80211_csa_settings *params),
-+ TP_ARGS(wiphy, netdev, params),
-+ TP_STRUCT__entry(
-+ WIPHY_ENTRY
-+ NETDEV_ENTRY
-+ CHAN_DEF_ENTRY
-+ __field(u16, counter_offset_beacon)
-+ __field(u16, counter_offset_presp)
-+ __field(bool, radar_required)
-+ __field(bool, block_tx)
-+ __field(u8, count)
-+ ),
-+ TP_fast_assign(
-+ WIPHY_ASSIGN;
-+ NETDEV_ASSIGN;
-+ CHAN_DEF_ASSIGN(¶ms->chandef);
-+ __entry->counter_offset_beacon = params->counter_offset_beacon;
-+ __entry->counter_offset_presp = params->counter_offset_presp;
-+ __entry->radar_required = params->radar_required;
-+ __entry->block_tx = params->block_tx;
-+ __entry->count = params->count;
-+ ),
-+ TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " CHAN_DEF_PR_FMT
-+ ", block_tx: %d, count: %u, radar_required: %d"
-+ ", counter offsets (beacon/presp): %u/%u",
-+ WIPHY_PR_ARG, NETDEV_PR_ARG, CHAN_DEF_PR_ARG,
-+ __entry->block_tx, __entry->count, __entry->radar_required,
-+ __entry->counter_offset_beacon,
-+ __entry->counter_offset_presp)
-+);
-+
- /*************************************************************
- * cfg80211 exported functions traces *
- *************************************************************/
---- a/drivers/net/wireless/ath/ath.h
-+++ b/drivers/net/wireless/ath/ath.h
-@@ -159,7 +159,7 @@ struct ath_common {
-
- bool btcoex_enabled;
- bool disable_ani;
-- bool antenna_diversity;
-+ bool bt_ant_diversity;
- };
-
- struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
---- a/drivers/net/wireless/ath/ath9k/antenna.c
-+++ b/drivers/net/wireless/ath/ath9k/antenna.c
-@@ -16,37 +16,119 @@
-
- #include "ath9k.h"
-
--static inline bool ath_is_alt_ant_ratio_better(int alt_ratio, int maxdelta,
-+/*
-+ * AR9285
-+ * ======
-+ *
-+ * EEPROM has 2 4-bit fields containing the card configuration.
-+ *
-+ * antdiv_ctl1:
-+ * ------------
-+ * bb_enable_ant_div_lnadiv : 1
-+ * bb_ant_div_alt_gaintb : 1
-+ * bb_ant_div_main_gaintb : 1
-+ * bb_enable_ant_fast_div : 1
-+ *
-+ * antdiv_ctl2:
-+ * -----------
-+ * bb_ant_div_alt_lnaconf : 2
-+ * bb_ant_div_main_lnaconf : 2
-+ *
-+ * The EEPROM bits are used as follows:
-+ * ------------------------------------
-+ *
-+ * bb_enable_ant_div_lnadiv - Enable LNA path rx antenna diversity/combining.
-+ * Set in AR_PHY_MULTICHAIN_GAIN_CTL.
-+ *
-+ * bb_ant_div_[alt/main]_gaintb - 0 -> Antenna config Alt/Main uses gaintable 0
-+ * 1 -> Antenna config Alt/Main uses gaintable 1
-+ * Set in AR_PHY_MULTICHAIN_GAIN_CTL.
-+ *
-+ * bb_enable_ant_fast_div - Enable fast antenna diversity.
-+ * Set in AR_PHY_CCK_DETECT.
-+ *
-+ * bb_ant_div_[alt/main]_lnaconf - Alt/Main LNA diversity/combining input config.
-+ * Set in AR_PHY_MULTICHAIN_GAIN_CTL.
-+ * 10=LNA1
-+ * 01=LNA2
-+ * 11=LNA1+LNA2
-+ * 00=LNA1-LNA2
-+ *
-+ * AR9485 / AR9565 / AR9331
-+ * ========================
-+ *
-+ * The same bits are present in the EEPROM, but the location in the
-+ * EEPROM is different (ant_div_control in ar9300_BaseExtension_1).
-+ *
-+ * ant_div_alt_lnaconf ==> bit 0~1
-+ * ant_div_main_lnaconf ==> bit 2~3
-+ * ant_div_alt_gaintb ==> bit 4
-+ * ant_div_main_gaintb ==> bit 5
-+ * enable_ant_div_lnadiv ==> bit 6
-+ * enable_ant_fast_div ==> bit 7
-+ */
-+
-+static inline bool ath_is_alt_ant_ratio_better(struct ath_ant_comb *antcomb,
-+ int alt_ratio, int maxdelta,
- int mindelta, int main_rssi_avg,
- int alt_rssi_avg, int pkt_count)
- {
-- return (((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-- (alt_rssi_avg > main_rssi_avg + maxdelta)) ||
-- (alt_rssi_avg > main_rssi_avg + mindelta)) && (pkt_count > 50);
-+ if (pkt_count <= 50)
-+ return false;
-+
-+ if (alt_rssi_avg > main_rssi_avg + mindelta)
-+ return true;
-+
-+ if (alt_ratio >= antcomb->ant_ratio2 &&
-+ alt_rssi_avg >= antcomb->low_rssi_thresh &&
-+ (alt_rssi_avg > main_rssi_avg + maxdelta))
-+ return true;
-+
-+ return false;
- }
-
--static inline bool ath_ant_div_comb_alt_check(u8 div_group, int alt_ratio,
-- int curr_main_set, int curr_alt_set,
-- int alt_rssi_avg, int main_rssi_avg)
-+static inline bool ath_ant_div_comb_alt_check(struct ath_hw_antcomb_conf *conf,
-+ struct ath_ant_comb *antcomb,
-+ int alt_ratio, int alt_rssi_avg,
-+ int main_rssi_avg)
- {
-- bool result = false;
-- switch (div_group) {
-+ bool result, set1, set2;
-+
-+ result = set1 = set2 = false;
-+
-+ if (conf->main_lna_conf == ATH_ANT_DIV_COMB_LNA2 &&
-+ conf->alt_lna_conf == ATH_ANT_DIV_COMB_LNA1)
-+ set1 = true;
-+
-+ if (conf->main_lna_conf == ATH_ANT_DIV_COMB_LNA1 &&
-+ conf->alt_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-+ set2 = true;
-+
-+ switch (conf->div_group) {
- case 0:
- if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
- result = true;
- break;
- case 1:
- case 2:
-- if ((((curr_main_set == ATH_ANT_DIV_COMB_LNA2) &&
-- (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) &&
-- (alt_rssi_avg >= (main_rssi_avg - 5))) ||
-- ((curr_main_set == ATH_ANT_DIV_COMB_LNA1) &&
-- (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) &&
-- (alt_rssi_avg >= (main_rssi_avg - 2)))) &&
-- (alt_rssi_avg >= 4))
-+ if (alt_rssi_avg < 4 || alt_rssi_avg < antcomb->low_rssi_thresh)
-+ break;
-+
-+ if ((set1 && (alt_rssi_avg >= (main_rssi_avg - 5))) ||
-+ (set2 && (alt_rssi_avg >= (main_rssi_avg - 2))) ||
-+ (alt_ratio > antcomb->ant_ratio))
- result = true;
-- else
-- result = false;
-+
-+ break;
-+ case 3:
-+ if (alt_rssi_avg < 4 || alt_rssi_avg < antcomb->low_rssi_thresh)
-+ break;
-+
-+ if ((set1 && (alt_rssi_avg >= (main_rssi_avg - 3))) ||
-+ (set2 && (alt_rssi_avg >= (main_rssi_avg + 3))) ||
-+ (alt_ratio > antcomb->ant_ratio))
-+ result = true;
++static const struct file_operations fops_tx99 = {
++ .read = read_file_tx99,
++ .write = write_file_tx99,
++ .open = simple_open,
++ .owner = THIS_MODULE,
++ .llseek = default_llseek,
++};
+
- break;
- }
-
-@@ -108,6 +190,74 @@ static void ath_lnaconf_alt_good_scan(st
- }
- }
-
-+static void ath_ant_set_alt_ratio(struct ath_ant_comb *antcomb,
-+ struct ath_hw_antcomb_conf *conf)
++static ssize_t read_file_tx99_power(struct file *file,
++ char __user *user_buf,
++ size_t count, loff_t *ppos)
+{
-+ /* set alt to the conf with maximun ratio */
-+ if (antcomb->first_ratio && antcomb->second_ratio) {
-+ if (antcomb->rssi_second > antcomb->rssi_third) {
-+ /* first alt*/
-+ if ((antcomb->first_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1) ||
-+ (antcomb->first_quick_scan_conf == ATH_ANT_DIV_COMB_LNA2))
-+ /* Set alt LNA1 or LNA2*/
-+ if (conf->main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ else
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ else
-+ /* Set alt to A+B or A-B */
-+ conf->alt_lna_conf =
-+ antcomb->first_quick_scan_conf;
-+ } else if ((antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1) ||
-+ (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA2)) {
-+ /* Set alt LNA1 or LNA2 */
-+ if (conf->main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ else
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ } else {
-+ /* Set alt to A+B or A-B */
-+ conf->alt_lna_conf = antcomb->second_quick_scan_conf;
-+ }
-+ } else if (antcomb->first_ratio) {
-+ /* first alt */
-+ if ((antcomb->first_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1) ||
-+ (antcomb->first_quick_scan_conf == ATH_ANT_DIV_COMB_LNA2))
-+ /* Set alt LNA1 or LNA2 */
-+ if (conf->main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ else
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ else
-+ /* Set alt to A+B or A-B */
-+ conf->alt_lna_conf = antcomb->first_quick_scan_conf;
-+ } else if (antcomb->second_ratio) {
-+ /* second alt */
-+ if ((antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1) ||
-+ (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA2))
-+ /* Set alt LNA1 or LNA2 */
-+ if (conf->main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ else
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ else
-+ /* Set alt to A+B or A-B */
-+ conf->alt_lna_conf = antcomb->second_quick_scan_conf;
-+ } else {
-+ /* main is largest */
-+ if ((antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) ||
-+ (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2))
-+ /* Set alt LNA1 or LNA2 */
-+ if (conf->main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ else
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ else
-+ /* Set alt to A+B or A-B */
-+ conf->alt_lna_conf = antcomb->main_conf;
-+ }
-+}
-+
- static void ath_select_ant_div_from_quick_scan(struct ath_ant_comb *antcomb,
- struct ath_hw_antcomb_conf *div_ant_conf,
- int main_rssi_avg, int alt_rssi_avg,
-@@ -129,7 +279,7 @@ static void ath_select_ant_div_from_quic
-
- if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
- /* main is LNA1 */
-- if (ath_is_alt_ant_ratio_better(alt_ratio,
-+ if (ath_is_alt_ant_ratio_better(antcomb, alt_ratio,
- ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
- ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
- main_rssi_avg, alt_rssi_avg,
-@@ -138,7 +288,7 @@ static void ath_select_ant_div_from_quic
- else
- antcomb->first_ratio = false;
- } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
-- if (ath_is_alt_ant_ratio_better(alt_ratio,
-+ if (ath_is_alt_ant_ratio_better(antcomb, alt_ratio,
- ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
- ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
- main_rssi_avg, alt_rssi_avg,
-@@ -147,11 +297,11 @@ static void ath_select_ant_div_from_quic
- else
- antcomb->first_ratio = false;
- } else {
-- if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-- (alt_rssi_avg > main_rssi_avg +
-- ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-- (alt_rssi_avg > main_rssi_avg)) &&
-- (antcomb->total_pkt_count > 50))
-+ if (ath_is_alt_ant_ratio_better(antcomb, alt_ratio,
-+ ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-+ 0,
-+ main_rssi_avg, alt_rssi_avg,
-+ antcomb->total_pkt_count))
- antcomb->first_ratio = true;
- else
- antcomb->first_ratio = false;
-@@ -164,17 +314,21 @@ static void ath_select_ant_div_from_quic
- antcomb->rssi_first = main_rssi_avg;
- antcomb->rssi_third = alt_rssi_avg;
-
-- if (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1)
-+ switch(antcomb->second_quick_scan_conf) {
-+ case ATH_ANT_DIV_COMB_LNA1:
- antcomb->rssi_lna1 = alt_rssi_avg;
-- else if (antcomb->second_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA2)
-+ break;
-+ case ATH_ANT_DIV_COMB_LNA2:
- antcomb->rssi_lna2 = alt_rssi_avg;
-- else if (antcomb->second_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2) {
-+ break;
-+ case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2:
- if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2)
- antcomb->rssi_lna2 = main_rssi_avg;
- else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1)
- antcomb->rssi_lna1 = main_rssi_avg;
-+ break;
-+ default:
-+ break;
- }
-
- if (antcomb->rssi_lna2 > antcomb->rssi_lna1 +
-@@ -184,7 +338,7 @@ static void ath_select_ant_div_from_quic
- div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-
- if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
-- if (ath_is_alt_ant_ratio_better(alt_ratio,
-+ if (ath_is_alt_ant_ratio_better(antcomb, alt_ratio,
- ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
- ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
- main_rssi_avg, alt_rssi_avg,
-@@ -193,7 +347,7 @@ static void ath_select_ant_div_from_quic
- else
- antcomb->second_ratio = false;
- } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
-- if (ath_is_alt_ant_ratio_better(alt_ratio,
-+ if (ath_is_alt_ant_ratio_better(antcomb, alt_ratio,
- ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
- ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
- main_rssi_avg, alt_rssi_avg,
-@@ -202,105 +356,18 @@ static void ath_select_ant_div_from_quic
- else
- antcomb->second_ratio = false;
- } else {
-- if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-- (alt_rssi_avg > main_rssi_avg +
-- ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-- (alt_rssi_avg > main_rssi_avg)) &&
-- (antcomb->total_pkt_count > 50))
-+ if (ath_is_alt_ant_ratio_better(antcomb, alt_ratio,
-+ ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-+ 0,
-+ main_rssi_avg, alt_rssi_avg,
-+ antcomb->total_pkt_count))
- antcomb->second_ratio = true;
- else
- antcomb->second_ratio = false;
- }
-
-- /* set alt to the conf with maximun ratio */
-- if (antcomb->first_ratio && antcomb->second_ratio) {
-- if (antcomb->rssi_second > antcomb->rssi_third) {
-- /* first alt*/
-- if ((antcomb->first_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA1) ||
-- (antcomb->first_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA2))
-- /* Set alt LNA1 or LNA2*/
-- if (div_ant_conf->main_lna_conf ==
-- ATH_ANT_DIV_COMB_LNA2)
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- else
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- else
-- /* Set alt to A+B or A-B */
-- div_ant_conf->alt_lna_conf =
-- antcomb->first_quick_scan_conf;
-- } else if ((antcomb->second_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA1) ||
-- (antcomb->second_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA2)) {
-- /* Set alt LNA1 or LNA2 */
-- if (div_ant_conf->main_lna_conf ==
-- ATH_ANT_DIV_COMB_LNA2)
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- else
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- } else {
-- /* Set alt to A+B or A-B */
-- div_ant_conf->alt_lna_conf =
-- antcomb->second_quick_scan_conf;
-- }
-- } else if (antcomb->first_ratio) {
-- /* first alt */
-- if ((antcomb->first_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA1) ||
-- (antcomb->first_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA2))
-- /* Set alt LNA1 or LNA2 */
-- if (div_ant_conf->main_lna_conf ==
-- ATH_ANT_DIV_COMB_LNA2)
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- else
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- else
-- /* Set alt to A+B or A-B */
-- div_ant_conf->alt_lna_conf =
-- antcomb->first_quick_scan_conf;
-- } else if (antcomb->second_ratio) {
-- /* second alt */
-- if ((antcomb->second_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA1) ||
-- (antcomb->second_quick_scan_conf ==
-- ATH_ANT_DIV_COMB_LNA2))
-- /* Set alt LNA1 or LNA2 */
-- if (div_ant_conf->main_lna_conf ==
-- ATH_ANT_DIV_COMB_LNA2)
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- else
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- else
-- /* Set alt to A+B or A-B */
-- div_ant_conf->alt_lna_conf =
-- antcomb->second_quick_scan_conf;
-- } else {
-- /* main is largest */
-- if ((antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) ||
-- (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2))
-- /* Set alt LNA1 or LNA2 */
-- if (div_ant_conf->main_lna_conf ==
-- ATH_ANT_DIV_COMB_LNA2)
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- else
-- div_ant_conf->alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- else
-- /* Set alt to A+B or A-B */
-- div_ant_conf->alt_lna_conf = antcomb->main_conf;
-- }
-+ ath_ant_set_alt_ratio(antcomb, div_ant_conf);
++ struct ath_softc *sc = file->private_data;
++ char buf[32];
++ unsigned int len;
+
- break;
- default:
- break;
-@@ -430,8 +497,7 @@ static void ath_ant_div_conf_fast_divbia
- ant_conf->fast_div_bias = 0x1;
- break;
- case 0x10: /* LNA2 A-B */
-- if (!(antcomb->scan) &&
-- (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-+ if (!antcomb->scan && (alt_ratio > antcomb->ant_ratio))
- ant_conf->fast_div_bias = 0x1;
- else
- ant_conf->fast_div_bias = 0x2;
-@@ -440,15 +506,13 @@ static void ath_ant_div_conf_fast_divbia
- ant_conf->fast_div_bias = 0x1;
- break;
- case 0x13: /* LNA2 A+B */
-- if (!(antcomb->scan) &&
-- (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-+ if (!antcomb->scan && (alt_ratio > antcomb->ant_ratio))
- ant_conf->fast_div_bias = 0x1;
- else
- ant_conf->fast_div_bias = 0x2;
- break;
- case 0x20: /* LNA1 A-B */
-- if (!(antcomb->scan) &&
-- (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-+ if (!antcomb->scan && (alt_ratio > antcomb->ant_ratio))
- ant_conf->fast_div_bias = 0x1;
- else
- ant_conf->fast_div_bias = 0x2;
-@@ -457,8 +521,7 @@ static void ath_ant_div_conf_fast_divbia
- ant_conf->fast_div_bias = 0x1;
- break;
- case 0x23: /* LNA1 A+B */
-- if (!(antcomb->scan) &&
-- (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-+ if (!antcomb->scan && (alt_ratio > antcomb->ant_ratio))
- ant_conf->fast_div_bias = 0x1;
- else
- ant_conf->fast_div_bias = 0x2;
-@@ -475,6 +538,9 @@ static void ath_ant_div_conf_fast_divbia
- default:
- break;
- }
++ len = sprintf(buf, "%d (%d dBm)\n",
++ sc->tx99_power,
++ sc->tx99_power / 2);
+
-+ if (antcomb->fast_div_bias)
-+ ant_conf->fast_div_bias = antcomb->fast_div_bias;
- } else if (ant_conf->div_group == 3) {
- switch ((ant_conf->main_lna_conf << 4) |
- ant_conf->alt_lna_conf) {
-@@ -540,6 +606,138 @@ static void ath_ant_div_conf_fast_divbia
- }
- }
-
-+static void ath_ant_try_scan(struct ath_ant_comb *antcomb,
-+ struct ath_hw_antcomb_conf *conf,
-+ int curr_alt_set, int alt_rssi_avg,
-+ int main_rssi_avg)
-+{
-+ switch (curr_alt_set) {
-+ case ATH_ANT_DIV_COMB_LNA2:
-+ antcomb->rssi_lna2 = alt_rssi_avg;
-+ antcomb->rssi_lna1 = main_rssi_avg;
-+ antcomb->scan = true;
-+ /* set to A+B */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-+ break;
-+ case ATH_ANT_DIV_COMB_LNA1:
-+ antcomb->rssi_lna1 = alt_rssi_avg;
-+ antcomb->rssi_lna2 = main_rssi_avg;
-+ antcomb->scan = true;
-+ /* set to A+B */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-+ break;
-+ case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2:
-+ antcomb->rssi_add = alt_rssi_avg;
-+ antcomb->scan = true;
-+ /* set to A-B */
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-+ break;
-+ case ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2:
-+ antcomb->rssi_sub = alt_rssi_avg;
-+ antcomb->scan = false;
-+ if (antcomb->rssi_lna2 >
-+ (antcomb->rssi_lna1 + ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)) {
-+ /* use LNA2 as main LNA */
-+ if ((antcomb->rssi_add > antcomb->rssi_lna1) &&
-+ (antcomb->rssi_add > antcomb->rssi_sub)) {
-+ /* set to A+B */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-+ } else if (antcomb->rssi_sub >
-+ antcomb->rssi_lna1) {
-+ /* set to A-B */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-+ } else {
-+ /* set to LNA1 */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ }
-+ } else {
-+ /* use LNA1 as main LNA */
-+ if ((antcomb->rssi_add > antcomb->rssi_lna2) &&
-+ (antcomb->rssi_add > antcomb->rssi_sub)) {
-+ /* set to A+B */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-+ } else if (antcomb->rssi_sub >
-+ antcomb->rssi_lna1) {
-+ /* set to A-B */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-+ } else {
-+ /* set to LNA2 */
-+ conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ }
-+ }
-+ break;
-+ default:
-+ break;
-+ }
++ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
-+static bool ath_ant_try_switch(struct ath_hw_antcomb_conf *div_ant_conf,
-+ struct ath_ant_comb *antcomb,
-+ int alt_ratio, int alt_rssi_avg,
-+ int main_rssi_avg, int curr_main_set,
-+ int curr_alt_set)
++static ssize_t write_file_tx99_power(struct file *file,
++ const char __user *user_buf,
++ size_t count, loff_t *ppos)
+{
-+ bool ret = false;
-+
-+ if (ath_ant_div_comb_alt_check(div_ant_conf, antcomb, alt_ratio,
-+ alt_rssi_avg, main_rssi_avg)) {
-+ if (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) {
-+ /*
-+ * Switch main and alt LNA.
-+ */
-+ div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ div_ant_conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ } else if (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) {
-+ div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ div_ant_conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+ }
-+
-+ ret = true;
-+ } else if ((curr_alt_set != ATH_ANT_DIV_COMB_LNA1) &&
-+ (curr_alt_set != ATH_ANT_DIV_COMB_LNA2)) {
-+ /*
-+ Set alt to another LNA.
-+ */
-+ if (curr_main_set == ATH_ANT_DIV_COMB_LNA2)
-+ div_ant_conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-+ else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1)
-+ div_ant_conf->alt_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-+
-+ ret = true;
-+ }
-+
-+ return ret;
-+}
++ struct ath_softc *sc = file->private_data;
++ int r;
++ u8 tx_power;
+
-+static bool ath_ant_short_scan_check(struct ath_ant_comb *antcomb)
-+{
-+ int alt_ratio;
++ r = kstrtou8_from_user(user_buf, count, 0, &tx_power);
++ if (r)
++ return r;
+
-+ if (!antcomb->scan || !antcomb->alt_good)
-+ return false;
++ if (tx_power > MAX_RATE_POWER)
++ return -EINVAL;
+
-+ if (time_after(jiffies, antcomb->scan_start_time +
-+ msecs_to_jiffies(ATH_ANT_DIV_COMB_SHORT_SCAN_INTR)))
-+ return true;
++ sc->tx99_power = tx_power;
+
-+ if (antcomb->total_pkt_count == ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT) {
-+ alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-+ antcomb->total_pkt_count);
-+ if (alt_ratio < antcomb->ant_ratio)
-+ return true;
-+ }
++ ath9k_ps_wakeup(sc);
++ ath9k_hw_tx99_set_txpower(sc->sc_ah, sc->tx99_power);
++ ath9k_ps_restore(sc);
+
-+ return false;
++ return count;
+}
+
- void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs)
- {
- struct ath_hw_antcomb_conf div_ant_conf;
-@@ -549,41 +747,46 @@ void ath_ant_comb_scan(struct ath_softc
- int main_rssi = rs->rs_rssi_ctl0;
- int alt_rssi = rs->rs_rssi_ctl1;
- int rx_ant_conf, main_ant_conf;
-- bool short_scan = false;
-+ bool short_scan = false, ret;
-
- rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
- ATH_ANT_RX_MASK;
- main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
- ATH_ANT_RX_MASK;
-
-+ if (alt_rssi >= antcomb->low_rssi_thresh) {
-+ antcomb->ant_ratio = ATH_ANT_DIV_COMB_ALT_ANT_RATIO;
-+ antcomb->ant_ratio2 = ATH_ANT_DIV_COMB_ALT_ANT_RATIO2;
-+ } else {
-+ antcomb->ant_ratio = ATH_ANT_DIV_COMB_ALT_ANT_RATIO_LOW_RSSI;
-+ antcomb->ant_ratio2 = ATH_ANT_DIV_COMB_ALT_ANT_RATIO2_LOW_RSSI;
-+ }
-+
- /* Record packet only when both main_rssi and alt_rssi is positive */
- if (main_rssi > 0 && alt_rssi > 0) {
- antcomb->total_pkt_count++;
- antcomb->main_total_rssi += main_rssi;
- antcomb->alt_total_rssi += alt_rssi;
-+
- if (main_ant_conf == rx_ant_conf)
- antcomb->main_recv_cnt++;
- else
- antcomb->alt_recv_cnt++;
- }
-
-- /* Short scan check */
-- if (antcomb->scan && antcomb->alt_good) {
-- if (time_after(jiffies, antcomb->scan_start_time +
-- msecs_to_jiffies(ATH_ANT_DIV_COMB_SHORT_SCAN_INTR)))
-- short_scan = true;
-- else
-- if (antcomb->total_pkt_count ==
-- ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT) {
-- alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-- antcomb->total_pkt_count);
-- if (alt_ratio < ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
-- short_scan = true;
-- }
-+ if (main_ant_conf == rx_ant_conf) {
-+ ANT_STAT_INC(ANT_MAIN, recv_cnt);
-+ ANT_LNA_INC(ANT_MAIN, rx_ant_conf);
-+ } else {
-+ ANT_STAT_INC(ANT_ALT, recv_cnt);
-+ ANT_LNA_INC(ANT_ALT, rx_ant_conf);
- }
-
-+ /* Short scan check */
-+ short_scan = ath_ant_short_scan_check(antcomb);
-+
- if (((antcomb->total_pkt_count < ATH_ANT_DIV_COMB_MAX_PKTCOUNT) ||
-- rs->rs_moreaggr) && !short_scan)
-+ rs->rs_moreaggr) && !short_scan)
- return;
-
- if (antcomb->total_pkt_count) {
-@@ -595,15 +798,13 @@ void ath_ant_comb_scan(struct ath_softc
- antcomb->total_pkt_count);
- }
-
--
- ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf);
- curr_alt_set = div_ant_conf.alt_lna_conf;
- curr_main_set = div_ant_conf.main_lna_conf;
--
- antcomb->count++;
-
- if (antcomb->count == ATH_ANT_DIV_COMB_MAX_COUNT) {
-- if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
-+ if (alt_ratio > antcomb->ant_ratio) {
- ath_lnaconf_alt_good_scan(antcomb, div_ant_conf,
- main_rssi_avg);
- antcomb->alt_good = true;
-@@ -617,153 +818,47 @@ void ath_ant_comb_scan(struct ath_softc
- }
-
- if (!antcomb->scan) {
-- if (ath_ant_div_comb_alt_check(div_ant_conf.div_group,
-- alt_ratio, curr_main_set, curr_alt_set,
-- alt_rssi_avg, main_rssi_avg)) {
-- if (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) {
-- /* Switch main and alt LNA */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- } else if (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) {
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- }
--
-- goto div_comb_done;
-- } else if ((curr_alt_set != ATH_ANT_DIV_COMB_LNA1) &&
-- (curr_alt_set != ATH_ANT_DIV_COMB_LNA2)) {
-- /* Set alt to another LNA */
-- if (curr_main_set == ATH_ANT_DIV_COMB_LNA2)
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1)
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
--
-- goto div_comb_done;
-- }
--
-- if ((alt_rssi_avg < (main_rssi_avg +
-- div_ant_conf.lna1_lna2_delta)))
-+ ret = ath_ant_try_switch(&div_ant_conf, antcomb, alt_ratio,
-+ alt_rssi_avg, main_rssi_avg,
-+ curr_main_set, curr_alt_set);
-+ if (ret)
- goto div_comb_done;
- }
-
-+ if (!antcomb->scan &&
-+ (alt_rssi_avg < (main_rssi_avg + div_ant_conf.lna1_lna2_delta)))
-+ goto div_comb_done;
-+
- if (!antcomb->scan_not_start) {
-- switch (curr_alt_set) {
-- case ATH_ANT_DIV_COMB_LNA2:
-- antcomb->rssi_lna2 = alt_rssi_avg;
-- antcomb->rssi_lna1 = main_rssi_avg;
-- antcomb->scan = true;
-- /* set to A+B */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-- break;
-- case ATH_ANT_DIV_COMB_LNA1:
-- antcomb->rssi_lna1 = alt_rssi_avg;
-- antcomb->rssi_lna2 = main_rssi_avg;
-- antcomb->scan = true;
-- /* set to A+B */
-- div_ant_conf.main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-- break;
-- case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2:
-- antcomb->rssi_add = alt_rssi_avg;
-- antcomb->scan = true;
-- /* set to A-B */
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-- break;
-- case ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2:
-- antcomb->rssi_sub = alt_rssi_avg;
-- antcomb->scan = false;
-- if (antcomb->rssi_lna2 >
-- (antcomb->rssi_lna1 +
-- ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)) {
-- /* use LNA2 as main LNA */
-- if ((antcomb->rssi_add > antcomb->rssi_lna1) &&
-- (antcomb->rssi_add > antcomb->rssi_sub)) {
-- /* set to A+B */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-- } else if (antcomb->rssi_sub >
-- antcomb->rssi_lna1) {
-- /* set to A-B */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-- } else {
-- /* set to LNA1 */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- }
-- } else {
-- /* use LNA1 as main LNA */
-- if ((antcomb->rssi_add > antcomb->rssi_lna2) &&
-- (antcomb->rssi_add > antcomb->rssi_sub)) {
-- /* set to A+B */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-- } else if (antcomb->rssi_sub >
-- antcomb->rssi_lna1) {
-- /* set to A-B */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-- } else {
-- /* set to LNA2 */
-- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-- }
-- }
-- break;
-- default:
-- break;
-- }
-+ ath_ant_try_scan(antcomb, &div_ant_conf, curr_alt_set,
-+ alt_rssi_avg, main_rssi_avg);
- } else {
- if (!antcomb->alt_good) {
- antcomb->scan_not_start = false;
- /* Set alt to another LNA */
- if (curr_main_set == ATH_ANT_DIV_COMB_LNA2) {
- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-+ ATH_ANT_DIV_COMB_LNA2;
- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-+ ATH_ANT_DIV_COMB_LNA1;
- } else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1) {
- div_ant_conf.main_lna_conf =
-- ATH_ANT_DIV_COMB_LNA1;
-+ ATH_ANT_DIV_COMB_LNA1;
- div_ant_conf.alt_lna_conf =
-- ATH_ANT_DIV_COMB_LNA2;
-+ ATH_ANT_DIV_COMB_LNA2;
- }
- goto div_comb_done;
- }
-+ ath_select_ant_div_from_quick_scan(antcomb, &div_ant_conf,
-+ main_rssi_avg, alt_rssi_avg,
-+ alt_ratio);
-+ antcomb->quick_scan_cnt++;
- }
-
-- ath_select_ant_div_from_quick_scan(antcomb, &div_ant_conf,
-- main_rssi_avg, alt_rssi_avg,
-- alt_ratio);
--
-- antcomb->quick_scan_cnt++;
--
- div_comb_done:
- ath_ant_div_conf_fast_divbias(&div_ant_conf, antcomb, alt_ratio);
- ath9k_hw_antdiv_comb_conf_set(sc->sc_ah, &div_ant_conf);
-+ ath9k_debug_stat_ant(sc, &div_ant_conf, main_rssi_avg, alt_rssi_avg);
-
- antcomb->scan_start_time = jiffies;
- antcomb->total_pkt_count = 0;
-@@ -772,26 +867,3 @@ div_comb_done:
- antcomb->main_recv_cnt = 0;
- antcomb->alt_recv_cnt = 0;
- }
--
--void ath_ant_comb_update(struct ath_softc *sc)
--{
-- struct ath_hw *ah = sc->sc_ah;
-- struct ath_common *common = ath9k_hw_common(ah);
-- struct ath_hw_antcomb_conf div_ant_conf;
-- u8 lna_conf;
--
-- ath9k_hw_antdiv_comb_conf_get(ah, &div_ant_conf);
--
-- if (sc->ant_rx == 1)
-- lna_conf = ATH_ANT_DIV_COMB_LNA1;
-- else
-- lna_conf = ATH_ANT_DIV_COMB_LNA2;
--
-- div_ant_conf.main_lna_conf = lna_conf;
-- div_ant_conf.alt_lna_conf = lna_conf;
--
-- ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf);
--
-- if (common->antenna_diversity)
-- ath9k_hw_antctrl_shared_chain_lnadiv(ah, true);
--}
---- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-@@ -610,7 +610,15 @@ static void ar5008_hw_override_ini(struc
- REG_SET_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
-
- if (AR_SREV_9280_20_OR_LATER(ah)) {
-- val = REG_READ(ah, AR_PCU_MISC_MODE2);
-+ /*
-+ * For AR9280 and above, there is a new feature that allows
-+ * Multicast search based on both MAC Address and Key ID.
-+ * By default, this feature is enabled. But since the driver
-+ * is not using this feature, we switch it off; otherwise
-+ * multicast search based on MAC addr only will fail.
-+ */
-+ val = REG_READ(ah, AR_PCU_MISC_MODE2) &
-+ (~AR_ADHOC_MCAST_KEYID_ENABLE);
-
- if (!AR_SREV_9271(ah))
- val &= ~AR_PCU_MISC_MODE2_HWWAR1;
-@@ -659,14 +667,13 @@ static void ar5008_hw_set_channel_regs(s
- if (IS_CHAN_HT40(chan)) {
- phymode |= AR_PHY_FC_DYN2040_EN;
-
-- if ((chan->chanmode == CHANNEL_A_HT40PLUS) ||
-- (chan->chanmode == CHANNEL_G_HT40PLUS))
-+ if (IS_CHAN_HT40PLUS(chan))
- phymode |= AR_PHY_FC_DYN2040_PRI_CH;
-
- }
- REG_WRITE(ah, AR_PHY_TURBO, phymode);
-
-- ath9k_hw_set11nmac2040(ah);
-+ ath9k_hw_set11nmac2040(ah, chan);
-
- ENABLE_REGWRITE_BUFFER(ah);
-
-@@ -684,31 +691,12 @@ static int ar5008_hw_process_ini(struct
- int i, regWrites = 0;
- u32 modesIndex, freqIndex;
-
-- switch (chan->chanmode) {
-- case CHANNEL_A:
-- case CHANNEL_A_HT20:
-- modesIndex = 1;
-- freqIndex = 1;
-- break;
-- case CHANNEL_A_HT40PLUS:
-- case CHANNEL_A_HT40MINUS:
-- modesIndex = 2;
-+ if (IS_CHAN_5GHZ(chan)) {
- freqIndex = 1;
-- break;
-- case CHANNEL_G:
-- case CHANNEL_G_HT20:
-- case CHANNEL_B:
-- modesIndex = 4;
-+ modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;
-+ } else {
- freqIndex = 2;
-- break;
-- case CHANNEL_G_HT40PLUS:
-- case CHANNEL_G_HT40MINUS:
-- modesIndex = 3;
-- freqIndex = 2;
-- break;
--
-- default:
-- return -EINVAL;
-+ modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;
- }
-
- /*
-@@ -807,8 +795,10 @@ static void ar5008_hw_set_rfmode(struct
- if (chan == NULL)
- return;
-
-- rfMode |= (IS_CHAN_B(chan) || IS_CHAN_G(chan))
-- ? AR_PHY_MODE_DYNAMIC : AR_PHY_MODE_OFDM;
-+ if (IS_CHAN_2GHZ(chan))
-+ rfMode |= AR_PHY_MODE_DYNAMIC;
-+ else
-+ rfMode |= AR_PHY_MODE_OFDM;
-
- if (!AR_SREV_9280_20_OR_LATER(ah))
- rfMode |= (IS_CHAN_5GHZ(chan)) ?
-@@ -1213,12 +1203,11 @@ static void ar5008_hw_ani_cache_ini_regs
-
- iniDef = &aniState->iniDef;
-
-- ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz/0x%x\n",
-+ ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz\n",
- ah->hw_version.macVersion,
- ah->hw_version.macRev,
- ah->opmode,
-- chan->channel,
-- chan->channelFlags);
-+ chan->channel);
-
- val = REG_READ(ah, AR_PHY_SFCORR);
- iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);
---- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
-@@ -555,6 +555,69 @@ static void ar9002_hw_antdiv_comb_conf_s
- REG_WRITE(ah, AR_PHY_MULTICHAIN_GAIN_CTL, regval);
- }
-
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
++static const struct file_operations fops_tx99_power = {
++ .read = read_file_tx99_power,
++ .write = write_file_tx99_power,
++ .open = simple_open,
++ .owner = THIS_MODULE,
++ .llseek = default_llseek,
++};
+
-+static void ar9002_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
++void ath9k_tx99_init_debug(struct ath_softc *sc)
+{
-+ struct ath_btcoex_hw *btcoex = &ah->btcoex_hw;
-+ u8 antdiv_ctrl1, antdiv_ctrl2;
-+ u32 regval;
-+
-+ if (enable) {
-+ antdiv_ctrl1 = ATH_BT_COEX_ANTDIV_CONTROL1_ENABLE;
-+ antdiv_ctrl2 = ATH_BT_COEX_ANTDIV_CONTROL2_ENABLE;
-+
-+ /*
-+ * Don't disable BT ant to allow BB to control SWCOM.
-+ */
-+ btcoex->bt_coex_mode2 &= (~(AR_BT_DISABLE_BT_ANT));
-+ REG_WRITE(ah, AR_BT_COEX_MODE2, btcoex->bt_coex_mode2);
-+
-+ REG_WRITE(ah, AR_PHY_SWITCH_COM, ATH_BT_COEX_ANT_DIV_SWITCH_COM);
-+ REG_RMW(ah, AR_PHY_SWITCH_CHAIN_0, 0, 0xf0000000);
-+ } else {
-+ /*
-+ * Disable antenna diversity, use LNA1 only.
-+ */
-+ antdiv_ctrl1 = ATH_BT_COEX_ANTDIV_CONTROL1_FIXED_A;
-+ antdiv_ctrl2 = ATH_BT_COEX_ANTDIV_CONTROL2_FIXED_A;
-+
-+ /*
-+ * Disable BT Ant. to allow concurrent BT and WLAN receive.
-+ */
-+ btcoex->bt_coex_mode2 |= AR_BT_DISABLE_BT_ANT;
-+ REG_WRITE(ah, AR_BT_COEX_MODE2, btcoex->bt_coex_mode2);
-+
-+ /*
-+ * Program SWCOM table to make sure RF switch always parks
-+ * at BT side.
-+ */
-+ REG_WRITE(ah, AR_PHY_SWITCH_COM, 0);
-+ REG_RMW(ah, AR_PHY_SWITCH_CHAIN_0, 0, 0xf0000000);
-+ }
++ if (!AR_SREV_9300_20_OR_LATER(sc->sc_ah))
++ return;
+
-+ regval = REG_READ(ah, AR_PHY_MULTICHAIN_GAIN_CTL);
-+ regval &= (~(AR_PHY_9285_ANT_DIV_CTL_ALL));
-+ /*
-+ * Clear ant_fast_div_bias [14:9] since for WB195,
-+ * the main LNA is always LNA1.
-+ */
-+ regval &= (~(AR_PHY_9285_FAST_DIV_BIAS));
-+ regval |= SM(antdiv_ctrl1, AR_PHY_9285_ANT_DIV_CTL);
-+ regval |= SM(antdiv_ctrl2, AR_PHY_9285_ANT_DIV_ALT_LNACONF);
-+ regval |= SM((antdiv_ctrl2 >> 2), AR_PHY_9285_ANT_DIV_MAIN_LNACONF);
-+ regval |= SM((antdiv_ctrl1 >> 1), AR_PHY_9285_ANT_DIV_ALT_GAINTB);
-+ regval |= SM((antdiv_ctrl1 >> 2), AR_PHY_9285_ANT_DIV_MAIN_GAINTB);
-+ REG_WRITE(ah, AR_PHY_MULTICHAIN_GAIN_CTL, regval);
-+
-+ regval = REG_READ(ah, AR_PHY_CCK_DETECT);
-+ regval &= (~AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV);
-+ regval |= SM((antdiv_ctrl1 >> 3), AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV);
-+ REG_WRITE(ah, AR_PHY_CCK_DETECT, regval);
++ debugfs_create_file("tx99", S_IRUSR | S_IWUSR,
++ sc->debug.debugfs_phy, sc,
++ &fops_tx99);
++ debugfs_create_file("tx99_power", S_IRUSR | S_IWUSR,
++ sc->debug.debugfs_phy, sc,
++ &fops_tx99_power);
+}
-+
-+#endif
-+
- static void ar9002_hw_spectral_scan_config(struct ath_hw *ah,
- struct ath_spec_scan *param)
- {
-@@ -634,5 +697,9 @@ void ar9002_hw_attach_phy_ops(struct ath
- ops->spectral_scan_trigger = ar9002_hw_spectral_scan_trigger;
- ops->spectral_scan_wait = ar9002_hw_spectral_scan_wait;
-
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-+ ops->set_bt_ant_diversity = ar9002_hw_set_bt_ant_diversity;
-+#endif
-+
- ar9002_hw_set_nf_limits(ah);
- }
---- a/drivers/net/wireless/ath/ath9k/ar9002_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
-@@ -317,13 +317,15 @@
- #define AR_PHY_9285_ANT_DIV_ALT_GAINTB_S 29
- #define AR_PHY_9285_ANT_DIV_MAIN_GAINTB 0x40000000
- #define AR_PHY_9285_ANT_DIV_MAIN_GAINTB_S 30
--#define AR_PHY_9285_ANT_DIV_LNA1 2
--#define AR_PHY_9285_ANT_DIV_LNA2 1
--#define AR_PHY_9285_ANT_DIV_LNA1_PLUS_LNA2 3
--#define AR_PHY_9285_ANT_DIV_LNA1_MINUS_LNA2 0
- #define AR_PHY_9285_ANT_DIV_GAINTB_0 0
- #define AR_PHY_9285_ANT_DIV_GAINTB_1 1
-
-+#define ATH_BT_COEX_ANTDIV_CONTROL1_ENABLE 0x0b
-+#define ATH_BT_COEX_ANTDIV_CONTROL2_ENABLE 0x09
-+#define ATH_BT_COEX_ANTDIV_CONTROL1_FIXED_A 0x04
-+#define ATH_BT_COEX_ANTDIV_CONTROL2_FIXED_A 0x09
-+#define ATH_BT_COEX_ANT_DIV_SWITCH_COM 0x66666666
-+
- #define AR_PHY_EXT_CCA0 0x99b8
- #define AR_PHY_EXT_CCA0_THRESH62 0x000000FF
- #define AR_PHY_EXT_CCA0_THRESH62_S 0
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-@@ -3541,13 +3541,12 @@ static u16 ar9003_switch_com_spdt_get(st
- return le16_to_cpu(ar9003_modal_header(ah, is2ghz)->switchcomspdt);
- }
-
--
--static u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
-+u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
- {
- return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon);
- }
-
--static u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
-+u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
- {
- return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon2);
- }
-@@ -3561,6 +3560,7 @@ static u16 ar9003_hw_ant_ctrl_chain_get(
-
- static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
- {
-+ struct ath_common *common = ath9k_hw_common(ah);
- struct ath9k_hw_capabilities *pCap = &ah->caps;
- int chain;
- u32 regval, value, gpio;
-@@ -3614,6 +3614,11 @@ static void ar9003_hw_ant_ctrl_apply(str
- }
-
- value = ar9003_hw_ant_ctrl_common_2_get(ah, is2ghz);
-+ if (AR_SREV_9485(ah) && common->bt_ant_diversity) {
-+ regval &= ~AR_SWITCH_TABLE_COM2_ALL;
-+ regval |= ah->config.ant_ctrl_comm2g_switch_enable;
-+
-+ }
- REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM_2, AR_SWITCH_TABLE_COM2_ALL, value);
-
- if ((AR_SREV_9462(ah)) && (ah->rxchainmask == 0x2)) {
-@@ -3645,8 +3650,11 @@ static void ar9003_hw_ant_ctrl_apply(str
- regval &= (~AR_PHY_ANT_DIV_LNADIV);
- regval |= ((value >> 6) & 0x1) << AR_PHY_ANT_DIV_LNADIV_S;
-
-+ if (AR_SREV_9485(ah) && common->bt_ant_diversity)
-+ regval |= AR_ANT_DIV_ENABLE;
-+
- if (AR_SREV_9565(ah)) {
-- if (ah->shared_chain_lnadiv) {
-+ if (common->bt_ant_diversity) {
- regval |= (1 << AR_PHY_ANT_SW_RX_PROT_S);
- } else {
- regval &= ~(1 << AR_PHY_ANT_DIV_LNADIV_S);
-@@ -3656,10 +3664,14 @@ static void ar9003_hw_ant_ctrl_apply(str
-
- REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
-
-- /*enable fast_div */
-+ /* enable fast_div */
- regval = REG_READ(ah, AR_PHY_CCK_DETECT);
- regval &= (~AR_FAST_DIV_ENABLE);
- regval |= ((value >> 7) & 0x1) << AR_FAST_DIV_ENABLE_S;
-+
-+ if (AR_SREV_9485(ah) && common->bt_ant_diversity)
-+ regval |= AR_FAST_DIV_ENABLE;
-+
- REG_WRITE(ah, AR_PHY_CCK_DETECT, regval);
-
- if (pCap->hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) {
-@@ -3673,9 +3685,9 @@ static void ar9003_hw_ant_ctrl_apply(str
- AR_PHY_ANT_DIV_ALT_GAINTB |
- AR_PHY_ANT_DIV_MAIN_GAINTB));
- /* by default use LNA1 for the main antenna */
-- regval |= (AR_PHY_ANT_DIV_LNA1 <<
-+ regval |= (ATH_ANT_DIV_COMB_LNA1 <<
- AR_PHY_ANT_DIV_MAIN_LNACONF_S);
-- regval |= (AR_PHY_ANT_DIV_LNA2 <<
-+ regval |= (ATH_ANT_DIV_COMB_LNA2 <<
- AR_PHY_ANT_DIV_ALT_LNACONF_S);
- REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
- }
-@@ -3813,6 +3825,11 @@ static void ar9003_hw_atten_apply(struct
- else
- value = ar9003_hw_atten_chain_get_margin(ah, i, chan);
-
-+ if (ah->config.alt_mingainidx)
-+ REG_RMW_FIELD(ah, AR_PHY_EXT_ATTEN_CTL_0,
-+ AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN,
-+ value);
-+
- REG_RMW_FIELD(ah, ext_atten_reg[i],
- AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN,
- value);
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-@@ -334,6 +334,8 @@ struct ar9300_eeprom {
-
- s32 ar9003_hw_get_tx_gain_idx(struct ath_hw *ah);
- s32 ar9003_hw_get_rx_gain_idx(struct ath_hw *ah);
-+u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz);
-+u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz);
-
- u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is_2ghz);
-
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -148,6 +148,8 @@
- #define AR_PHY_SFCORR_SPUR_SUBCHNL_SD_S 28
- #define AR_PHY_EXT_CCA_THRESH62 0x007F0000
- #define AR_PHY_EXT_CCA_THRESH62_S 16
-+#define AR_PHY_EXTCHN_PWRTHR1_ANT_DIV_ALT_ANT_MINGAINIDX 0x0000FF00
-+#define AR_PHY_EXTCHN_PWRTHR1_ANT_DIV_ALT_ANT_MINGAINIDX_S 8
- #define AR_PHY_EXT_MINCCA_PWR 0x01FF0000
- #define AR_PHY_EXT_MINCCA_PWR_S 16
- #define AR_PHY_EXT_CYCPWR_THR1 0x0000FE00L
-@@ -296,11 +298,6 @@
- #define AR_PHY_ANT_DIV_MAIN_GAINTB 0x40000000
- #define AR_PHY_ANT_DIV_MAIN_GAINTB_S 30
-
--#define AR_PHY_ANT_DIV_LNA1_MINUS_LNA2 0x0
--#define AR_PHY_ANT_DIV_LNA2 0x1
--#define AR_PHY_ANT_DIV_LNA1 0x2
--#define AR_PHY_ANT_DIV_LNA1_PLUS_LNA2 0x3
--
- #define AR_PHY_EXTCHN_PWRTHR1 (AR_AGC_BASE + 0x2c)
- #define AR_PHY_EXT_CHN_WIN (AR_AGC_BASE + 0x30)
- #define AR_PHY_20_40_DET_THR (AR_AGC_BASE + 0x34)
---- a/drivers/net/wireless/ath/ath9k/debug.h
-+++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -28,9 +28,13 @@ struct fft_sample_tlv;
- #ifdef CPTCFG_ATH9K_DEBUGFS
- #define TX_STAT_INC(q, c) sc->debug.stats.txstats[q].c++
- #define RESET_STAT_INC(sc, type) sc->debug.stats.reset[type]++
-+#define ANT_STAT_INC(i, c) sc->debug.stats.ant_stats[i].c++
-+#define ANT_LNA_INC(i, c) sc->debug.stats.ant_stats[i].lna_recv_cnt[c]++;
- #else
- #define TX_STAT_INC(q, c) do { } while (0)
- #define RESET_STAT_INC(sc, type) do { } while (0)
-+#define ANT_STAT_INC(i, c) do { } while (0)
-+#define ANT_LNA_INC(i, c) do { } while (0)
- #endif
-
- enum ath_reset_type {
-@@ -243,11 +247,22 @@ struct ath_rx_stats {
- u32 rx_spectral;
- };
-
-+#define ANT_MAIN 0
-+#define ANT_ALT 1
-+
-+struct ath_antenna_stats {
-+ u32 recv_cnt;
-+ u32 rssi_avg;
-+ u32 lna_recv_cnt[4];
-+ u32 lna_attempt_cnt[4];
-+};
-+
- struct ath_stats {
- struct ath_interrupt_stats istats;
- struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];
- struct ath_rx_stats rxstats;
- struct ath_dfs_stats dfs_stats;
-+ struct ath_antenna_stats ant_stats[2];
- u32 reset[__RESET_TYPE_MAX];
- };
-
-@@ -281,10 +296,11 @@ void ath9k_sta_remove_debugfs(struct iee
- struct ieee80211_vif *vif,
- struct ieee80211_sta *sta,
- struct dentry *dir);
--
- void ath_debug_send_fft_sample(struct ath_softc *sc,
- struct fft_sample_tlv *fft_sample);
--
-+void ath9k_debug_stat_ant(struct ath_softc *sc,
-+ struct ath_hw_antcomb_conf *div_ant_conf,
-+ int main_rssi_avg, int alt_rssi_avg);
- #else
-
- #define RX_STAT_INC(c) /* NOP */
-@@ -297,12 +313,10 @@ static inline int ath9k_init_debug(struc
- static inline void ath9k_deinit_debug(struct ath_softc *sc)
- {
- }
--
- static inline void ath_debug_stat_interrupt(struct ath_softc *sc,
- enum ath9k_int status)
- {
- }
--
- static inline void ath_debug_stat_tx(struct ath_softc *sc,
- struct ath_buf *bf,
- struct ath_tx_status *ts,
-@@ -310,11 +324,16 @@ static inline void ath_debug_stat_tx(str
- unsigned int flags)
- {
- }
--
- static inline void ath_debug_stat_rx(struct ath_softc *sc,
- struct ath_rx_status *rs)
- {
- }
-+static inline void ath9k_debug_stat_ant(struct ath_softc *sc,
-+ struct ath_hw_antcomb_conf *div_ant_conf,
-+ int main_rssi_avg, int alt_rssi_avg)
-+{
-+
-+}
-
- #endif /* CPTCFG_ATH9K_DEBUGFS */
-
---- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
-+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
-@@ -812,6 +812,7 @@ static void ath9k_hw_4k_set_gain(struct
- static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
- struct ath9k_channel *chan)
- {
-+ struct ath9k_hw_capabilities *pCap = &ah->caps;
- struct modal_eep_4k_header *pModal;
- struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;
- struct base_eep_header_4k *pBase = &eep->baseEepHeader;
-@@ -858,6 +859,24 @@ static void ath9k_hw_4k_set_board_values
-
- REG_WRITE(ah, AR_PHY_CCK_DETECT, regVal);
- regVal = REG_READ(ah, AR_PHY_CCK_DETECT);
-+
-+ if (pCap->hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) {
-+ /*
-+ * If diversity combining is enabled,
-+ * set MAIN to LNA1 and ALT to LNA2 initially.
-+ */
-+ regVal = REG_READ(ah, AR_PHY_MULTICHAIN_GAIN_CTL);
-+ regVal &= (~(AR_PHY_9285_ANT_DIV_MAIN_LNACONF |
-+ AR_PHY_9285_ANT_DIV_ALT_LNACONF));
-+
-+ regVal |= (ATH_ANT_DIV_COMB_LNA1 <<
-+ AR_PHY_9285_ANT_DIV_MAIN_LNACONF_S);
-+ regVal |= (ATH_ANT_DIV_COMB_LNA2 <<
-+ AR_PHY_9285_ANT_DIV_ALT_LNACONF_S);
-+ regVal &= (~(AR_PHY_9285_FAST_DIV_BIAS));
-+ regVal |= (0 << AR_PHY_9285_FAST_DIV_BIAS_S);
-+ REG_WRITE(ah, AR_PHY_MULTICHAIN_GAIN_CTL, regVal);
-+ }
- }
-
- if (pModal->version >= 2) {
---- a/drivers/net/wireless/ath/ath9k/hw-ops.h
-+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
-@@ -78,13 +78,16 @@ static inline void ath9k_hw_antdiv_comb_
- ath9k_hw_ops(ah)->antdiv_comb_conf_set(ah, antconf);
- }
-
--static inline void ath9k_hw_antctrl_shared_chain_lnadiv(struct ath_hw *ah,
-- bool enable)
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-+
-+static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
- {
-- if (ath9k_hw_ops(ah)->antctrl_shared_chain_lnadiv)
-- ath9k_hw_ops(ah)->antctrl_shared_chain_lnadiv(ah, enable);
-+ if (ath9k_hw_ops(ah)->set_bt_ant_diversity)
-+ ath9k_hw_ops(ah)->set_bt_ant_diversity(ah, enable);
- }
-
-+#endif
-+
- /* Private hardware call ops */
-
- /* PHY ops */
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -130,29 +130,29 @@ void ath9k_debug_sync_cause(struct ath_c
-
- static void ath9k_hw_set_clockrate(struct ath_hw *ah)
- {
-- struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
- struct ath_common *common = ath9k_hw_common(ah);
-+ struct ath9k_channel *chan = ah->curchan;
- unsigned int clockrate;
-
- /* AR9287 v1.3+ uses async FIFO and runs the MAC at 117 MHz */
- if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah))
- clockrate = 117;
-- else if (!ah->curchan) /* should really check for CCK instead */
-+ else if (!chan) /* should really check for CCK instead */
- clockrate = ATH9K_CLOCK_RATE_CCK;
-- else if (conf->chandef.chan->band == IEEE80211_BAND_2GHZ)
-+ else if (IS_CHAN_2GHZ(chan))
- clockrate = ATH9K_CLOCK_RATE_2GHZ_OFDM;
- else if (ah->caps.hw_caps & ATH9K_HW_CAP_FASTCLOCK)
- clockrate = ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM;
- else
- clockrate = ATH9K_CLOCK_RATE_5GHZ_OFDM;
-
-- if (conf_is_ht40(conf))
-+ if (IS_CHAN_HT40(chan))
- clockrate *= 2;
-
- if (ah->curchan) {
-- if (IS_CHAN_HALF_RATE(ah->curchan))
-+ if (IS_CHAN_HALF_RATE(chan))
- clockrate /= 2;
-- if (IS_CHAN_QUARTER_RATE(ah->curchan))
-+ if (IS_CHAN_QUARTER_RATE(chan))
- clockrate /= 4;
- }
-
-@@ -190,10 +190,7 @@ EXPORT_SYMBOL(ath9k_hw_wait);
- void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
- int hw_delay)
- {
-- if (IS_CHAN_B(chan))
-- hw_delay = (4 * hw_delay) / 22;
-- else
-- hw_delay /= 10;
-+ hw_delay /= 10;
-
- if (IS_CHAN_HALF_RATE(chan))
- hw_delay *= 2;
-@@ -294,8 +291,7 @@ void ath9k_hw_get_channel_centers(struct
- return;
- }
-
-- if ((chan->chanmode == CHANNEL_A_HT40PLUS) ||
-- (chan->chanmode == CHANNEL_G_HT40PLUS)) {
-+ if (IS_CHAN_HT40PLUS(chan)) {
- centers->synth_center =
- chan->channel + HT40_CHANNEL_CENTER_SHIFT;
- extoff = 1;
-@@ -450,7 +446,6 @@ static void ath9k_hw_init_config(struct
- ah->config.ack_6mb = 0x0;
- ah->config.cwm_ignore_extcca = 0;
- ah->config.pcie_clock_req = 0;
-- ah->config.pcie_waen = 0;
- ah->config.analog_shiftreg = 1;
-
- for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
-@@ -1034,7 +1029,6 @@ static bool ath9k_hw_set_global_txtimeou
- void ath9k_hw_init_global_settings(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-- struct ieee80211_conf *conf = &common->hw->conf;
- const struct ath9k_channel *chan = ah->curchan;
- int acktimeout, ctstimeout, ack_offset = 0;
- int slottime;
-@@ -1069,7 +1063,7 @@ void ath9k_hw_init_global_settings(struc
- if (IS_CHAN_A_FAST_CLOCK(ah, chan))
- tx_lat += 11;
-
-- sifstime *= 2;
-+ sifstime = 32;
- ack_offset = 16;
- slottime = 13;
- } else if (IS_CHAN_QUARTER_RATE(chan)) {
-@@ -1079,7 +1073,7 @@ void ath9k_hw_init_global_settings(struc
- if (IS_CHAN_A_FAST_CLOCK(ah, chan))
- tx_lat += 22;
-
-- sifstime *= 4;
-+ sifstime = 64;
- ack_offset = 32;
- slottime = 21;
- } else {
-@@ -1109,14 +1103,12 @@ void ath9k_hw_init_global_settings(struc
- * BA frames in some implementations, but it has been found to fix ACK
- * timeout issues in other cases as well.
- */
-- if (conf->chandef.chan &&
-- conf->chandef.chan->band == IEEE80211_BAND_2GHZ &&
-+ if (IS_CHAN_2GHZ(chan) &&
- !IS_CHAN_HALF_RATE(chan) && !IS_CHAN_QUARTER_RATE(chan)) {
- acktimeout += 64 - sifstime - ah->slottime;
- ctstimeout += 48 - sifstime - ah->slottime;
- }
-
--
- ath9k_hw_set_sifs_time(ah, sifstime);
- ath9k_hw_setslottime(ah, slottime);
- ath9k_hw_set_ack_timeout(ah, acktimeout);
-@@ -1153,9 +1145,7 @@ u32 ath9k_regd_get_ctl(struct ath_regula
- {
- u32 ctl = ath_regd_get_band_ctl(reg, chan->chan->band);
-
-- if (IS_CHAN_B(chan))
-- ctl |= CTL_11B;
-- else if (IS_CHAN_G(chan))
-+ if (IS_CHAN_2GHZ(chan))
- ctl |= CTL_11G;
- else
- ctl |= CTL_11A;
-@@ -1496,16 +1486,16 @@ static bool ath9k_hw_channel_change(stru
- struct ath9k_channel *chan)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-+ struct ath9k_hw_capabilities *pCap = &ah->caps;
-+ bool band_switch = false, mode_diff = false;
-+ u8 ini_reloaded = 0;
- u32 qnum;
- int r;
-- bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA);
-- bool band_switch, mode_diff;
-- u8 ini_reloaded;
--
-- band_switch = (chan->channelFlags & (CHANNEL_2GHZ | CHANNEL_5GHZ)) !=
-- (ah->curchan->channelFlags & (CHANNEL_2GHZ |
-- CHANNEL_5GHZ));
-- mode_diff = (chan->chanmode != ah->curchan->chanmode);
-+
-+ if (pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) {
-+ band_switch = IS_CHAN_5GHZ(ah->curchan) != IS_CHAN_5GHZ(chan);
-+ mode_diff = (chan->channelFlags != ah->curchan->channelFlags);
-+ }
-
- for (qnum = 0; qnum < AR_NUM_QCU; qnum++) {
- if (ath9k_hw_numtxpending(ah, qnum)) {
-@@ -1520,11 +1510,12 @@ static bool ath9k_hw_channel_change(stru
- return false;
- }
-
-- if (edma && (band_switch || mode_diff)) {
-+ if (band_switch || mode_diff) {
- ath9k_hw_mark_phy_inactive(ah);
- udelay(5);
-
-- ath9k_hw_init_pll(ah, NULL);
-+ if (band_switch)
-+ ath9k_hw_init_pll(ah, chan);
-
- if (ath9k_hw_fast_chan_change(ah, chan, &ini_reloaded)) {
- ath_err(common, "Failed to do fast channel change\n");
-@@ -1541,22 +1532,19 @@ static bool ath9k_hw_channel_change(stru
- }
- ath9k_hw_set_clockrate(ah);
- ath9k_hw_apply_txpower(ah, chan, false);
-- ath9k_hw_rfbus_done(ah);
--
-- if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))
-- ath9k_hw_set_delta_slope(ah, chan);
-
-+ ath9k_hw_set_delta_slope(ah, chan);
- ath9k_hw_spur_mitigate_freq(ah, chan);
-
-- if (edma && (band_switch || mode_diff)) {
-- ah->ah_flags |= AH_FASTCC;
-- if (band_switch || ini_reloaded)
-- ah->eep_ops->set_board_values(ah, chan);
-+ if (band_switch || ini_reloaded)
-+ ah->eep_ops->set_board_values(ah, chan);
-
-- ath9k_hw_init_bb(ah, chan);
-+ ath9k_hw_init_bb(ah, chan);
-+ ath9k_hw_rfbus_done(ah);
-
-- if (band_switch || ini_reloaded)
-- ath9k_hw_init_cal(ah, chan);
-+ if (band_switch || ini_reloaded) {
-+ ah->ah_flags |= AH_FASTCC;
-+ ath9k_hw_init_cal(ah, chan);
- ah->ah_flags &= ~AH_FASTCC;
- }
-
-@@ -1778,16 +1766,11 @@ static void ath9k_hw_init_desc(struct at
- /*
- * Fast channel change:
- * (Change synthesizer based on channel freq without resetting chip)
-- *
-- * Don't do FCC when
-- * - Flag is not set
-- * - Chip is just coming out of full sleep
-- * - Channel to be set is same as current channel
-- * - Channel flags are different, (eg.,moving from 2GHz to 5GHz channel)
- */
- static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-+ struct ath9k_hw_capabilities *pCap = &ah->caps;
- int ret;
-
- if (AR_SREV_9280(ah) && common->bus_ops->ath_bus_type == ATH_PCI)
-@@ -1806,8 +1789,11 @@ static int ath9k_hw_do_fastcc(struct ath
- (CHANNEL_HALF | CHANNEL_QUARTER))
- goto fail;
-
-- if ((chan->channelFlags & CHANNEL_ALL) !=
-- (ah->curchan->channelFlags & CHANNEL_ALL))
-+ /*
-+ * If cross-band fcc is not supoprted, bail out if channelFlags differ.
-+ */
-+ if (!(pCap->hw_caps & ATH9K_HW_CAP_FCC_BAND_SWITCH) &&
-+ chan->channelFlags != ah->curchan->channelFlags)
- goto fail;
-
- if (!ath9k_hw_check_alive(ah))
-@@ -1870,8 +1856,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-
- ah->caldata = caldata;
- if (caldata && (chan->channel != caldata->channel ||
-- chan->channelFlags != caldata->channelFlags ||
-- chan->chanmode != caldata->chanmode)) {
-+ chan->channelFlags != caldata->channelFlags)) {
- /* Operating channel changed, reset channel calibration data */
- memset(caldata, 0, sizeof(*caldata));
- ath9k_init_nfcal_hist_buffer(ah, chan);
-@@ -1960,9 +1945,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-
- ath9k_hw_init_mfp(ah);
-
-- if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan))
-- ath9k_hw_set_delta_slope(ah, chan);
--
-+ ath9k_hw_set_delta_slope(ah, chan);
- ath9k_hw_spur_mitigate_freq(ah, chan);
- ah->eep_ops->set_board_values(ah, chan);
-
-@@ -2047,7 +2030,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-
- ath9k_hw_apply_gpio_override(ah);
-
-- if (AR_SREV_9565(ah) && ah->shared_chain_lnadiv)
-+ if (AR_SREV_9565(ah) && common->bt_ant_diversity)
- REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
-
- return 0;
-@@ -2550,34 +2533,28 @@ int ath9k_hw_fill_cap_info(struct ath_hw
- if (AR_SREV_9287_11_OR_LATER(ah) || AR_SREV_9271(ah))
- pCap->hw_caps |= ATH9K_HW_CAP_SGI_20;
-
-- if (AR_SREV_9285(ah))
-+ if (AR_SREV_9285(ah)) {
- if (ah->eep_ops->get_eeprom(ah, EEP_MODAL_VER) >= 3) {
- ant_div_ctl1 =
- ah->eep_ops->get_eeprom(ah, EEP_ANT_DIV_CTL1);
-- if ((ant_div_ctl1 & 0x1) && ((ant_div_ctl1 >> 3) & 0x1))
-+ if ((ant_div_ctl1 & 0x1) && ((ant_div_ctl1 >> 3) & 0x1)) {
- pCap->hw_caps |= ATH9K_HW_CAP_ANT_DIV_COMB;
-+ ath_info(common, "Enable LNA combining\n");
-+ }
- }
-+ }
-+
- if (AR_SREV_9300_20_OR_LATER(ah)) {
- if (ah->eep_ops->get_eeprom(ah, EEP_CHAIN_MASK_REDUCE))
- pCap->hw_caps |= ATH9K_HW_CAP_APM;
- }
-
--
- if (AR_SREV_9330(ah) || AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
- ant_div_ctl1 = ah->eep_ops->get_eeprom(ah, EEP_ANT_DIV_CTL1);
-- /*
-- * enable the diversity-combining algorithm only when
-- * both enable_lna_div and enable_fast_div are set
-- * Table for Diversity
-- * ant_div_alt_lnaconf bit 0-1
-- * ant_div_main_lnaconf bit 2-3
-- * ant_div_alt_gaintb bit 4
-- * ant_div_main_gaintb bit 5
-- * enable_ant_div_lnadiv bit 6
-- * enable_ant_fast_div bit 7
-- */
-- if ((ant_div_ctl1 >> 0x6) == 0x3)
-+ if ((ant_div_ctl1 >> 0x6) == 0x3) {
- pCap->hw_caps |= ATH9K_HW_CAP_ANT_DIV_COMB;
-+ ath_info(common, "Enable LNA combining\n");
-+ }
- }
-
- if (ath9k_hw_dfs_tested(ah))
-@@ -2610,6 +2587,13 @@ int ath9k_hw_fill_cap_info(struct ath_hw
- ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
- pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
-
-+ /*
-+ * Fast channel change across bands is available
-+ * only for AR9462 and AR9565.
-+ */
-+ if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
-+ pCap->hw_caps |= ATH9K_HW_CAP_FCC_BAND_SWITCH;
-+
- return 0;
- }
-
-@@ -2938,12 +2922,11 @@ void ath9k_hw_set_tsfadjust(struct ath_h
- }
- EXPORT_SYMBOL(ath9k_hw_set_tsfadjust);
-
--void ath9k_hw_set11nmac2040(struct ath_hw *ah)
-+void ath9k_hw_set11nmac2040(struct ath_hw *ah, struct ath9k_channel *chan)
- {
-- struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
- u32 macmode;
-
-- if (conf_is_ht40(conf) && !ah->config.cwm_ignore_extcca)
-+ if (IS_CHAN_HT40(chan) && !ah->config.cwm_ignore_extcca)
- macmode = AR_2040_JOINED_RX_CLEAR;
- else
- macmode = 0;
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -247,6 +247,8 @@ enum ath9k_hw_caps {
- ATH9K_HW_CAP_DFS = BIT(16),
- ATH9K_HW_WOW_DEVICE_CAPABLE = BIT(17),
- ATH9K_HW_CAP_PAPRD = BIT(18),
-+ ATH9K_HW_CAP_FCC_BAND_SWITCH = BIT(19),
-+ ATH9K_HW_CAP_BT_ANT_DIV = BIT(20),
- };
-
- /*
-@@ -309,8 +311,11 @@ struct ath9k_ops_config {
- u16 ani_poll_interval; /* ANI poll interval in ms */
-
- /* Platform specific config */
-+ u32 aspm_l1_fix;
- u32 xlna_gpio;
-+ u32 ant_ctrl_comm2g_switch_enable;
- bool xatten_margin_cfg;
-+ bool alt_mingainidx;
- };
-
- enum ath9k_int {
-@@ -364,36 +369,6 @@ enum ath9k_int {
- ATH9K_INT_NOCARD = 0xffffffff
- };
-
--#define CHANNEL_CCK 0x00020
--#define CHANNEL_OFDM 0x00040
--#define CHANNEL_2GHZ 0x00080
--#define CHANNEL_5GHZ 0x00100
--#define CHANNEL_PASSIVE 0x00200
--#define CHANNEL_DYN 0x00400
--#define CHANNEL_HALF 0x04000
--#define CHANNEL_QUARTER 0x08000
--#define CHANNEL_HT20 0x10000
--#define CHANNEL_HT40PLUS 0x20000
--#define CHANNEL_HT40MINUS 0x40000
--
--#define CHANNEL_A (CHANNEL_5GHZ|CHANNEL_OFDM)
--#define CHANNEL_B (CHANNEL_2GHZ|CHANNEL_CCK)
--#define CHANNEL_G (CHANNEL_2GHZ|CHANNEL_OFDM)
--#define CHANNEL_G_HT20 (CHANNEL_2GHZ|CHANNEL_HT20)
--#define CHANNEL_A_HT20 (CHANNEL_5GHZ|CHANNEL_HT20)
--#define CHANNEL_G_HT40PLUS (CHANNEL_2GHZ|CHANNEL_HT40PLUS)
--#define CHANNEL_G_HT40MINUS (CHANNEL_2GHZ|CHANNEL_HT40MINUS)
--#define CHANNEL_A_HT40PLUS (CHANNEL_5GHZ|CHANNEL_HT40PLUS)
--#define CHANNEL_A_HT40MINUS (CHANNEL_5GHZ|CHANNEL_HT40MINUS)
--#define CHANNEL_ALL \
-- (CHANNEL_OFDM| \
-- CHANNEL_CCK| \
-- CHANNEL_2GHZ | \
-- CHANNEL_5GHZ | \
-- CHANNEL_HT20 | \
-- CHANNEL_HT40PLUS | \
-- CHANNEL_HT40MINUS)
--
- #define MAX_RTT_TABLE_ENTRY 6
- #define MAX_IQCAL_MEASUREMENT 8
- #define MAX_CL_TAB_ENTRY 16
-@@ -401,8 +376,7 @@ enum ath9k_int {
-
- struct ath9k_hw_cal_data {
- u16 channel;
-- u32 channelFlags;
-- u32 chanmode;
-+ u16 channelFlags;
- int32_t CalValid;
- int8_t iCoff;
- int8_t qCoff;
-@@ -425,33 +399,34 @@ struct ath9k_hw_cal_data {
- struct ath9k_channel {
- struct ieee80211_channel *chan;
- u16 channel;
-- u32 channelFlags;
-- u32 chanmode;
-+ u16 channelFlags;
- s16 noisefloor;
- };
-
--#define IS_CHAN_G(_c) ((((_c)->channelFlags & (CHANNEL_G)) == CHANNEL_G) || \
-- (((_c)->channelFlags & CHANNEL_G_HT20) == CHANNEL_G_HT20) || \
-- (((_c)->channelFlags & CHANNEL_G_HT40PLUS) == CHANNEL_G_HT40PLUS) || \
-- (((_c)->channelFlags & CHANNEL_G_HT40MINUS) == CHANNEL_G_HT40MINUS))
--#define IS_CHAN_OFDM(_c) (((_c)->channelFlags & CHANNEL_OFDM) != 0)
--#define IS_CHAN_5GHZ(_c) (((_c)->channelFlags & CHANNEL_5GHZ) != 0)
--#define IS_CHAN_2GHZ(_c) (((_c)->channelFlags & CHANNEL_2GHZ) != 0)
--#define IS_CHAN_HALF_RATE(_c) (((_c)->channelFlags & CHANNEL_HALF) != 0)
--#define IS_CHAN_QUARTER_RATE(_c) (((_c)->channelFlags & CHANNEL_QUARTER) != 0)
-+#define CHANNEL_5GHZ BIT(0)
-+#define CHANNEL_HALF BIT(1)
-+#define CHANNEL_QUARTER BIT(2)
-+#define CHANNEL_HT BIT(3)
-+#define CHANNEL_HT40PLUS BIT(4)
-+#define CHANNEL_HT40MINUS BIT(5)
-+
-+#define IS_CHAN_5GHZ(_c) (!!((_c)->channelFlags & CHANNEL_5GHZ))
-+#define IS_CHAN_2GHZ(_c) (!IS_CHAN_5GHZ(_c))
-+
-+#define IS_CHAN_HALF_RATE(_c) (!!((_c)->channelFlags & CHANNEL_HALF))
-+#define IS_CHAN_QUARTER_RATE(_c) (!!((_c)->channelFlags & CHANNEL_QUARTER))
- #define IS_CHAN_A_FAST_CLOCK(_ah, _c) \
-- ((((_c)->channelFlags & CHANNEL_5GHZ) != 0) && \
-- ((_ah)->caps.hw_caps & ATH9K_HW_CAP_FASTCLOCK))
-+ (IS_CHAN_5GHZ(_c) && ((_ah)->caps.hw_caps & ATH9K_HW_CAP_FASTCLOCK))
-+
-+#define IS_CHAN_HT(_c) ((_c)->channelFlags & CHANNEL_HT)
-+
-+#define IS_CHAN_HT20(_c) (IS_CHAN_HT(_c) && !IS_CHAN_HT40(_c))
-
--/* These macros check chanmode and not channelFlags */
--#define IS_CHAN_B(_c) ((_c)->chanmode == CHANNEL_B)
--#define IS_CHAN_HT20(_c) (((_c)->chanmode == CHANNEL_A_HT20) || \
-- ((_c)->chanmode == CHANNEL_G_HT20))
--#define IS_CHAN_HT40(_c) (((_c)->chanmode == CHANNEL_A_HT40PLUS) || \
-- ((_c)->chanmode == CHANNEL_A_HT40MINUS) || \
-- ((_c)->chanmode == CHANNEL_G_HT40PLUS) || \
-- ((_c)->chanmode == CHANNEL_G_HT40MINUS))
--#define IS_CHAN_HT(_c) (IS_CHAN_HT20((_c)) || IS_CHAN_HT40((_c)))
-+#define IS_CHAN_HT40(_c) \
-+ (!!((_c)->channelFlags & (CHANNEL_HT40PLUS | CHANNEL_HT40MINUS)))
-+
-+#define IS_CHAN_HT40PLUS(_c) ((_c)->channelFlags & CHANNEL_HT40PLUS)
-+#define IS_CHAN_HT40MINUS(_c) ((_c)->channelFlags & CHANNEL_HT40MINUS)
-
- enum ath9k_power_mode {
- ATH9K_PM_AWAKE = 0,
-@@ -716,11 +691,14 @@ struct ath_hw_ops {
- struct ath_hw_antcomb_conf *antconf);
- void (*antdiv_comb_conf_set)(struct ath_hw *ah,
- struct ath_hw_antcomb_conf *antconf);
-- void (*antctrl_shared_chain_lnadiv)(struct ath_hw *hw, bool enable);
- void (*spectral_scan_config)(struct ath_hw *ah,
- struct ath_spec_scan *param);
- void (*spectral_scan_trigger)(struct ath_hw *ah);
- void (*spectral_scan_wait)(struct ath_hw *ah);
-+
-+#ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
-+ void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
-+#endif
- };
-
- struct ath_nf_limits {
-@@ -765,7 +743,6 @@ struct ath_hw {
- bool aspm_enabled;
- bool is_monitoring;
- bool need_an_top2_fixup;
-- bool shared_chain_lnadiv;
- u16 tx_trig_level;
-
- u32 nf_regs[6];
-@@ -1019,7 +996,7 @@ void ath9k_hw_reset_tsf(struct ath_hw *a
- void ath9k_hw_set_tsfadjust(struct ath_hw *ah, bool set);
- void ath9k_hw_init_global_settings(struct ath_hw *ah);
- u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah);
--void ath9k_hw_set11nmac2040(struct ath_hw *ah);
-+void ath9k_hw_set11nmac2040(struct ath_hw *ah, struct ath9k_channel *chan);
- void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);
- void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,
- const struct ath9k_beacon_state *bs);
---- a/drivers/net/wireless/ath/ath9k/pci.c
-+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -29,6 +29,60 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
- { PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI */
- { PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */
- { PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */
-+
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ PCI_VENDOR_ID_AZWAVE,
-+ 0x1C71),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ PCI_VENDOR_ID_FOXCONN,
-+ 0xE01F),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ 0x11AD, /* LITEON */
-+ 0x6632),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ 0x11AD, /* LITEON */
-+ 0x6642),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ PCI_VENDOR_ID_QMI,
-+ 0x0306),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ 0x185F, /* WNC */
-+ 0x309D),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ 0x10CF, /* Fujitsu */
-+ 0x147C),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ 0x10CF, /* Fujitsu */
-+ 0x147D),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002A,
-+ 0x10CF, /* Fujitsu */
-+ 0x1536),
-+ .driver_data = ATH9K_PCI_D3_L1_WAR },
-+
-+ /* AR9285 card for Asus */
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x002B,
-+ PCI_VENDOR_ID_AZWAVE,
-+ 0x2C37),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+
- { PCI_VDEVICE(ATHEROS, 0x002B) }, /* PCI-E */
- { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
- { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI */
-@@ -40,29 +94,106 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
- 0x0032,
- PCI_VENDOR_ID_AZWAVE,
- 0x2086),
-- .driver_data = ATH9K_PCI_CUS198 },
-+ .driver_data = ATH9K_PCI_CUS198 | ATH9K_PCI_BT_ANT_DIV },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
- 0x0032,
- PCI_VENDOR_ID_AZWAVE,
- 0x1237),
-- .driver_data = ATH9K_PCI_CUS198 },
-+ .driver_data = ATH9K_PCI_CUS198 | ATH9K_PCI_BT_ANT_DIV },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
- 0x0032,
- PCI_VENDOR_ID_AZWAVE,
- 0x2126),
-- .driver_data = ATH9K_PCI_CUS198 },
-+ .driver_data = ATH9K_PCI_CUS198 | ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_AZWAVE,
-+ 0x126A),
-+ .driver_data = ATH9K_PCI_CUS198 | ATH9K_PCI_BT_ANT_DIV },
-
- /* PCI-E CUS230 */
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
- 0x0032,
- PCI_VENDOR_ID_AZWAVE,
- 0x2152),
-- .driver_data = ATH9K_PCI_CUS230 },
-+ .driver_data = ATH9K_PCI_CUS230 | ATH9K_PCI_BT_ANT_DIV },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
- 0x0032,
- PCI_VENDOR_ID_FOXCONN,
- 0xE075),
-- .driver_data = ATH9K_PCI_CUS230 },
-+ .driver_data = ATH9K_PCI_CUS230 | ATH9K_PCI_BT_ANT_DIV },
-+
-+ /* WB225 */
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_ATHEROS,
-+ 0x3119),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_ATHEROS,
-+ 0x3122),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ 0x185F, /* WNC */
-+ 0x3119),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ 0x185F, /* WNC */
-+ 0x3027),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0x4105),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0x4106),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0x410D),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0x410E),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0x410F),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0xC706),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0xC680),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_SAMSUNG,
-+ 0xC708),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_LENOVO,
-+ 0x3218),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
-+ 0x0032,
-+ PCI_VENDOR_ID_LENOVO,
-+ 0x3219),
-+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
-
- { PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E AR9485 */
- { PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E AR9580 */
-@@ -229,6 +360,22 @@ static void ath_pci_aspm_init(struct ath
- return;
- }
-
-+ /*
-+ * 0x70c - Ack Frequency Register.
-+ *
-+ * Bits 27:29 - DEFAULT_L1_ENTRANCE_LATENCY.
-+ *
-+ * 000 : 1 us
-+ * 001 : 2 us
-+ * 010 : 4 us
-+ * 011 : 8 us
-+ * 100 : 16 us
-+ * 101 : 32 us
-+ * 110/111 : 64 us
-+ */
-+ if (AR_SREV_9462(ah))
-+ pci_read_config_dword(pdev, 0x70c, &ah->config.aspm_l1_fix);
-+
- pcie_capability_read_word(parent, PCI_EXP_LNKCTL, &aspm);
- if (aspm & (PCI_EXP_LNKCTL_ASPM_L0S | PCI_EXP_LNKCTL_ASPM_L1)) {
- ah->aspm_enabled = true;
---- a/drivers/net/wireless/ath/ath9k/phy.h
-+++ b/drivers/net/wireless/ath/ath9k/phy.h
-@@ -48,4 +48,11 @@
- #define AR_PHY_PLL_CONTROL 0x16180
- #define AR_PHY_PLL_MODE 0x16184
-
-+enum ath9k_ant_div_comb_lna_conf {
-+ ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2,
-+ ATH_ANT_DIV_COMB_LNA2,
-+ ATH_ANT_DIV_COMB_LNA1,
-+ ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2,
-+};
-+
- #endif
---- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
-+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
-@@ -73,7 +73,6 @@
- #include "iwl-prph.h"
-
- /* A TimeUnit is 1024 microsecond */
--#define TU_TO_JIFFIES(_tu) (usecs_to_jiffies((_tu) * 1024))
- #define MSEC_TO_TU(_msec) (_msec*1000/1024)
-
- /*
-@@ -191,8 +190,7 @@ static void iwl_mvm_te_handle_notif(stru
- iwl_mvm_te_clear_data(mvm, te_data);
- } else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) {
- te_data->running = true;
-- te_data->end_jiffies = jiffies +
-- TU_TO_JIFFIES(te_data->duration);
-+ te_data->end_jiffies = TU_TO_EXP_TIME(te_data->duration);
-
- if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
- set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);
-@@ -329,8 +327,7 @@ void iwl_mvm_protect_session(struct iwl_
- lockdep_assert_held(&mvm->mutex);
-
- if (te_data->running &&
-- time_after(te_data->end_jiffies,
-- jiffies + TU_TO_JIFFIES(min_duration))) {
-+ time_after(te_data->end_jiffies, TU_TO_EXP_TIME(min_duration))) {
- IWL_DEBUG_TE(mvm, "We have enough time in the current TE: %u\n",
- jiffies_to_msecs(te_data->end_jiffies - jiffies));
- return;
---- a/include/linux/ieee80211.h
-+++ b/include/linux/ieee80211.h
-@@ -2279,4 +2279,8 @@ static inline bool ieee80211_check_tim(c
- return !!(tim->virtual_map[index] & mask);
- }
-
-+/* convert time units */
-+#define TU_TO_JIFFIES(x) (usecs_to_jiffies((x) * 1024))
-+#define TU_TO_EXP_TIME(x) (jiffies + TU_TO_JIFFIES(x))
-+
- #endif /* LINUX_IEEE80211_H */
---- a/net/mac80211/rate.c
-+++ b/net/mac80211/rate.c
-@@ -210,7 +210,7 @@ static bool rc_no_data_or_no_ack_use_min
- !ieee80211_is_data(fc);
- }
-
--static void rc_send_low_broadcast(s8 *idx, u32 basic_rates,
-+static void rc_send_low_basicrate(s8 *idx, u32 basic_rates,
- struct ieee80211_supported_band *sband)
- {
- u8 i;
-@@ -272,28 +272,37 @@ static void __rate_control_send_low(stru
- }
-
-
--bool rate_control_send_low(struct ieee80211_sta *sta,
-+bool rate_control_send_low(struct ieee80211_sta *pubsta,
- void *priv_sta,
- struct ieee80211_tx_rate_control *txrc)
- {
- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
- struct ieee80211_supported_band *sband = txrc->sband;
-+ struct sta_info *sta;
- int mcast_rate;
-+ bool use_basicrate = false;
-
-- if (!sta || !priv_sta || rc_no_data_or_no_ack_use_min(txrc)) {
-- __rate_control_send_low(txrc->hw, sband, sta, info);
-+ if (!pubsta || !priv_sta || rc_no_data_or_no_ack_use_min(txrc)) {
-+ __rate_control_send_low(txrc->hw, sband, pubsta, info);
-
-- if (!sta && txrc->bss) {
-+ if (!pubsta && txrc->bss) {
- mcast_rate = txrc->bss_conf->mcast_rate[sband->band];
- if (mcast_rate > 0) {
- info->control.rates[0].idx = mcast_rate - 1;
- return true;
- }
-+ use_basicrate = true;
-+ } else if (pubsta) {
-+ sta = container_of(pubsta, struct sta_info, sta);
-+ if (ieee80211_vif_is_mesh(&sta->sdata->vif))
-+ use_basicrate = true;
-+ }
-
-- rc_send_low_broadcast(&info->control.rates[0].idx,
-+ if (use_basicrate)
-+ rc_send_low_basicrate(&info->control.rates[0].idx,
- txrc->bss_conf->basic_rates,
- sband);
-- }
-+
- return true;
- }
- return false;
---- a/drivers/net/wireless/ath/ath9k/Kconfig
-+++ b/drivers/net/wireless/ath/ath9k/Kconfig
-@@ -60,7 +60,7 @@ config ATH9K_AHB
-
- config ATH9K_DEBUGFS
- bool "Atheros ath9k debugging"
-- depends on ATH9K
-+ depends on ATH9K && DEBUG_FS
- select MAC80211_DEBUGFS
- depends on RELAY
- ---help---
---- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-@@ -269,13 +269,12 @@ static void ar9002_hw_configpcipowersave
- if (ah->config.pcie_waen & AR_WA_D3_L1_DISABLE)
- val |= AR_WA_D3_L1_DISABLE;
- } else {
-- if (((AR_SREV_9285(ah) ||
-- AR_SREV_9271(ah) ||
-- AR_SREV_9287(ah)) &&
-- (AR9285_WA_DEFAULT & AR_WA_D3_L1_DISABLE)) ||
-- (AR_SREV_9280(ah) &&
-- (AR9280_WA_DEFAULT & AR_WA_D3_L1_DISABLE))) {
-- val |= AR_WA_D3_L1_DISABLE;
-+ if (AR_SREV_9285(ah) || AR_SREV_9271(ah) || AR_SREV_9287(ah)) {
-+ if (AR9285_WA_DEFAULT & AR_WA_D3_L1_DISABLE)
-+ val |= AR_WA_D3_L1_DISABLE;
-+ } else if (AR_SREV_9280(ah)) {
-+ if (AR9280_WA_DEFAULT & AR_WA_D3_L1_DISABLE)
-+ val |= AR_WA_D3_L1_DISABLE;
- }
- }
-
-@@ -297,24 +296,18 @@ static void ar9002_hw_configpcipowersave
- } else {
- if (ah->config.pcie_waen) {
- val = ah->config.pcie_waen;
-- if (!power_off)
-- val &= (~AR_WA_D3_L1_DISABLE);
-+ val &= (~AR_WA_D3_L1_DISABLE);
- } else {
-- if (AR_SREV_9285(ah) ||
-- AR_SREV_9271(ah) ||
-- AR_SREV_9287(ah)) {
-+ if (AR_SREV_9285(ah) || AR_SREV_9271(ah) || AR_SREV_9287(ah)) {
- val = AR9285_WA_DEFAULT;
-- if (!power_off)
-- val &= (~AR_WA_D3_L1_DISABLE);
-- }
-- else if (AR_SREV_9280(ah)) {
-+ val &= (~AR_WA_D3_L1_DISABLE);
-+ } else if (AR_SREV_9280(ah)) {
- /*
- * For AR9280 chips, bit 22 of 0x4004
- * needs to be set.
- */
- val = AR9280_WA_DEFAULT;
-- if (!power_off)
-- val &= (~AR_WA_D3_L1_DISABLE);
-+ val &= (~AR_WA_D3_L1_DISABLE);
- } else {
- val = AR_WA_DEFAULT;
- }
-@@ -426,28 +419,10 @@ void ar9002_hw_load_ani_reg(struct ath_h
- u32 modesIndex;
- int i;
-
-- switch (chan->chanmode) {
-- case CHANNEL_A:
-- case CHANNEL_A_HT20:
-- modesIndex = 1;
-- break;
-- case CHANNEL_A_HT40PLUS:
-- case CHANNEL_A_HT40MINUS:
-- modesIndex = 2;
-- break;
-- case CHANNEL_G:
-- case CHANNEL_G_HT20:
-- case CHANNEL_B:
-- modesIndex = 4;
-- break;
-- case CHANNEL_G_HT40PLUS:
-- case CHANNEL_G_HT40MINUS:
-- modesIndex = 3;
-- break;
--
-- default:
-- return;
-- }
-+ if (IS_CHAN_5GHZ(chan))
-+ modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;
-+ else
-+ modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;
-
- ENABLE_REGWRITE_BUFFER(ah);
-
---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
-@@ -153,7 +153,7 @@ static void ar9003_hw_init_mode_regs(str
- if (!ah->is_clk_25mhz)
- INIT_INI_ARRAY(&ah->iniAdditional,
- ar9340_1p0_radio_core_40M);
-- } else if (AR_SREV_9485_11(ah)) {
-+ } else if (AR_SREV_9485_11_OR_LATER(ah)) {
- /* mac */
- INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
- ar9485_1_1_mac_core);
-@@ -424,7 +424,7 @@ static void ar9003_tx_gain_table_mode0(s
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9340Modes_lowest_ob_db_tx_gain_table_1p0);
-- else if (AR_SREV_9485_11(ah))
-+ else if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9485_modes_lowest_ob_db_tx_gain_1_1);
- else if (AR_SREV_9550(ah))
-@@ -458,7 +458,7 @@ static void ar9003_tx_gain_table_mode1(s
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9340Modes_high_ob_db_tx_gain_table_1p0);
-- else if (AR_SREV_9485_11(ah))
-+ else if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9485Modes_high_ob_db_tx_gain_1_1);
- else if (AR_SREV_9580(ah))
-@@ -492,7 +492,7 @@ static void ar9003_tx_gain_table_mode2(s
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9340Modes_low_ob_db_tx_gain_table_1p0);
-- else if (AR_SREV_9485_11(ah))
-+ else if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9485Modes_low_ob_db_tx_gain_1_1);
- else if (AR_SREV_9580(ah))
-@@ -517,7 +517,7 @@ static void ar9003_tx_gain_table_mode3(s
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9340Modes_high_power_tx_gain_table_1p0);
-- else if (AR_SREV_9485_11(ah))
-+ else if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9485Modes_high_power_tx_gain_1_1);
- else if (AR_SREV_9580(ah))
-@@ -552,7 +552,7 @@ static void ar9003_tx_gain_table_mode4(s
-
- static void ar9003_tx_gain_table_mode5(struct ath_hw *ah)
- {
-- if (AR_SREV_9485_11(ah))
-+ if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9485Modes_green_ob_db_tx_gain_1_1);
- else if (AR_SREV_9340(ah))
-@@ -571,7 +571,7 @@ static void ar9003_tx_gain_table_mode6(s
- if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0);
-- else if (AR_SREV_9485_11(ah))
-+ else if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesTxGain,
- ar9485Modes_green_spur_ob_db_tx_gain_1_1);
- else if (AR_SREV_9580(ah))
-@@ -611,7 +611,7 @@ static void ar9003_rx_gain_table_mode0(s
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
- ar9340Common_rx_gain_table_1p0);
-- else if (AR_SREV_9485_11(ah))
-+ else if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
- ar9485_common_rx_gain_1_1);
- else if (AR_SREV_9550(ah)) {
-@@ -644,7 +644,7 @@ static void ar9003_rx_gain_table_mode1(s
- else if (AR_SREV_9340(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
- ar9340Common_wo_xlna_rx_gain_table_1p0);
-- else if (AR_SREV_9485_11(ah))
-+ else if (AR_SREV_9485_11_OR_LATER(ah))
- INIT_INI_ARRAY(&ah->iniModesRxGain,
- ar9485Common_wo_xlna_rx_gain_1_1);
- else if (AR_SREV_9462_21(ah))
-@@ -745,16 +745,25 @@ static void ar9003_hw_init_mode_gain_reg
- static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
- bool power_off)
- {
-+ /*
-+ * Increase L1 Entry Latency. Some WB222 boards don't have
-+ * this change in eeprom/OTP.
-+ *
-+ */
-+ if (AR_SREV_9462(ah)) {
-+ u32 val = ah->config.aspm_l1_fix;
-+ if ((val & 0xff000000) == 0x17000000) {
-+ val &= 0x00ffffff;
-+ val |= 0x27000000;
-+ REG_WRITE(ah, 0x570c, val);
-+ }
-+ }
-+
- /* Nothing to do on restore for 11N */
- if (!power_off /* !restore */) {
- /* set bit 19 to allow forcing of pcie core into L1 state */
- REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);
--
-- /* Several PCIe massages to ensure proper behaviour */
-- if (ah->config.pcie_waen)
-- REG_WRITE(ah, AR_WA, ah->config.pcie_waen);
-- else
-- REG_WRITE(ah, AR_WA, ah->WARegVal);
-+ REG_WRITE(ah, AR_WA, ah->WARegVal);
- }
-
- /*
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -491,6 +491,7 @@ int ath9k_hw_process_rxdesc_edma(struct
- rxs->rs_rate = MS(rxsp->status1, AR_RxRate);
- rxs->rs_more = (rxsp->status2 & AR_RxMore) ? 1 : 0;
-
-+ rxs->rs_firstaggr = (rxsp->status11 & AR_RxFirstAggr) ? 1 : 0;
- rxs->rs_isaggr = (rxsp->status11 & AR_RxAggr) ? 1 : 0;
- rxs->rs_moreaggr = (rxsp->status11 & AR_RxMoreAggr) ? 1 : 0;
- rxs->rs_antenna = (MS(rxsp->status4, AR_RxAntenna) & 0x7);
---- a/drivers/net/wireless/ath/ath9k/common.c
-+++ b/drivers/net/wireless/ath/ath9k/common.c
-@@ -49,88 +49,64 @@ int ath9k_cmn_get_hw_crypto_keytype(stru
- }
- EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_keytype);
-
--static u32 ath9k_get_extchanmode(struct ieee80211_channel *chan,
-- enum nl80211_channel_type channel_type)
--{
-- u32 chanmode = 0;
--
-- switch (chan->band) {
-- case IEEE80211_BAND_2GHZ:
-- switch (channel_type) {
-- case NL80211_CHAN_NO_HT:
-- case NL80211_CHAN_HT20:
-- chanmode = CHANNEL_G_HT20;
-- break;
-- case NL80211_CHAN_HT40PLUS:
-- chanmode = CHANNEL_G_HT40PLUS;
-- break;
-- case NL80211_CHAN_HT40MINUS:
-- chanmode = CHANNEL_G_HT40MINUS;
-- break;
-- }
-- break;
-- case IEEE80211_BAND_5GHZ:
-- switch (channel_type) {
-- case NL80211_CHAN_NO_HT:
-- case NL80211_CHAN_HT20:
-- chanmode = CHANNEL_A_HT20;
-- break;
-- case NL80211_CHAN_HT40PLUS:
-- chanmode = CHANNEL_A_HT40PLUS;
-- break;
-- case NL80211_CHAN_HT40MINUS:
-- chanmode = CHANNEL_A_HT40MINUS;
-- break;
-- }
-- break;
-- default:
-- break;
-- }
--
-- return chanmode;
--}
--
- /*
- * Update internal channel flags.
- */
--void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
-- struct ieee80211_channel *chan,
-- enum nl80211_channel_type channel_type)
-+static void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
-+ struct cfg80211_chan_def *chandef)
- {
-+ struct ieee80211_channel *chan = chandef->chan;
-+ u16 flags = 0;
-+
- ichan->channel = chan->center_freq;
- ichan->chan = chan;
-
-- if (chan->band == IEEE80211_BAND_2GHZ) {
-- ichan->chanmode = CHANNEL_G;
-- ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM;
-- } else {
-- ichan->chanmode = CHANNEL_A;
-- ichan->channelFlags = CHANNEL_5GHZ | CHANNEL_OFDM;
-+ if (chan->band == IEEE80211_BAND_5GHZ)
-+ flags |= CHANNEL_5GHZ;
-+
-+ switch (chandef->width) {
-+ case NL80211_CHAN_WIDTH_5:
-+ flags |= CHANNEL_QUARTER;
-+ break;
-+ case NL80211_CHAN_WIDTH_10:
-+ flags |= CHANNEL_HALF;
-+ break;
-+ case NL80211_CHAN_WIDTH_20_NOHT:
-+ break;
-+ case NL80211_CHAN_WIDTH_20:
-+ flags |= CHANNEL_HT;
-+ break;
-+ case NL80211_CHAN_WIDTH_40:
-+ if (chandef->center_freq1 > chandef->chan->center_freq)
-+ flags |= CHANNEL_HT40PLUS | CHANNEL_HT;
-+ else
-+ flags |= CHANNEL_HT40MINUS | CHANNEL_HT;
-+ break;
-+ default:
-+ WARN_ON(1);
- }
-
-- if (channel_type != NL80211_CHAN_NO_HT)
-- ichan->chanmode = ath9k_get_extchanmode(chan, channel_type);
-+ ichan->channelFlags = flags;
- }
--EXPORT_SYMBOL(ath9k_cmn_update_ichannel);
-
- /*
- * Get the internal channel reference.
- */
--struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,
-- struct ath_hw *ah)
-+struct ath9k_channel *ath9k_cmn_get_channel(struct ieee80211_hw *hw,
-+ struct ath_hw *ah,
-+ struct cfg80211_chan_def *chandef)
- {
-- struct ieee80211_channel *curchan = hw->conf.chandef.chan;
-+ struct ieee80211_channel *curchan = chandef->chan;
- struct ath9k_channel *channel;
- u8 chan_idx;
-
- chan_idx = curchan->hw_value;
- channel = &ah->channels[chan_idx];
-- ath9k_cmn_update_ichannel(channel, curchan,
-- cfg80211_get_chandef_type(&hw->conf.chandef));
-+ ath9k_cmn_update_ichannel(channel, chandef);
-
- return channel;
- }
--EXPORT_SYMBOL(ath9k_cmn_get_curchannel);
-+EXPORT_SYMBOL(ath9k_cmn_get_channel);
-
- int ath9k_cmn_count_streams(unsigned int chainmask, int max)
- {
---- a/drivers/net/wireless/ath/ath9k/common.h
-+++ b/drivers/net/wireless/ath/ath9k/common.h
-@@ -43,11 +43,9 @@
- (((x) + ((mul)/2)) / (mul))
-
- int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);
--void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
-- struct ieee80211_channel *chan,
-- enum nl80211_channel_type channel_type);
--struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,
-- struct ath_hw *ah);
-+struct ath9k_channel *ath9k_cmn_get_channel(struct ieee80211_hw *hw,
-+ struct ath_hw *ah,
-+ struct cfg80211_chan_def *chandef);
- int ath9k_cmn_count_streams(unsigned int chainmask, int max);
- void ath9k_cmn_btcoex_bt_stomp(struct ath_common *common,
- enum ath_stomp_type stomp_type);
---- a/drivers/net/wireless/ath/ath9k/hif_usb.c
-+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -115,10 +115,10 @@ static int hif_usb_send_regout(struct hi
- cmd->skb = skb;
- cmd->hif_dev = hif_dev;
-
-- usb_fill_bulk_urb(urb, hif_dev->udev,
-- usb_sndbulkpipe(hif_dev->udev, USB_REG_OUT_PIPE),
-+ usb_fill_int_urb(urb, hif_dev->udev,
-+ usb_sndintpipe(hif_dev->udev, USB_REG_OUT_PIPE),
- skb->data, skb->len,
-- hif_usb_regout_cb, cmd);
-+ hif_usb_regout_cb, cmd, 1);
-
- usb_anchor_urb(urb, &hif_dev->regout_submitted);
- ret = usb_submit_urb(urb, GFP_KERNEL);
-@@ -723,11 +723,11 @@ static void ath9k_hif_usb_reg_in_cb(stru
- return;
- }
-
-- usb_fill_bulk_urb(urb, hif_dev->udev,
-- usb_rcvbulkpipe(hif_dev->udev,
-+ usb_fill_int_urb(urb, hif_dev->udev,
-+ usb_rcvintpipe(hif_dev->udev,
- USB_REG_IN_PIPE),
- nskb->data, MAX_REG_IN_BUF_SIZE,
-- ath9k_hif_usb_reg_in_cb, nskb);
-+ ath9k_hif_usb_reg_in_cb, nskb, 1);
- }
-
- resubmit:
-@@ -909,11 +909,11 @@ static int ath9k_hif_usb_alloc_reg_in_ur
- goto err_skb;
- }
-
-- usb_fill_bulk_urb(urb, hif_dev->udev,
-- usb_rcvbulkpipe(hif_dev->udev,
-+ usb_fill_int_urb(urb, hif_dev->udev,
-+ usb_rcvintpipe(hif_dev->udev,
- USB_REG_IN_PIPE),
- skb->data, MAX_REG_IN_BUF_SIZE,
-- ath9k_hif_usb_reg_in_cb, skb);
-+ ath9k_hif_usb_reg_in_cb, skb, 1);
-
- /* Anchor URB */
- usb_anchor_urb(urb, &hif_dev->reg_in_submitted);
-@@ -1031,9 +1031,7 @@ static int ath9k_hif_usb_download_fw(str
-
- static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev)
- {
-- struct usb_host_interface *alt = &hif_dev->interface->altsetting[0];
-- struct usb_endpoint_descriptor *endp;
-- int ret, idx;
-+ int ret;
-
- ret = ath9k_hif_usb_download_fw(hif_dev);
- if (ret) {
-@@ -1043,20 +1041,6 @@ static int ath9k_hif_usb_dev_init(struct
- return ret;
- }
-
-- /* On downloading the firmware to the target, the USB descriptor of EP4
-- * is 'patched' to change the type of the endpoint to Bulk. This will
-- * bring down CPU usage during the scan period.
-- */
-- for (idx = 0; idx < alt->desc.bNumEndpoints; idx++) {
-- endp = &alt->endpoint[idx].desc;
-- if ((endp->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-- == USB_ENDPOINT_XFER_INT) {
-- endp->bmAttributes &= ~USB_ENDPOINT_XFERTYPE_MASK;
-- endp->bmAttributes |= USB_ENDPOINT_XFER_BULK;
-- endp->bInterval = 0;
-- }
-- }
--
- /* Alloc URBs */
- ret = ath9k_hif_usb_alloc_urbs(hif_dev);
- if (ret) {
-@@ -1268,7 +1252,7 @@ static void ath9k_hif_usb_reboot(struct
- if (!buf)
- return;
-
-- ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, USB_REG_OUT_PIPE),
-+ ret = usb_interrupt_msg(udev, usb_sndintpipe(udev, USB_REG_OUT_PIPE),
- buf, 4, NULL, HZ);
- if (ret)
- dev_err(&udev->dev, "ath9k_htc: USB reboot failed\n");
---- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-@@ -24,30 +24,10 @@
- static enum htc_phymode ath9k_htc_get_curmode(struct ath9k_htc_priv *priv,
- struct ath9k_channel *ichan)
- {
-- enum htc_phymode mode;
--
-- mode = -EINVAL;
--
-- switch (ichan->chanmode) {
-- case CHANNEL_G:
-- case CHANNEL_G_HT20:
-- case CHANNEL_G_HT40PLUS:
-- case CHANNEL_G_HT40MINUS:
-- mode = HTC_MODE_11NG;
-- break;
-- case CHANNEL_A:
-- case CHANNEL_A_HT20:
-- case CHANNEL_A_HT40PLUS:
-- case CHANNEL_A_HT40MINUS:
-- mode = HTC_MODE_11NA;
-- break;
-- default:
-- break;
-- }
-+ if (IS_CHAN_5GHZ(ichan))
-+ return HTC_MODE_11NA;
-
-- WARN_ON(mode < 0);
--
-- return mode;
-+ return HTC_MODE_11NG;
- }
-
- bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,
-@@ -926,7 +906,7 @@ static int ath9k_htc_start(struct ieee80
- WMI_CMD(WMI_FLUSH_RECV_CMDID);
-
- /* setup initial channel */
-- init_channel = ath9k_cmn_get_curchannel(hw, ah);
-+ init_channel = ath9k_cmn_get_channel(hw, ah, &hw->conf.chandef);
-
- ret = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
- if (ret) {
-@@ -1203,17 +1183,12 @@ static int ath9k_htc_config(struct ieee8
-
- if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || chip_reset) {
- struct ieee80211_channel *curchan = hw->conf.chandef.chan;
-- enum nl80211_channel_type channel_type =
-- cfg80211_get_chandef_type(&hw->conf.chandef);
- int pos = curchan->hw_value;
-
- ath_dbg(common, CONFIG, "Set channel: %d MHz\n",
- curchan->center_freq);
-
-- ath9k_cmn_update_ichannel(&priv->ah->channels[pos],
-- hw->conf.chandef.chan,
-- channel_type);
--
-+ ath9k_cmn_get_channel(hw, priv->ah, &hw->conf.chandef);
- if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {
- ath_err(common, "Unable to set channel\n");
- ret = -EINVAL;
---- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-@@ -448,6 +448,7 @@ static void ath9k_htc_tx_process(struct
- struct ieee80211_conf *cur_conf = &priv->hw->conf;
- bool txok;
- int slot;
-+ int hdrlen, padsize;
-
- slot = strip_drv_header(priv, skb);
- if (slot < 0) {
-@@ -504,6 +505,15 @@ send_mac80211:
-
- ath9k_htc_tx_clear_slot(priv, slot);
-
-+ /* Remove padding before handing frame back to mac80211 */
-+ hdrlen = ieee80211_get_hdrlen_from_skb(skb);
-+
-+ padsize = hdrlen & 3;
-+ if (padsize && skb->len > hdrlen + padsize) {
-+ memmove(skb->data + padsize, skb->data, hdrlen);
-+ skb_pull(skb, padsize);
-+ }
-+
- /* Send status to mac80211 */
- ieee80211_tx_status(priv->hw, skb);
- }
---- a/drivers/net/wireless/ath/ath9k/link.c
-+++ b/drivers/net/wireless/ath/ath9k/link.c
-@@ -41,7 +41,7 @@ void ath_tx_complete_poll_work(struct wo
- txq->axq_tx_inprogress = true;
- }
- }
-- ath_txq_unlock_complete(sc, txq);
-+ ath_txq_unlock(sc, txq);
- }
-
- if (needreset) {
---- a/drivers/net/wireless/ath/ath9k/mac.c
-+++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -374,7 +374,6 @@ EXPORT_SYMBOL(ath9k_hw_releasetxqueue);
- bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-- struct ath9k_channel *chan = ah->curchan;
- struct ath9k_tx_queue_info *qi;
- u32 cwMin, chanCwMin, value;
-
-@@ -387,10 +386,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw
- ath_dbg(common, QUEUE, "Reset TX queue: %u\n", q);
-
- if (qi->tqi_cwmin == ATH9K_TXQ_USEDEFAULT) {
-- if (chan && IS_CHAN_B(chan))
-- chanCwMin = INIT_CWMIN_11B;
-- else
-- chanCwMin = INIT_CWMIN;
-+ chanCwMin = INIT_CWMIN;
-
- for (cwMin = 1; cwMin < chanCwMin; cwMin = (cwMin << 1) | 1);
- } else
-@@ -583,9 +579,9 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
- rs->rs_rate = MS(ads.ds_rxstatus0, AR_RxRate);
- rs->rs_more = (ads.ds_rxstatus1 & AR_RxMore) ? 1 : 0;
-
-+ rs->rs_firstaggr = (ads.ds_rxstatus8 & AR_RxFirstAggr) ? 1 : 0;
- rs->rs_isaggr = (ads.ds_rxstatus8 & AR_RxAggr) ? 1 : 0;
-- rs->rs_moreaggr =
-- (ads.ds_rxstatus8 & AR_RxMoreAggr) ? 1 : 0;
-+ rs->rs_moreaggr = (ads.ds_rxstatus8 & AR_RxMoreAggr) ? 1 : 0;
- rs->rs_antenna = MS(ads.ds_rxstatus3, AR_RxAntenna);
-
- /* directly mapped flags for ieee80211_rx_status */
---- a/drivers/net/wireless/ath/ath9k/mac.h
-+++ b/drivers/net/wireless/ath/ath9k/mac.h
-@@ -140,6 +140,7 @@ struct ath_rx_status {
- int8_t rs_rssi_ext1;
- int8_t rs_rssi_ext2;
- u8 rs_isaggr;
-+ u8 rs_firstaggr;
- u8 rs_moreaggr;
- u8 rs_num_delims;
- u8 rs_flags;
-@@ -569,6 +570,7 @@ struct ar5416_desc {
- #define AR_RxAggr 0x00020000
- #define AR_PostDelimCRCErr 0x00040000
- #define AR_RxStatusRsvd71 0x3ff80000
-+#define AR_RxFirstAggr 0x20000000
- #define AR_DecryptBusyErr 0x40000000
- #define AR_KeyMiss 0x80000000
-
-@@ -601,8 +603,6 @@ enum ath9k_tx_queue_flags {
- #define ATH9K_TXQ_USE_LOCKOUT_BKOFF_DIS 0x00000001
-
- #define ATH9K_DECOMP_MASK_SIZE 128
--#define ATH9K_READY_TIME_LO_BOUND 50
--#define ATH9K_READY_TIME_HI_BOUND 96
-
- enum ath9k_pkt_type {
- ATH9K_PKT_TYPE_NORMAL = 0,
---- a/drivers/net/wireless/ath/ath9k/rc.c
-+++ b/drivers/net/wireless/ath/ath9k/rc.c
-@@ -1324,8 +1324,8 @@ static void ath_rate_update(void *priv,
- ath_rc_init(sc, priv_sta);
-
- ath_dbg(ath9k_hw_common(sc->sc_ah), CONFIG,
-- "Operating HT Bandwidth changed to: %d\n",
-- cfg80211_get_chandef_type(&sc->hw->conf.chandef));
-+ "Operating Bandwidth changed to: %d\n",
-+ sc->hw->conf.chandef.width);
- }
- }
-
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -893,9 +893,9 @@
-
- #define AR_SREV_9485(_ah) \
- (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9485))
--#define AR_SREV_9485_11(_ah) \
-- (AR_SREV_9485(_ah) && \
-- ((_ah)->hw_version.macRev == AR_SREV_REVISION_9485_11))
-+#define AR_SREV_9485_11_OR_LATER(_ah) \
-+ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9485) && \
-+ ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9485_11))
- #define AR_SREV_9485_OR_LATER(_ah) \
- (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9485))
-
---- a/net/mac80211/main.c
-+++ b/net/mac80211/main.c
-@@ -101,7 +101,7 @@ static u32 ieee80211_hw_conf_chan(struct
- struct ieee80211_sub_if_data *sdata;
- struct cfg80211_chan_def chandef = {};
- u32 changed = 0;
-- int power;
-+ int power = 0;
- u32 offchannel_flag;
-
- offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
-@@ -155,16 +155,16 @@ static u32 ieee80211_hw_conf_chan(struct
- changed |= IEEE80211_CONF_CHANGE_SMPS;
- }
-
-- power = chandef.chan->max_power;
--
- rcu_read_lock();
- list_for_each_entry_rcu(sdata, &local->interfaces, list) {
- if (!rcu_access_pointer(sdata->vif.chanctx_conf))
- continue;
-- power = min(power, sdata->vif.bss_conf.txpower);
-+ power = max(power, sdata->vif.bss_conf.txpower);
- }
- rcu_read_unlock();
-
-+ power = min(power, chandef.chan->max_power);
-+
- if (local->hw.conf.power_level != power) {
- changed |= IEEE80211_CONF_CHANGE_POWER;
- local->hw.conf.power_level = power;
---- a/net/mac80211/status.c
-+++ b/net/mac80211/status.c
-@@ -180,6 +180,9 @@ static void ieee80211_frame_acked(struct
- struct ieee80211_local *local = sta->local;
- struct ieee80211_sub_if_data *sdata = sta->sdata;
-
-+ if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
-+ sta->last_rx = jiffies;
-+
- if (ieee80211_is_data_qos(mgmt->frame_control)) {
- struct ieee80211_hdr *hdr = (void *) skb->data;
- u8 *qc = ieee80211_get_qos_ctl(hdr);
---- a/drivers/net/wireless/ath/ath9k/ani.c
-+++ b/drivers/net/wireless/ath/ath9k/ani.c
-@@ -341,10 +341,9 @@ void ath9k_ani_reset(struct ath_hw *ah,
- aniState->cckNoiseImmunityLevel !=
- ATH9K_ANI_CCK_DEF_LEVEL) {
- ath_dbg(common, ANI,
-- "Restore defaults: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",
-+ "Restore defaults: opmode %u chan %d Mhz is_scanning=%d ofdm:%d cck:%d\n",
- ah->opmode,
- chan->channel,
-- chan->channelFlags,
- is_scanning,
- aniState->ofdmNoiseImmunityLevel,
- aniState->cckNoiseImmunityLevel);
-@@ -357,10 +356,9 @@ void ath9k_ani_reset(struct ath_hw *ah,
- * restore historical levels for this channel
- */
- ath_dbg(common, ANI,
-- "Restore history: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",
-+ "Restore history: opmode %u chan %d Mhz is_scanning=%d ofdm:%d cck:%d\n",
- ah->opmode,
- chan->channel,
-- chan->channelFlags,
- is_scanning,
- aniState->ofdmNoiseImmunityLevel,
- aniState->cckNoiseImmunityLevel);
---- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
-@@ -33,15 +33,12 @@ static bool ar9002_hw_is_cal_supported(s
- bool supported = false;
- switch (ah->supp_cals & cal_type) {
- case IQ_MISMATCH_CAL:
-- /* Run IQ Mismatch for non-CCK only */
-- if (!IS_CHAN_B(chan))
-- supported = true;
-+ supported = true;
- break;
- case ADC_GAIN_CAL:
- case ADC_DC_CAL:
- /* Run ADC Gain Cal for non-CCK & non 2GHz-HT20 only */
-- if (!IS_CHAN_B(chan) &&
-- !((IS_CHAN_2GHZ(chan) || IS_CHAN_A_FAST_CLOCK(ah, chan)) &&
-+ if (!((IS_CHAN_2GHZ(chan) || IS_CHAN_A_FAST_CLOCK(ah, chan)) &&
- IS_CHAN_HT20(chan)))
- supported = true;
- break;
---- a/drivers/net/wireless/ath/ath9k/calib.c
-+++ b/drivers/net/wireless/ath/ath9k/calib.c
-@@ -186,7 +186,6 @@ void ath9k_hw_reset_calibration(struct a
- bool ath9k_hw_reset_calvalid(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
-- struct ieee80211_conf *conf = &common->hw->conf;
- struct ath9k_cal_list *currCal = ah->cal_list_curr;
-
- if (!ah->caldata)
-@@ -208,7 +207,7 @@ bool ath9k_hw_reset_calvalid(struct ath_
- return true;
-
- ath_dbg(common, CALIBRATE, "Resetting Cal %d state for channel %u\n",
-- currCal->calData->calType, conf->chandef.chan->center_freq);
-+ currCal->calData->calType, ah->curchan->chan->center_freq);
-
- ah->caldata->CalValid &= ~currCal->calData->calType;
- currCal->calState = CAL_WAITING;
-@@ -242,7 +241,6 @@ void ath9k_hw_loadnf(struct ath_hw *ah,
- int32_t val;
- u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
- struct ath_common *common = ath9k_hw_common(ah);
-- struct ieee80211_conf *conf = &common->hw->conf;
- s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
-
- if (ah->caldata)
-@@ -252,7 +250,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah,
- if (chainmask & (1 << i)) {
- s16 nfval;
-
-- if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-+ if ((i >= AR5416_MAX_CHAINS) && !IS_CHAN_HT40(chan))
- continue;
-
- if (h)
-@@ -314,7 +312,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah,
- ENABLE_REGWRITE_BUFFER(ah);
- for (i = 0; i < NUM_NF_READINGS; i++) {
- if (chainmask & (1 << i)) {
-- if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-+ if ((i >= AR5416_MAX_CHAINS) && !IS_CHAN_HT40(chan))
- continue;
-
- val = REG_READ(ah, ah->nf_regs[i]);
-@@ -408,7 +406,6 @@ void ath9k_init_nfcal_hist_buffer(struct
-
- ah->caldata->channel = chan->channel;
- ah->caldata->channelFlags = chan->channelFlags;
-- ah->caldata->chanmode = chan->chanmode;
- h = ah->caldata->nfCalHist;
- default_nf = ath9k_hw_get_default_nf(ah, chan);
- for (i = 0; i < NUM_NF_READINGS; i++) {
---- a/drivers/net/wireless/ath/ath9k/mci.c
-+++ b/drivers/net/wireless/ath/ath9k/mci.c
-@@ -661,9 +661,9 @@ void ath9k_mci_update_wlan_channels(stru
- chan_start = wlan_chan - 10;
- chan_end = wlan_chan + 10;
-
-- if (chan->chanmode == CHANNEL_G_HT40PLUS)
-+ if (IS_CHAN_HT40PLUS(chan))
- chan_end += 20;
-- else if (chan->chanmode == CHANNEL_G_HT40MINUS)
-+ else if (IS_CHAN_HT40MINUS(chan))
- chan_start -= 20;
-
- /* adjust side band */
-@@ -707,11 +707,11 @@ void ath9k_mci_set_txpower(struct ath_so
-
- if (setchannel) {
- struct ath9k_hw_cal_data *caldata = &sc->caldata;
-- if ((caldata->chanmode == CHANNEL_G_HT40PLUS) &&
-+ if (IS_CHAN_HT40PLUS(ah->curchan) &&
- (ah->curchan->channel > caldata->channel) &&
- (ah->curchan->channel <= caldata->channel + 20))
- return;
-- if ((caldata->chanmode == CHANNEL_G_HT40MINUS) &&
-+ if (IS_CHAN_HT40MINUS(ah->curchan) &&
- (ah->curchan->channel < caldata->channel) &&
- (ah->curchan->channel >= caldata->channel - 20))
- return;
---- a/drivers/net/wireless/ath/ath5k/base.c
-+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -1628,15 +1628,15 @@ ath5k_tx_frame_completed(struct ath5k_hw
- ah->stats.tx_bytes_count += skb->len;
- info = IEEE80211_SKB_CB(skb);
-
-+ size = min_t(int, sizeof(info->status.rates), sizeof(bf->rates));
-+ memcpy(info->status.rates, bf->rates, size);
-+
- tries[0] = info->status.rates[0].count;
- tries[1] = info->status.rates[1].count;
- tries[2] = info->status.rates[2].count;
-
- ieee80211_tx_info_clear_status(info);
-
-- size = min_t(int, sizeof(info->status.rates), sizeof(bf->rates));
-- memcpy(info->status.rates, bf->rates, size);
--
- for (i = 0; i < ts->ts_final_idx; i++) {
- struct ieee80211_tx_rate *r =
- &info->status.rates[i];
diff --git a/package/kernel/mac80211/patches/301-pending_work-rt2x00.patch b/package/kernel/mac80211/patches/301-pending_work-rt2x00.patch
deleted file mode 100644
index 947538baf66da5e05a6e18d9856bf45adc2256b7..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/301-pending_work-rt2x00.patch
+++ /dev/null
@@ -1,3348 +0,0 @@
-Contains the following changes from wireless-testing/master-2013-08-26:
-
- commit 8951b79a4e6d8228babf56ae79a345e4abc5ac82
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 11:25:52 2013 +0200
-
- rt2x00: rt2800lib: introduce rt2800_eeprom_word enum
-
- commit 3e38d3daf881a78ac13e93504a8ac5777040797e
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 11:25:53 2013 +0200
-
- rt2x00: rt2800lib: introduce local EEPROM access functions
-
- commit 022138ca93f016374d5d3f69c070c75596c5ecac
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 11:25:54 2013 +0200
-
- rt2x00: rt2800lib: introduce rt2800_eeprom_read_from_array helper
-
- commit 379448fe34e289fdcc473399d4f6cac19e757fb8
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 11:25:55 2013 +0200
-
- rt2x00: rt2800lib: introduce rt2800_eeprom_word_index helper
-
- commit fa31d157f83ef71b6530aacf0400bafe7816acbd
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 11:25:56 2013 +0200
-
- rt2x00: rt2800lib: add EEPROM map for the RT3593 chipset
-
- commit 1706d15d82f4a579119b419cd673987af60f1d9b
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:16 2013 +0200
-
- rt2x00: rt2800lib: add MAC register initialization for RT3593
-
- commit b189a1814135bc52f516ca61a1fa161914d57a54
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:17 2013 +0200
-
- rt2x00: rt2800lib: add BBP register initialization for RT3593
-
- commit ab7078ac3d920e0d49b17e92f327f3ada25600e8
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:18 2013 +0200
-
- rt2x00: rt2800lib: add RFCSR register initialization for RT3593
-
- commit d63f7e8ca560dc9a76a15c323cb9cba14b25f430
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:19 2013 +0200
-
- rt2x00: rt2800lib: add BBP post initialization for RT3593
-
- commit 34542ff5a665061d548c3f860807df341f718adf
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:20 2013 +0200
-
- rt2x00: rt2800lib: add TX power configuration for RT3593
-
- commit 4788ac1e4842d8ef46ee620cfccf96c426043177
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:21 2013 +0200
-
- rt2x00: rt2800lib: fix BBP1_TX_ANTENNA field configuration for 3T devices
-
- commit 5cddb3c2d5102d9a6b1b809e1518da54c8be8296
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:22 2013 +0200
-
- rt2x00: rt2800lib: fix antenna configuration for RT3593
-
- commit 97aa03f15e83174df74aa468eea127c5cee480f0
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:23 2013 +0200
-
- rt2x00: rt2800lib: add rt2800_txpower_to_dev helper
-
- commit fc739cfe0f305647677edbf99a76d9ece96e3795
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:24 2013 +0200
-
- rt2x00: rt2800lib: fix default TX power values for RT3593
-
- commit a3f1625dae58f06c5df1ec0094b275e9a46fd8b3
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:25 2013 +0200
-
- rt2x00: rt2800lib: introduce rt2800_get_txmixer_gain_{24,5}g helpers
-
- commit 6316c786cc8aff762530ea740233bf2da10fea33
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:26 2013 +0200
-
- rt2x00: rt2800lib: hardcode TX mixer gain values for RT3593
-
- commit f36bb0ca1be5bcb7148ad32263626f8609dfc0d7
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:27 2013 +0200
-
- rt2x00: rt2800lib: fix LNA_A[12] gain values for RT3593
-
- commit c0a14369ebd3e7940e70e397ecc3dd7eaf81e9ab
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:28 2013 +0200
-
- rt2x00: rt2800lib: add default_power3 field for three-chain devices
-
- commit c8b9d3dc83cab569de6054a10e355a143e2b52a0
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:29 2013 +0200
-
- rt2x00: rt2800lib: add rf_vals for RF3053
-
- commit f42b046578efb018064302fd9b66586f5da7d75b
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:30 2013 +0200
-
- rt2x00: rt2800lib: add channel configuration for RF3053
-
- commit 1095df07bfc5924e100f1748e6ebc9e5a5881565
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:31 2013 +0200
-
- rt2x00: rt2800lib: enable VCO recalibration for RF3053
-
- commit 0f5af26a49c8d6a50ecec2f1b66174069c9f9581
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:32 2013 +0200
-
- rt2x00: rt2800lib: enable RF3053 support
-
- commit 2dc2bd2f8aa8eb79184fb3c7e5f530006500897f
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:33 2013 +0200
-
- rt2x00: rt2800lib: enable RT3593 support
-
- commit 65d3c0d5cffb9f1227927544e418a9ac231eae42
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:34 2013 +0200
-
- rt2x00: rt2800usb: use correct [RT]XWI size for RT3593
-
- commit d02433d15566f542e42e3c469dfade0de332dc7b
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Mon Jul 8 16:08:35 2013 +0200
-
- rt2x00: rt2800usb: add USB device ID for Linksys AE3000
-
- commit 637065267eab4817c0b06cbf3c7fc80842acab99
- Author: Xose Vazquez Perez <xose.vazquez@gmail.com>
- Date: Tue Jul 23 14:55:15 2013 +0200
-
- wireless: rt2x00: rt2800usb: add RT3573 devices
-
- commit ae1b1c5dcdef1ebd4b37a7d56ad767add757a660
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Fri Aug 16 10:23:29 2013 +0200
-
- rt2x00: rt2800lib: introduce rt2800_get_txwi_rxwi_size helper
-
- commit 41caa760d6acaf47cbd44c3d78307fb9be089111
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Fri Aug 16 10:23:30 2013 +0200
-
- rt2x00: rt2800pci: fix AUX_CTRL register setup for RT3090/3390/3593/5592
-
- commit 91a3fa39ddf2f85a15cb20ccc3a54c1f0497af1e
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 00:15:49 2013 +0200
-
- rt2x00: rt2800: rename HW_BEACON_OFFSET macro
-
- commit 77f7c0f3b8f2d464e841c5c35f3da8b4999a885c
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 00:15:50 2013 +0200
-
- rt2x00: rt2800lib: pass beacon index to rt2800_clear_beacon_register
-
- commit c1fada4e5e53d88a8edd3ff01cee9d316cbf6025
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 14:09:28 2013 +0200
-
- rt2x00: rt2800lib: fix frequency offset boundary calculation
-
- commit 6af1bdccabe956a08a37f2ae049d37307ec0c91c
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 14:09:29 2013 +0200
-
- rt2x00: rt2800lib: optimize frequency offset adjustment
-
- commit 76773f301f2210dcc20c466aebda7118062673eb
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 14:09:30 2013 +0200
-
- rt2x00: rt2800lib: use a MCU command for frequency adjustment on USB devices
-
- commit 8d38eca8e089179b6858ca5f3ea03f571a5892a5
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 14:09:31 2013 +0200
-
- rt2x00: rt2800lib: use step-by-step frequency offset adjustment on MMIO devices
-
- commit 3f1b8739a498c7570ca2fae6c49fd1561ef2358c
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 14:09:32 2013 +0200
-
- rt2x00: rt2800lib: move rt2800_adjust_freq_offset function
-
- commit e979a8ab204edbf7b0815162109ee9c85e4d7ea5
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Sat Aug 17 14:09:33 2013 +0200
-
- rt2x00: rt2800lib: adjust frequency offset for RF3053
-
- commit 21c6af6b69b609b7934caaccda1b4535dceb402c
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Thu Aug 22 20:53:21 2013 +0200
-
- rt2x00: rt2800lib: add rt2800_hw_beacon_base helper
-
- commit 634b80595fef79071d82bc231b7f82c4f808a1e8
- Author: Gabor Juhos <juhosg@openwrt.org>
- Date: Thu Aug 22 20:53:22 2013 +0200
-
- rt2x00: rt2800lib: don't hardcode beacon offsets
-
- commit 6e956da2027c767859128b9bfef085cf2a8e233b
- Author: Stanislaw Gruszka <sgruszka@redhat.com>
- Date: Mon Aug 26 15:18:53 2013 +0200
-
- rt2800: fix wrong TX power compensation
-
----
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -174,6 +174,12 @@ config RT2800USB_RT35XX
- rt2800usb driver.
- Supported chips: RT3572
-
-+config RT2800USB_RT3573
-+ bool "rt2800usb - Include support for rt3573 devices (EXPERIMENTAL)"
-+ ---help---
-+ This enables support for RT3573 chipset based wireless USB devices
-+ in the rt2800usb driver.
-+
- config RT2800USB_RT53XX
- bool "rt2800usb - Include support for rt53xx devices (EXPERIMENTAL)"
- ---help---
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -88,6 +88,7 @@
- #define REV_RT3071E 0x0211
- #define REV_RT3090E 0x0211
- #define REV_RT3390E 0x0211
-+#define REV_RT3593E 0x0211
- #define REV_RT5390F 0x0502
- #define REV_RT5390R 0x1502
- #define REV_RT5592C 0x0221
-@@ -1082,6 +1083,15 @@
- #define TX_PWR_CFG_0_9MBS FIELD32(0x00f00000)
- #define TX_PWR_CFG_0_12MBS FIELD32(0x0f000000)
- #define TX_PWR_CFG_0_18MBS FIELD32(0xf0000000)
-+/* bits for 3T devices */
-+#define TX_PWR_CFG_0_CCK1_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_0_CCK1_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_0_CCK5_CH0 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_0_CCK5_CH1 FIELD32(0x0000f000)
-+#define TX_PWR_CFG_0_OFDM6_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_0_OFDM6_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_0_OFDM12_CH0 FIELD32(0x0f000000)
-+#define TX_PWR_CFG_0_OFDM12_CH1 FIELD32(0xf0000000)
-
- /*
- * TX_PWR_CFG_1:
-@@ -1095,6 +1105,15 @@
- #define TX_PWR_CFG_1_MCS1 FIELD32(0x00f00000)
- #define TX_PWR_CFG_1_MCS2 FIELD32(0x0f000000)
- #define TX_PWR_CFG_1_MCS3 FIELD32(0xf0000000)
-+/* bits for 3T devices */
-+#define TX_PWR_CFG_1_OFDM24_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_1_OFDM24_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_1_OFDM48_CH0 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_1_OFDM48_CH1 FIELD32(0x0000f000)
-+#define TX_PWR_CFG_1_MCS0_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_1_MCS0_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_1_MCS2_CH0 FIELD32(0x0f000000)
-+#define TX_PWR_CFG_1_MCS2_CH1 FIELD32(0xf0000000)
-
- /*
- * TX_PWR_CFG_2:
-@@ -1108,6 +1127,15 @@
- #define TX_PWR_CFG_2_MCS9 FIELD32(0x00f00000)
- #define TX_PWR_CFG_2_MCS10 FIELD32(0x0f000000)
- #define TX_PWR_CFG_2_MCS11 FIELD32(0xf0000000)
-+/* bits for 3T devices */
-+#define TX_PWR_CFG_2_MCS4_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_2_MCS4_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_2_MCS6_CH0 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_2_MCS6_CH1 FIELD32(0x0000f000)
-+#define TX_PWR_CFG_2_MCS8_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_2_MCS8_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_2_MCS10_CH0 FIELD32(0x0f000000)
-+#define TX_PWR_CFG_2_MCS10_CH1 FIELD32(0xf0000000)
-
- /*
- * TX_PWR_CFG_3:
-@@ -1121,6 +1149,15 @@
- #define TX_PWR_CFG_3_UKNOWN2 FIELD32(0x00f00000)
- #define TX_PWR_CFG_3_UKNOWN3 FIELD32(0x0f000000)
- #define TX_PWR_CFG_3_UKNOWN4 FIELD32(0xf0000000)
-+/* bits for 3T devices */
-+#define TX_PWR_CFG_3_MCS12_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_3_MCS12_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_3_MCS14_CH0 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_3_MCS14_CH1 FIELD32(0x0000f000)
-+#define TX_PWR_CFG_3_STBC0_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_3_STBC0_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_3_STBC2_CH0 FIELD32(0x0f000000)
-+#define TX_PWR_CFG_3_STBC2_CH1 FIELD32(0xf0000000)
-
- /*
- * TX_PWR_CFG_4:
-@@ -1130,6 +1167,11 @@
- #define TX_PWR_CFG_4_UKNOWN6 FIELD32(0x000000f0)
- #define TX_PWR_CFG_4_UKNOWN7 FIELD32(0x00000f00)
- #define TX_PWR_CFG_4_UKNOWN8 FIELD32(0x0000f000)
-+/* bits for 3T devices */
-+#define TX_PWR_CFG_3_STBC4_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_3_STBC4_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_3_STBC6_CH0 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_3_STBC6_CH1 FIELD32(0x0000f000)
-
- /*
- * TX_PIN_CFG:
-@@ -1451,6 +1493,81 @@
- */
- #define EXP_ACK_TIME 0x1380
-
-+/* TX_PWR_CFG_5 */
-+#define TX_PWR_CFG_5 0x1384
-+#define TX_PWR_CFG_5_MCS16_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_5_MCS16_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_5_MCS16_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_5_MCS18_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_5_MCS18_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_5_MCS18_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_6 */
-+#define TX_PWR_CFG_6 0x1388
-+#define TX_PWR_CFG_6_MCS20_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_6_MCS20_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_6_MCS20_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_6_MCS22_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_6_MCS22_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_6_MCS22_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_0_EXT */
-+#define TX_PWR_CFG_0_EXT 0x1390
-+#define TX_PWR_CFG_0_EXT_CCK1_CH2 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_0_EXT_CCK5_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_0_EXT_OFDM6_CH2 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_0_EXT_OFDM12_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_1_EXT */
-+#define TX_PWR_CFG_1_EXT 0x1394
-+#define TX_PWR_CFG_1_EXT_OFDM24_CH2 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_1_EXT_OFDM48_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_1_EXT_MCS0_CH2 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_1_EXT_MCS2_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_2_EXT */
-+#define TX_PWR_CFG_2_EXT 0x1398
-+#define TX_PWR_CFG_2_EXT_MCS4_CH2 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_2_EXT_MCS6_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_2_EXT_MCS8_CH2 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_2_EXT_MCS10_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_3_EXT */
-+#define TX_PWR_CFG_3_EXT 0x139c
-+#define TX_PWR_CFG_3_EXT_MCS12_CH2 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_3_EXT_MCS14_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_3_EXT_STBC0_CH2 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_3_EXT_STBC2_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_4_EXT */
-+#define TX_PWR_CFG_4_EXT 0x13a0
-+#define TX_PWR_CFG_4_EXT_STBC4_CH2 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_4_EXT_STBC6_CH2 FIELD32(0x00000f00)
-+
-+/* TX_PWR_CFG_7 */
-+#define TX_PWR_CFG_7 0x13d4
-+#define TX_PWR_CFG_7_OFDM54_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_7_OFDM54_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_7_OFDM54_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_7_MCS7_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_7_MCS7_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_7_MCS7_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_8 */
-+#define TX_PWR_CFG_8 0x13d8
-+#define TX_PWR_CFG_8_MCS15_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_8_MCS15_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_8_MCS15_CH2 FIELD32(0x00000f00)
-+#define TX_PWR_CFG_8_MCS23_CH0 FIELD32(0x000f0000)
-+#define TX_PWR_CFG_8_MCS23_CH1 FIELD32(0x00f00000)
-+#define TX_PWR_CFG_8_MCS23_CH2 FIELD32(0x0f000000)
-+
-+/* TX_PWR_CFG_9 */
-+#define TX_PWR_CFG_9 0x13dc
-+#define TX_PWR_CFG_9_STBC7_CH0 FIELD32(0x0000000f)
-+#define TX_PWR_CFG_9_STBC7_CH1 FIELD32(0x000000f0)
-+#define TX_PWR_CFG_9_STBC7_CH2 FIELD32(0x00000f00)
-+
- /*
- * RX_FILTER_CFG: RX configuration register.
- */
-@@ -1902,11 +2019,13 @@ struct mac_iveiv_entry {
- #define HW_BEACON_BASE6 0x5dc0
- #define HW_BEACON_BASE7 0x5bc0
-
--#define HW_BEACON_OFFSET(__index) \
-+#define HW_BEACON_BASE(__index) \
- (((__index) < 4) ? (HW_BEACON_BASE0 + (__index * 0x0200)) : \
- (((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \
- (HW_BEACON_BASE6 - ((__index - 6) * 0x0200))))
-
-+#define BEACON_BASE_TO_OFFSET(_base) (((_base) - 0x4000) / 64)
-+
- /*
- * BBP registers.
- * The wordsize of the BBP is 8 bits.
-@@ -1975,6 +2094,10 @@ struct mac_iveiv_entry {
- #define BBP109_TX0_POWER FIELD8(0x0f)
- #define BBP109_TX1_POWER FIELD8(0xf0)
-
-+/* BBP 110 */
-+#define BBP110_TX2_POWER FIELD8(0x0f)
-+
-+
- /*
- * BBP 138: Unknown
- */
-@@ -2024,6 +2147,12 @@ struct mac_iveiv_entry {
- #define RFCSR3_PA2_CASCODE_BIAS_CCKK FIELD8(0x80)
- /* Bits for RF3290/RF5360/RF5370/RF5372/RF5390/RF5392 */
- #define RFCSR3_VCOCAL_EN FIELD8(0x80)
-+/* Bits for RF3050 */
-+#define RFCSR3_BIT1 FIELD8(0x02)
-+#define RFCSR3_BIT2 FIELD8(0x04)
-+#define RFCSR3_BIT3 FIELD8(0x08)
-+#define RFCSR3_BIT4 FIELD8(0x10)
-+#define RFCSR3_BIT5 FIELD8(0x20)
-
- /*
- * FRCSR 5:
-@@ -2036,6 +2165,8 @@ struct mac_iveiv_entry {
- #define RFCSR6_R1 FIELD8(0x03)
- #define RFCSR6_R2 FIELD8(0x40)
- #define RFCSR6_TXDIV FIELD8(0x0c)
-+/* bits for RF3053 */
-+#define RFCSR6_VCO_IC FIELD8(0xc0)
-
- /*
- * RFCSR 7:
-@@ -2060,7 +2191,12 @@ struct mac_iveiv_entry {
- * RFCSR 11:
- */
- #define RFCSR11_R FIELD8(0x03)
-+#define RFCSR11_PLL_MOD FIELD8(0x0c)
- #define RFCSR11_MOD FIELD8(0xc0)
-+/* bits for RF3053 */
-+/* TODO: verify RFCSR11_MOD usage on other chips */
-+#define RFCSR11_PLL_IDOH FIELD8(0x40)
-+
-
- /*
- * RFCSR 12:
-@@ -2092,6 +2228,10 @@ struct mac_iveiv_entry {
- #define RFCSR17_R FIELD8(0x20)
- #define RFCSR17_CODE FIELD8(0x7f)
-
-+/* RFCSR 18 */
-+#define RFCSR18_XO_TUNE_BYPASS FIELD8(0x40)
-+
-+
- /*
- * RFCSR 20:
- */
-@@ -2152,6 +2292,12 @@ struct mac_iveiv_entry {
- #define RFCSR31_RX_H20M FIELD8(0x20)
- #define RFCSR31_RX_CALIB FIELD8(0x7f)
-
-+/* RFCSR 32 bits for RF3053 */
-+#define RFCSR32_TX_AGC_FC FIELD8(0xf8)
-+
-+/* RFCSR 36 bits for RF3053 */
-+#define RFCSR36_RF_BS FIELD8(0x80)
-+
- /*
- * RFCSR 38:
- */
-@@ -2160,6 +2306,7 @@ struct mac_iveiv_entry {
- /*
- * RFCSR 39:
- */
-+#define RFCSR39_RX_DIV FIELD8(0x40)
- #define RFCSR39_RX_LO2_EN FIELD8(0x80)
-
- /*
-@@ -2167,12 +2314,36 @@ struct mac_iveiv_entry {
- */
- #define RFCSR49_TX FIELD8(0x3f)
- #define RFCSR49_EP FIELD8(0xc0)
-+/* bits for RT3593 */
-+#define RFCSR49_TX_LO1_IC FIELD8(0x1c)
-+#define RFCSR49_TX_DIV FIELD8(0x20)
-
- /*
- * RFCSR 50:
- */
- #define RFCSR50_TX FIELD8(0x3f)
- #define RFCSR50_EP FIELD8(0xc0)
-+/* bits for RT3593 */
-+#define RFCSR50_TX_LO1_EN FIELD8(0x20)
-+#define RFCSR50_TX_LO2_EN FIELD8(0x10)
-+
-+/* RFCSR 51 */
-+/* bits for RT3593 */
-+#define RFCSR51_BITS01 FIELD8(0x03)
-+#define RFCSR51_BITS24 FIELD8(0x1c)
-+#define RFCSR51_BITS57 FIELD8(0xe0)
-+
-+#define RFCSR53_TX_POWER FIELD8(0x3f)
-+#define RFCSR53_UNKNOWN FIELD8(0xc0)
-+
-+#define RFCSR54_TX_POWER FIELD8(0x3f)
-+#define RFCSR54_UNKNOWN FIELD8(0xc0)
-+
-+#define RFCSR55_TX_POWER FIELD8(0x3f)
-+#define RFCSR55_UNKNOWN FIELD8(0xc0)
-+
-+#define RFCSR57_DRV_CC FIELD8(0xfc)
-+
-
- /*
- * RF registers
-@@ -2206,28 +2377,67 @@ struct mac_iveiv_entry {
- * The wordsize of the EEPROM is 16 bits.
- */
-
--/*
-- * Chip ID
-- */
--#define EEPROM_CHIP_ID 0x0000
-+enum rt2800_eeprom_word {
-+ EEPROM_CHIP_ID = 0,
-+ EEPROM_VERSION,
-+ EEPROM_MAC_ADDR_0,
-+ EEPROM_MAC_ADDR_1,
-+ EEPROM_MAC_ADDR_2,
-+ EEPROM_NIC_CONF0,
-+ EEPROM_NIC_CONF1,
-+ EEPROM_FREQ,
-+ EEPROM_LED_AG_CONF,
-+ EEPROM_LED_ACT_CONF,
-+ EEPROM_LED_POLARITY,
-+ EEPROM_NIC_CONF2,
-+ EEPROM_LNA,
-+ EEPROM_RSSI_BG,
-+ EEPROM_RSSI_BG2,
-+ EEPROM_TXMIXER_GAIN_BG,
-+ EEPROM_RSSI_A,
-+ EEPROM_RSSI_A2,
-+ EEPROM_TXMIXER_GAIN_A,
-+ EEPROM_EIRP_MAX_TX_POWER,
-+ EEPROM_TXPOWER_DELTA,
-+ EEPROM_TXPOWER_BG1,
-+ EEPROM_TXPOWER_BG2,
-+ EEPROM_TSSI_BOUND_BG1,
-+ EEPROM_TSSI_BOUND_BG2,
-+ EEPROM_TSSI_BOUND_BG3,
-+ EEPROM_TSSI_BOUND_BG4,
-+ EEPROM_TSSI_BOUND_BG5,
-+ EEPROM_TXPOWER_A1,
-+ EEPROM_TXPOWER_A2,
-+ EEPROM_TSSI_BOUND_A1,
-+ EEPROM_TSSI_BOUND_A2,
-+ EEPROM_TSSI_BOUND_A3,
-+ EEPROM_TSSI_BOUND_A4,
-+ EEPROM_TSSI_BOUND_A5,
-+ EEPROM_TXPOWER_BYRATE,
-+ EEPROM_BBP_START,
-+
-+ /* IDs for extended EEPROM format used by three-chain devices */
-+ EEPROM_EXT_LNA2,
-+ EEPROM_EXT_TXPOWER_BG3,
-+ EEPROM_EXT_TXPOWER_A3,
-+
-+ /* New values must be added before this */
-+ EEPROM_WORD_COUNT
-+};
-
- /*
- * EEPROM Version
- */
--#define EEPROM_VERSION 0x0001
- #define EEPROM_VERSION_FAE FIELD16(0x00ff)
- #define EEPROM_VERSION_VERSION FIELD16(0xff00)
-
- /*
- * HW MAC address.
- */
--#define EEPROM_MAC_ADDR_0 0x0002
- #define EEPROM_MAC_ADDR_BYTE0 FIELD16(0x00ff)
- #define EEPROM_MAC_ADDR_BYTE1 FIELD16(0xff00)
--#define EEPROM_MAC_ADDR_1 0x0003
- #define EEPROM_MAC_ADDR_BYTE2 FIELD16(0x00ff)
- #define EEPROM_MAC_ADDR_BYTE3 FIELD16(0xff00)
--#define EEPROM_MAC_ADDR_2 0x0004
- #define EEPROM_MAC_ADDR_BYTE4 FIELD16(0x00ff)
- #define EEPROM_MAC_ADDR_BYTE5 FIELD16(0xff00)
-
-@@ -2237,7 +2447,6 @@ struct mac_iveiv_entry {
- * TXPATH: 1: 1T, 2: 2T, 3: 3T
- * RF_TYPE: RFIC type
- */
--#define EEPROM_NIC_CONF0 0x001a
- #define EEPROM_NIC_CONF0_RXPATH FIELD16(0x000f)
- #define EEPROM_NIC_CONF0_TXPATH FIELD16(0x00f0)
- #define EEPROM_NIC_CONF0_RF_TYPE FIELD16(0x0f00)
-@@ -2261,7 +2470,6 @@ struct mac_iveiv_entry {
- * BT_COEXIST: 0: disable, 1: enable
- * DAC_TEST: 0: disable, 1: enable
- */
--#define EEPROM_NIC_CONF1 0x001b
- #define EEPROM_NIC_CONF1_HW_RADIO FIELD16(0x0001)
- #define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC FIELD16(0x0002)
- #define EEPROM_NIC_CONF1_EXTERNAL_LNA_2G FIELD16(0x0004)
-@@ -2281,7 +2489,6 @@ struct mac_iveiv_entry {
- /*
- * EEPROM frequency
- */
--#define EEPROM_FREQ 0x001d
- #define EEPROM_FREQ_OFFSET FIELD16(0x00ff)
- #define EEPROM_FREQ_LED_MODE FIELD16(0x7f00)
- #define EEPROM_FREQ_LED_POLARITY FIELD16(0x1000)
-@@ -2298,9 +2505,6 @@ struct mac_iveiv_entry {
- * POLARITY_GPIO_4: Polarity GPIO4 setting.
- * LED_MODE: Led mode.
- */
--#define EEPROM_LED_AG_CONF 0x001e
--#define EEPROM_LED_ACT_CONF 0x001f
--#define EEPROM_LED_POLARITY 0x0020
- #define EEPROM_LED_POLARITY_RDY_BG FIELD16(0x0001)
- #define EEPROM_LED_POLARITY_RDY_A FIELD16(0x0002)
- #define EEPROM_LED_POLARITY_ACT FIELD16(0x0004)
-@@ -2317,7 +2521,6 @@ struct mac_iveiv_entry {
- * TX_STREAM: 0: Reserved, 1: 1 Stream, 2: 2 Stream
- * CRYSTAL: 00: Reserved, 01: One crystal, 10: Two crystal, 11: Reserved
- */
--#define EEPROM_NIC_CONF2 0x0021
- #define EEPROM_NIC_CONF2_RX_STREAM FIELD16(0x000f)
- #define EEPROM_NIC_CONF2_TX_STREAM FIELD16(0x00f0)
- #define EEPROM_NIC_CONF2_CRYSTAL FIELD16(0x0600)
-@@ -2325,54 +2528,46 @@ struct mac_iveiv_entry {
- /*
- * EEPROM LNA
- */
--#define EEPROM_LNA 0x0022
- #define EEPROM_LNA_BG FIELD16(0x00ff)
- #define EEPROM_LNA_A0 FIELD16(0xff00)
-
- /*
- * EEPROM RSSI BG offset
- */
--#define EEPROM_RSSI_BG 0x0023
- #define EEPROM_RSSI_BG_OFFSET0 FIELD16(0x00ff)
- #define EEPROM_RSSI_BG_OFFSET1 FIELD16(0xff00)
-
- /*
- * EEPROM RSSI BG2 offset
- */
--#define EEPROM_RSSI_BG2 0x0024
- #define EEPROM_RSSI_BG2_OFFSET2 FIELD16(0x00ff)
- #define EEPROM_RSSI_BG2_LNA_A1 FIELD16(0xff00)
-
- /*
- * EEPROM TXMIXER GAIN BG offset (note overlaps with EEPROM RSSI BG2).
- */
--#define EEPROM_TXMIXER_GAIN_BG 0x0024
- #define EEPROM_TXMIXER_GAIN_BG_VAL FIELD16(0x0007)
-
- /*
- * EEPROM RSSI A offset
- */
--#define EEPROM_RSSI_A 0x0025
- #define EEPROM_RSSI_A_OFFSET0 FIELD16(0x00ff)
- #define EEPROM_RSSI_A_OFFSET1 FIELD16(0xff00)
-
- /*
- * EEPROM RSSI A2 offset
- */
--#define EEPROM_RSSI_A2 0x0026
- #define EEPROM_RSSI_A2_OFFSET2 FIELD16(0x00ff)
- #define EEPROM_RSSI_A2_LNA_A2 FIELD16(0xff00)
-
- /*
- * EEPROM TXMIXER GAIN A offset (note overlaps with EEPROM RSSI A2).
- */
--#define EEPROM_TXMIXER_GAIN_A 0x0026
- #define EEPROM_TXMIXER_GAIN_A_VAL FIELD16(0x0007)
-
- /*
- * EEPROM EIRP Maximum TX power values(unit: dbm)
- */
--#define EEPROM_EIRP_MAX_TX_POWER 0x0027
- #define EEPROM_EIRP_MAX_TX_POWER_2GHZ FIELD16(0x00ff)
- #define EEPROM_EIRP_MAX_TX_POWER_5GHZ FIELD16(0xff00)
-
-@@ -2383,7 +2578,6 @@ struct mac_iveiv_entry {
- * TYPE: 1: Plus the delta value, 0: minus the delta value
- * ENABLE: enable tx power compensation for 40BW
- */
--#define EEPROM_TXPOWER_DELTA 0x0028
- #define EEPROM_TXPOWER_DELTA_VALUE_2G FIELD16(0x003f)
- #define EEPROM_TXPOWER_DELTA_TYPE_2G FIELD16(0x0040)
- #define EEPROM_TXPOWER_DELTA_ENABLE_2G FIELD16(0x0080)
-@@ -2394,8 +2588,6 @@ struct mac_iveiv_entry {
- /*
- * EEPROM TXPOWER 802.11BG
- */
--#define EEPROM_TXPOWER_BG1 0x0029
--#define EEPROM_TXPOWER_BG2 0x0030
- #define EEPROM_TXPOWER_BG_SIZE 7
- #define EEPROM_TXPOWER_BG_1 FIELD16(0x00ff)
- #define EEPROM_TXPOWER_BG_2 FIELD16(0xff00)
-@@ -2407,7 +2599,6 @@ struct mac_iveiv_entry {
- * MINUS3: If the actual TSSI is below this boundary, tx power needs to be
- * reduced by (agc_step * -3)
- */
--#define EEPROM_TSSI_BOUND_BG1 0x0037
- #define EEPROM_TSSI_BOUND_BG1_MINUS4 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_BG1_MINUS3 FIELD16(0xff00)
-
-@@ -2418,7 +2609,6 @@ struct mac_iveiv_entry {
- * MINUS1: If the actual TSSI is below this boundary, tx power needs to be
- * reduced by (agc_step * -1)
- */
--#define EEPROM_TSSI_BOUND_BG2 0x0038
- #define EEPROM_TSSI_BOUND_BG2_MINUS2 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_BG2_MINUS1 FIELD16(0xff00)
-
-@@ -2428,7 +2618,6 @@ struct mac_iveiv_entry {
- * PLUS1: If the actual TSSI is above this boundary, tx power needs to be
- * increased by (agc_step * 1)
- */
--#define EEPROM_TSSI_BOUND_BG3 0x0039
- #define EEPROM_TSSI_BOUND_BG3_REF FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_BG3_PLUS1 FIELD16(0xff00)
-
-@@ -2439,7 +2628,6 @@ struct mac_iveiv_entry {
- * PLUS3: If the actual TSSI is above this boundary, tx power needs to be
- * increased by (agc_step * 3)
- */
--#define EEPROM_TSSI_BOUND_BG4 0x003a
- #define EEPROM_TSSI_BOUND_BG4_PLUS2 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_BG4_PLUS3 FIELD16(0xff00)
-
-@@ -2449,19 +2637,20 @@ struct mac_iveiv_entry {
- * increased by (agc_step * 4)
- * AGC_STEP: Temperature compensation step.
- */
--#define EEPROM_TSSI_BOUND_BG5 0x003b
- #define EEPROM_TSSI_BOUND_BG5_PLUS4 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_BG5_AGC_STEP FIELD16(0xff00)
-
- /*
- * EEPROM TXPOWER 802.11A
- */
--#define EEPROM_TXPOWER_A1 0x003c
--#define EEPROM_TXPOWER_A2 0x0053
- #define EEPROM_TXPOWER_A_SIZE 6
- #define EEPROM_TXPOWER_A_1 FIELD16(0x00ff)
- #define EEPROM_TXPOWER_A_2 FIELD16(0xff00)
-
-+/* EEPROM_TXPOWER_{A,G} fields for RT3593 */
-+#define EEPROM_TXPOWER_ALC FIELD8(0x1f)
-+#define EEPROM_TXPOWER_FINE_CTRL FIELD8(0xe0)
-+
- /*
- * EEPROM temperature compensation boundaries 802.11A
- * MINUS4: If the actual TSSI is below this boundary, tx power needs to be
-@@ -2469,7 +2658,6 @@ struct mac_iveiv_entry {
- * MINUS3: If the actual TSSI is below this boundary, tx power needs to be
- * reduced by (agc_step * -3)
- */
--#define EEPROM_TSSI_BOUND_A1 0x006a
- #define EEPROM_TSSI_BOUND_A1_MINUS4 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_A1_MINUS3 FIELD16(0xff00)
-
-@@ -2480,7 +2668,6 @@ struct mac_iveiv_entry {
- * MINUS1: If the actual TSSI is below this boundary, tx power needs to be
- * reduced by (agc_step * -1)
- */
--#define EEPROM_TSSI_BOUND_A2 0x006b
- #define EEPROM_TSSI_BOUND_A2_MINUS2 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_A2_MINUS1 FIELD16(0xff00)
-
-@@ -2490,7 +2677,6 @@ struct mac_iveiv_entry {
- * PLUS1: If the actual TSSI is above this boundary, tx power needs to be
- * increased by (agc_step * 1)
- */
--#define EEPROM_TSSI_BOUND_A3 0x006c
- #define EEPROM_TSSI_BOUND_A3_REF FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_A3_PLUS1 FIELD16(0xff00)
-
-@@ -2501,7 +2687,6 @@ struct mac_iveiv_entry {
- * PLUS3: If the actual TSSI is above this boundary, tx power needs to be
- * increased by (agc_step * 3)
- */
--#define EEPROM_TSSI_BOUND_A4 0x006d
- #define EEPROM_TSSI_BOUND_A4_PLUS2 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_A4_PLUS3 FIELD16(0xff00)
-
-@@ -2511,14 +2696,12 @@ struct mac_iveiv_entry {
- * increased by (agc_step * 4)
- * AGC_STEP: Temperature compensation step.
- */
--#define EEPROM_TSSI_BOUND_A5 0x006e
- #define EEPROM_TSSI_BOUND_A5_PLUS4 FIELD16(0x00ff)
- #define EEPROM_TSSI_BOUND_A5_AGC_STEP FIELD16(0xff00)
-
- /*
- * EEPROM TXPOWER by rate: tx power per tx rate for HT20 mode
- */
--#define EEPROM_TXPOWER_BYRATE 0x006f
- #define EEPROM_TXPOWER_BYRATE_SIZE 9
-
- #define EEPROM_TXPOWER_BYRATE_RATE0 FIELD16(0x000f)
-@@ -2529,11 +2712,14 @@ struct mac_iveiv_entry {
- /*
- * EEPROM BBP.
- */
--#define EEPROM_BBP_START 0x0078
- #define EEPROM_BBP_SIZE 16
- #define EEPROM_BBP_VALUE FIELD16(0x00ff)
- #define EEPROM_BBP_REG_ID FIELD16(0xff00)
-
-+/* EEPROM_EXT_LNA2 */
-+#define EEPROM_EXT_LNA2_A1 FIELD16(0x00ff)
-+#define EEPROM_EXT_LNA2_A2 FIELD16(0xff00)
-+
- /*
- * EEPROM IQ Calibration, unlike other entries those are byte addresses.
- */
-@@ -2610,6 +2796,7 @@ struct mac_iveiv_entry {
- #define MCU_RADAR 0x60
- #define MCU_BOOT_SIGNAL 0x72
- #define MCU_ANT_SELECT 0X73
-+#define MCU_FREQ_OFFSET 0x74
- #define MCU_BBP_SIGNAL 0x80
- #define MCU_POWER_SAVE 0x83
- #define MCU_BAND_SELECT 0x91
-@@ -2630,6 +2817,7 @@ struct mac_iveiv_entry {
- #define TXWI_DESC_SIZE_5WORDS (5 * sizeof(__le32))
-
- #define RXWI_DESC_SIZE_4WORDS (4 * sizeof(__le32))
-+#define RXWI_DESC_SIZE_5WORDS (5 * sizeof(__le32))
- #define RXWI_DESC_SIZE_6WORDS (6 * sizeof(__le32))
-
- /*
-@@ -2750,18 +2938,15 @@ struct mac_iveiv_entry {
- #define MAX_A_TXPOWER 15
- #define DEFAULT_TXPOWER 5
-
-+#define MIN_A_TXPOWER_3593 0
-+#define MAX_A_TXPOWER_3593 31
-+
- #define TXPOWER_G_FROM_DEV(__txpower) \
- ((__txpower) > MAX_G_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
-
--#define TXPOWER_G_TO_DEV(__txpower) \
-- clamp_t(char, __txpower, MIN_G_TXPOWER, MAX_G_TXPOWER)
--
- #define TXPOWER_A_FROM_DEV(__txpower) \
- ((__txpower) > MAX_A_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
-
--#define TXPOWER_A_TO_DEV(__txpower) \
-- clamp_t(char, __txpower, MIN_A_TXPOWER, MAX_A_TXPOWER)
--
- /*
- * Board's maximun TX power limitation
- */
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -221,6 +221,157 @@ static void rt2800_rf_write(struct rt2x0
- mutex_unlock(&rt2x00dev->csr_mutex);
- }
-
-+static const unsigned int rt2800_eeprom_map[EEPROM_WORD_COUNT] = {
-+ [EEPROM_CHIP_ID] = 0x0000,
-+ [EEPROM_VERSION] = 0x0001,
-+ [EEPROM_MAC_ADDR_0] = 0x0002,
-+ [EEPROM_MAC_ADDR_1] = 0x0003,
-+ [EEPROM_MAC_ADDR_2] = 0x0004,
-+ [EEPROM_NIC_CONF0] = 0x001a,
-+ [EEPROM_NIC_CONF1] = 0x001b,
-+ [EEPROM_FREQ] = 0x001d,
-+ [EEPROM_LED_AG_CONF] = 0x001e,
-+ [EEPROM_LED_ACT_CONF] = 0x001f,
-+ [EEPROM_LED_POLARITY] = 0x0020,
-+ [EEPROM_NIC_CONF2] = 0x0021,
-+ [EEPROM_LNA] = 0x0022,
-+ [EEPROM_RSSI_BG] = 0x0023,
-+ [EEPROM_RSSI_BG2] = 0x0024,
-+ [EEPROM_TXMIXER_GAIN_BG] = 0x0024, /* overlaps with RSSI_BG2 */
-+ [EEPROM_RSSI_A] = 0x0025,
-+ [EEPROM_RSSI_A2] = 0x0026,
-+ [EEPROM_TXMIXER_GAIN_A] = 0x0026, /* overlaps with RSSI_A2 */
-+ [EEPROM_EIRP_MAX_TX_POWER] = 0x0027,
-+ [EEPROM_TXPOWER_DELTA] = 0x0028,
-+ [EEPROM_TXPOWER_BG1] = 0x0029,
-+ [EEPROM_TXPOWER_BG2] = 0x0030,
-+ [EEPROM_TSSI_BOUND_BG1] = 0x0037,
-+ [EEPROM_TSSI_BOUND_BG2] = 0x0038,
-+ [EEPROM_TSSI_BOUND_BG3] = 0x0039,
-+ [EEPROM_TSSI_BOUND_BG4] = 0x003a,
-+ [EEPROM_TSSI_BOUND_BG5] = 0x003b,
-+ [EEPROM_TXPOWER_A1] = 0x003c,
-+ [EEPROM_TXPOWER_A2] = 0x0053,
-+ [EEPROM_TSSI_BOUND_A1] = 0x006a,
-+ [EEPROM_TSSI_BOUND_A2] = 0x006b,
-+ [EEPROM_TSSI_BOUND_A3] = 0x006c,
-+ [EEPROM_TSSI_BOUND_A4] = 0x006d,
-+ [EEPROM_TSSI_BOUND_A5] = 0x006e,
-+ [EEPROM_TXPOWER_BYRATE] = 0x006f,
-+ [EEPROM_BBP_START] = 0x0078,
-+};
-+
-+static const unsigned int rt2800_eeprom_map_ext[EEPROM_WORD_COUNT] = {
-+ [EEPROM_CHIP_ID] = 0x0000,
-+ [EEPROM_VERSION] = 0x0001,
-+ [EEPROM_MAC_ADDR_0] = 0x0002,
-+ [EEPROM_MAC_ADDR_1] = 0x0003,
-+ [EEPROM_MAC_ADDR_2] = 0x0004,
-+ [EEPROM_NIC_CONF0] = 0x001a,
-+ [EEPROM_NIC_CONF1] = 0x001b,
-+ [EEPROM_NIC_CONF2] = 0x001c,
-+ [EEPROM_EIRP_MAX_TX_POWER] = 0x0020,
-+ [EEPROM_FREQ] = 0x0022,
-+ [EEPROM_LED_AG_CONF] = 0x0023,
-+ [EEPROM_LED_ACT_CONF] = 0x0024,
-+ [EEPROM_LED_POLARITY] = 0x0025,
-+ [EEPROM_LNA] = 0x0026,
-+ [EEPROM_EXT_LNA2] = 0x0027,
-+ [EEPROM_RSSI_BG] = 0x0028,
-+ [EEPROM_TXPOWER_DELTA] = 0x0028, /* Overlaps with RSSI_BG */
-+ [EEPROM_RSSI_BG2] = 0x0029,
-+ [EEPROM_TXMIXER_GAIN_BG] = 0x0029, /* Overlaps with RSSI_BG2 */
-+ [EEPROM_RSSI_A] = 0x002a,
-+ [EEPROM_RSSI_A2] = 0x002b,
-+ [EEPROM_TXMIXER_GAIN_A] = 0x002b, /* Overlaps with RSSI_A2 */
-+ [EEPROM_TXPOWER_BG1] = 0x0030,
-+ [EEPROM_TXPOWER_BG2] = 0x0037,
-+ [EEPROM_EXT_TXPOWER_BG3] = 0x003e,
-+ [EEPROM_TSSI_BOUND_BG1] = 0x0045,
-+ [EEPROM_TSSI_BOUND_BG2] = 0x0046,
-+ [EEPROM_TSSI_BOUND_BG3] = 0x0047,
-+ [EEPROM_TSSI_BOUND_BG4] = 0x0048,
-+ [EEPROM_TSSI_BOUND_BG5] = 0x0049,
-+ [EEPROM_TXPOWER_A1] = 0x004b,
-+ [EEPROM_TXPOWER_A2] = 0x0065,
-+ [EEPROM_EXT_TXPOWER_A3] = 0x007f,
-+ [EEPROM_TSSI_BOUND_A1] = 0x009a,
-+ [EEPROM_TSSI_BOUND_A2] = 0x009b,
-+ [EEPROM_TSSI_BOUND_A3] = 0x009c,
-+ [EEPROM_TSSI_BOUND_A4] = 0x009d,
-+ [EEPROM_TSSI_BOUND_A5] = 0x009e,
-+ [EEPROM_TXPOWER_BYRATE] = 0x00a0,
-+};
-+
-+static unsigned int rt2800_eeprom_word_index(struct rt2x00_dev *rt2x00dev,
-+ const enum rt2800_eeprom_word word)
-+{
-+ const unsigned int *map;
-+ unsigned int index;
-+
-+ if (WARN_ONCE(word >= EEPROM_WORD_COUNT,
-+ "%s: invalid EEPROM word %d\n",
-+ wiphy_name(rt2x00dev->hw->wiphy), word))
-+ return 0;
-+
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ map = rt2800_eeprom_map_ext;
-+ else
-+ map = rt2800_eeprom_map;
-+
-+ index = map[word];
-+
-+ /* Index 0 is valid only for EEPROM_CHIP_ID.
-+ * Otherwise it means that the offset of the
-+ * given word is not initialized in the map,
-+ * or that the field is not usable on the
-+ * actual chipset.
-+ */
-+ WARN_ONCE(word != EEPROM_CHIP_ID && index == 0,
-+ "%s: invalid access of EEPROM word %d\n",
-+ wiphy_name(rt2x00dev->hw->wiphy), word);
-+
-+ return index;
-+}
-+
-+static void *rt2800_eeprom_addr(struct rt2x00_dev *rt2x00dev,
-+ const enum rt2800_eeprom_word word)
-+{
-+ unsigned int index;
-+
-+ index = rt2800_eeprom_word_index(rt2x00dev, word);
-+ return rt2x00_eeprom_addr(rt2x00dev, index);
-+}
-+
-+static void rt2800_eeprom_read(struct rt2x00_dev *rt2x00dev,
-+ const enum rt2800_eeprom_word word, u16 *data)
-+{
-+ unsigned int index;
-+
-+ index = rt2800_eeprom_word_index(rt2x00dev, word);
-+ rt2x00_eeprom_read(rt2x00dev, index, data);
-+}
-+
-+static void rt2800_eeprom_write(struct rt2x00_dev *rt2x00dev,
-+ const enum rt2800_eeprom_word word, u16 data)
-+{
-+ unsigned int index;
-+
-+ index = rt2800_eeprom_word_index(rt2x00dev, word);
-+ rt2x00_eeprom_write(rt2x00dev, index, data);
-+}
-+
-+static void rt2800_eeprom_read_from_array(struct rt2x00_dev *rt2x00dev,
-+ const enum rt2800_eeprom_word array,
-+ unsigned int offset,
-+ u16 *data)
-+{
-+ unsigned int index;
-+
-+ index = rt2800_eeprom_word_index(rt2x00dev, array);
-+ rt2x00_eeprom_read(rt2x00dev, index + offset, data);
-+}
-+
- static int rt2800_enable_wlan_rt3290(struct rt2x00_dev *rt2x00dev)
- {
- u32 reg;
-@@ -370,6 +521,29 @@ void rt2800_disable_wpdma(struct rt2x00_
- }
- EXPORT_SYMBOL_GPL(rt2800_disable_wpdma);
-
-+void rt2800_get_txwi_rxwi_size(struct rt2x00_dev *rt2x00dev,
-+ unsigned short *txwi_size,
-+ unsigned short *rxwi_size)
-+{
-+ switch (rt2x00dev->chip.rt) {
-+ case RT3593:
-+ *txwi_size = TXWI_DESC_SIZE_4WORDS;
-+ *rxwi_size = RXWI_DESC_SIZE_5WORDS;
-+ break;
-+
-+ case RT5592:
-+ *txwi_size = TXWI_DESC_SIZE_5WORDS;
-+ *rxwi_size = RXWI_DESC_SIZE_6WORDS;
-+ break;
-+
-+ default:
-+ *txwi_size = TXWI_DESC_SIZE_4WORDS;
-+ *rxwi_size = RXWI_DESC_SIZE_4WORDS;
-+ break;
-+ }
-+}
-+EXPORT_SYMBOL_GPL(rt2800_get_txwi_rxwi_size);
-+
- static bool rt2800_check_firmware_crc(const u8 *data, const size_t len)
- {
- u16 fw_crc;
-@@ -609,16 +783,16 @@ static int rt2800_agc_to_rssi(struct rt2
- u8 offset2;
-
- if (rt2x00dev->curr_band == IEEE80211_BAND_2GHZ) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG, &eeprom);
- offset0 = rt2x00_get_field16(eeprom, EEPROM_RSSI_BG_OFFSET0);
- offset1 = rt2x00_get_field16(eeprom, EEPROM_RSSI_BG_OFFSET1);
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &eeprom);
- offset2 = rt2x00_get_field16(eeprom, EEPROM_RSSI_BG2_OFFSET2);
- } else {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A, &eeprom);
- offset0 = rt2x00_get_field16(eeprom, EEPROM_RSSI_A_OFFSET0);
- offset1 = rt2x00_get_field16(eeprom, EEPROM_RSSI_A_OFFSET1);
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &eeprom);
- offset2 = rt2x00_get_field16(eeprom, EEPROM_RSSI_A2_OFFSET2);
- }
-
-@@ -766,6 +940,18 @@ void rt2800_txdone_entry(struct queue_en
- }
- EXPORT_SYMBOL_GPL(rt2800_txdone_entry);
-
-+static unsigned int rt2800_hw_beacon_base(struct rt2x00_dev *rt2x00dev,
-+ unsigned int index)
-+{
-+ return HW_BEACON_BASE(index);
-+}
-+
-+static inline u8 rt2800_get_beacon_offset(struct rt2x00_dev *rt2x00dev,
-+ unsigned int index)
-+{
-+ return BEACON_BASE_TO_OFFSET(rt2800_hw_beacon_base(rt2x00dev, index));
-+}
-+
- void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)
- {
- struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-@@ -818,7 +1004,8 @@ void rt2800_write_beacon(struct queue_en
- return;
- }
-
-- beacon_base = HW_BEACON_OFFSET(entry->entry_idx);
-+ beacon_base = rt2800_hw_beacon_base(rt2x00dev, entry->entry_idx);
-+
- rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data,
- entry->skb->len + padding_len);
-
-@@ -837,10 +1024,13 @@ void rt2800_write_beacon(struct queue_en
- EXPORT_SYMBOL_GPL(rt2800_write_beacon);
-
- static inline void rt2800_clear_beacon_register(struct rt2x00_dev *rt2x00dev,
-- unsigned int beacon_base)
-+ unsigned int index)
- {
- int i;
- const int txwi_desc_size = rt2x00dev->bcn->winfo_size;
-+ unsigned int beacon_base;
-+
-+ beacon_base = rt2800_hw_beacon_base(rt2x00dev, index);
-
- /*
- * For the Beacon base registers we only need to clear
-@@ -867,8 +1057,7 @@ void rt2800_clear_beacon(struct queue_en
- /*
- * Clear beacon.
- */
-- rt2800_clear_beacon_register(rt2x00dev,
-- HW_BEACON_OFFSET(entry->entry_idx));
-+ rt2800_clear_beacon_register(rt2x00dev, entry->entry_idx);
-
- /*
- * Enabled beaconing again.
-@@ -890,6 +1079,9 @@ const struct rt2x00debug rt2800_rt2x00de
- .word_count = CSR_REG_SIZE / sizeof(u32),
- },
- .eeprom = {
-+ /* NOTE: The local EEPROM access functions can't
-+ * be used here, use the generic versions instead.
-+ */
- .read = rt2x00_eeprom_read,
- .write = rt2x00_eeprom_write,
- .word_base = EEPROM_BASE,
-@@ -1547,7 +1739,7 @@ static void rt2800_config_3572bt_ant(str
- led_r_mode = rt2x00_get_field32(reg, LED_CFG_LED_POLAR) ? 0 : 3;
- if (led_g_mode != rt2x00_get_field32(reg, LED_CFG_G_LED_MODE) ||
- led_r_mode != rt2x00_get_field32(reg, LED_CFG_R_LED_MODE)) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_FREQ, &eeprom);
- led_ctrl = rt2x00_get_field16(eeprom, EEPROM_FREQ_LED_MODE);
- if (led_ctrl == 0 || led_ctrl > 0x40) {
- rt2x00_set_field32(®, LED_CFG_G_LED_MODE, led_g_mode);
-@@ -1609,7 +1801,7 @@ void rt2800_config_ant(struct rt2x00_dev
- rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 2);
- break;
- case 3:
-- rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 0);
-+ rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 2);
- break;
- }
-
-@@ -1622,7 +1814,7 @@ void rt2800_config_ant(struct rt2x00_dev
- rt2x00_rt(rt2x00dev, RT3090) ||
- rt2x00_rt(rt2x00dev, RT3352) ||
- rt2x00_rt(rt2x00dev, RT3390)) {
-- rt2x00_eeprom_read(rt2x00dev,
-+ rt2800_eeprom_read(rt2x00dev,
- EEPROM_NIC_CONF1, &eeprom);
- if (rt2x00_get_field16(eeprom,
- EEPROM_NIC_CONF1_ANT_DIVERSITY))
-@@ -1649,6 +1841,13 @@ void rt2800_config_ant(struct rt2x00_dev
-
- rt2800_bbp_write(rt2x00dev, 3, r3);
- rt2800_bbp_write(rt2x00dev, 1, r1);
-+
-+ if (rt2x00_rt(rt2x00dev, RT3593)) {
-+ if (ant->rx_chain_num == 1)
-+ rt2800_bbp_write(rt2x00dev, 86, 0x00);
-+ else
-+ rt2800_bbp_write(rt2x00dev, 86, 0x46);
-+ }
- }
- EXPORT_SYMBOL_GPL(rt2800_config_ant);
-
-@@ -1659,22 +1858,73 @@ static void rt2800_config_lna_gain(struc
- short lna_gain;
-
- if (libconf->rf.channel <= 14) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_LNA, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_LNA, &eeprom);
- lna_gain = rt2x00_get_field16(eeprom, EEPROM_LNA_BG);
- } else if (libconf->rf.channel <= 64) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_LNA, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_LNA, &eeprom);
- lna_gain = rt2x00_get_field16(eeprom, EEPROM_LNA_A0);
- } else if (libconf->rf.channel <= 128) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &eeprom);
-- lna_gain = rt2x00_get_field16(eeprom, EEPROM_RSSI_BG2_LNA_A1);
-+ if (rt2x00_rt(rt2x00dev, RT3593)) {
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);
-+ lna_gain = rt2x00_get_field16(eeprom,
-+ EEPROM_EXT_LNA2_A1);
-+ } else {
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &eeprom);
-+ lna_gain = rt2x00_get_field16(eeprom,
-+ EEPROM_RSSI_BG2_LNA_A1);
-+ }
- } else {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &eeprom);
-- lna_gain = rt2x00_get_field16(eeprom, EEPROM_RSSI_A2_LNA_A2);
-+ if (rt2x00_rt(rt2x00dev, RT3593)) {
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);
-+ lna_gain = rt2x00_get_field16(eeprom,
-+ EEPROM_EXT_LNA2_A2);
-+ } else {
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &eeprom);
-+ lna_gain = rt2x00_get_field16(eeprom,
-+ EEPROM_RSSI_A2_LNA_A2);
-+ }
- }
-
- rt2x00dev->lna_gain = lna_gain;
- }
-
-+#define FREQ_OFFSET_BOUND 0x5f
-+
-+static void rt2800_adjust_freq_offset(struct rt2x00_dev *rt2x00dev)
-+{
-+ u8 freq_offset, prev_freq_offset;
-+ u8 rfcsr, prev_rfcsr;
-+
-+ freq_offset = rt2x00_get_field8(rt2x00dev->freq_offset, RFCSR17_CODE);
-+ freq_offset = min_t(u8, freq_offset, FREQ_OFFSET_BOUND);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
-+ prev_rfcsr = rfcsr;
-+
-+ rt2x00_set_field8(&rfcsr, RFCSR17_CODE, freq_offset);
-+ if (rfcsr == prev_rfcsr)
-+ return;
-+
-+ if (rt2x00_is_usb(rt2x00dev)) {
-+ rt2800_mcu_request(rt2x00dev, MCU_FREQ_OFFSET, 0xff,
-+ freq_offset, prev_rfcsr);
-+ return;
-+ }
-+
-+ prev_freq_offset = rt2x00_get_field8(prev_rfcsr, RFCSR17_CODE);
-+ while (prev_freq_offset != freq_offset) {
-+ if (prev_freq_offset < freq_offset)
-+ prev_freq_offset++;
-+ else
-+ prev_freq_offset--;
-+
-+ rt2x00_set_field8(&rfcsr, RFCSR17_CODE, prev_freq_offset);
-+ rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
-+
-+ usleep_range(1000, 1500);
-+ }
-+}
-+
- static void rt2800_config_channel_rf2xxx(struct rt2x00_dev *rt2x00dev,
- struct ieee80211_conf *conf,
- struct rf_channel *rf,
-@@ -1993,22 +2243,306 @@ static void rt2800_config_channel_rf3052
- rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
- }
-
--#define POWER_BOUND 0x27
--#define POWER_BOUND_5G 0x2b
--#define FREQ_OFFSET_BOUND 0x5f
--
--static void rt2800_adjust_freq_offset(struct rt2x00_dev *rt2x00dev)
-+static void rt2800_config_channel_rf3053(struct rt2x00_dev *rt2x00dev,
-+ struct ieee80211_conf *conf,
-+ struct rf_channel *rf,
-+ struct channel_info *info)
- {
-+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+ u8 txrx_agc_fc;
-+ u8 txrx_h20m;
- u8 rfcsr;
-+ u8 bbp;
-+ const bool txbf_enabled = false; /* TODO */
-
-- rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
-- if (rt2x00dev->freq_offset > FREQ_OFFSET_BOUND)
-- rt2x00_set_field8(&rfcsr, RFCSR17_CODE, FREQ_OFFSET_BOUND);
-+ /* TODO: use TX{0,1,2}FinePowerControl values from EEPROM */
-+ rt2800_bbp_read(rt2x00dev, 109, &bbp);
-+ rt2x00_set_field8(&bbp, BBP109_TX0_POWER, 0);
-+ rt2x00_set_field8(&bbp, BBP109_TX1_POWER, 0);
-+ rt2800_bbp_write(rt2x00dev, 109, bbp);
-+
-+ rt2800_bbp_read(rt2x00dev, 110, &bbp);
-+ rt2x00_set_field8(&bbp, BBP110_TX2_POWER, 0);
-+ rt2800_bbp_write(rt2x00dev, 110, bbp);
-+
-+ if (rf->channel <= 14) {
-+ /* Restore BBP 25 & 26 for 2.4 GHz */
-+ rt2800_bbp_write(rt2x00dev, 25, drv_data->bbp25);
-+ rt2800_bbp_write(rt2x00dev, 26, drv_data->bbp26);
-+ } else {
-+ /* Hard code BBP 25 & 26 for 5GHz */
-+
-+ /* Enable IQ Phase correction */
-+ rt2800_bbp_write(rt2x00dev, 25, 0x09);
-+ /* Setup IQ Phase correction value */
-+ rt2800_bbp_write(rt2x00dev, 26, 0xff);
-+ }
-+
-+ rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
-+ rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3 & 0xf);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 11, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR11_R, (rf->rf2 & 0x3));
-+ rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 11, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR11_PLL_IDOH, 1);
-+ if (rf->channel <= 14)
-+ rt2x00_set_field8(&rfcsr, RFCSR11_PLL_MOD, 1);
- else
-- rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);
-- rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR11_PLL_MOD, 2);
-+ rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 53, &rfcsr);
-+ if (rf->channel <= 14) {
-+ rfcsr = 0;
-+ rt2x00_set_field8(&rfcsr, RFCSR53_TX_POWER,
-+ info->default_power1 & 0x1f);
-+ } else {
-+ if (rt2x00_is_usb(rt2x00dev))
-+ rfcsr = 0x40;
-+
-+ rt2x00_set_field8(&rfcsr, RFCSR53_TX_POWER,
-+ ((info->default_power1 & 0x18) << 1) |
-+ (info->default_power1 & 7));
-+ }
-+ rt2800_rfcsr_write(rt2x00dev, 53, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 55, &rfcsr);
-+ if (rf->channel <= 14) {
-+ rfcsr = 0;
-+ rt2x00_set_field8(&rfcsr, RFCSR55_TX_POWER,
-+ info->default_power2 & 0x1f);
-+ } else {
-+ if (rt2x00_is_usb(rt2x00dev))
-+ rfcsr = 0x40;
-+
-+ rt2x00_set_field8(&rfcsr, RFCSR55_TX_POWER,
-+ ((info->default_power2 & 0x18) << 1) |
-+ (info->default_power2 & 7));
-+ }
-+ rt2800_rfcsr_write(rt2x00dev, 55, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 54, &rfcsr);
-+ if (rf->channel <= 14) {
-+ rfcsr = 0;
-+ rt2x00_set_field8(&rfcsr, RFCSR54_TX_POWER,
-+ info->default_power3 & 0x1f);
-+ } else {
-+ if (rt2x00_is_usb(rt2x00dev))
-+ rfcsr = 0x40;
-+
-+ rt2x00_set_field8(&rfcsr, RFCSR54_TX_POWER,
-+ ((info->default_power3 & 0x18) << 1) |
-+ (info->default_power3 & 7));
-+ }
-+ rt2800_rfcsr_write(rt2x00dev, 54, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 0);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 0);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 0);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 0);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 0);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 0);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
-+
-+ switch (rt2x00dev->default_ant.tx_chain_num) {
-+ case 3:
-+ rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 1);
-+ /* fallthrough */
-+ case 2:
-+ rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
-+ /* fallthrough */
-+ case 1:
-+ rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 1);
-+ break;
-+ }
-+
-+ switch (rt2x00dev->default_ant.rx_chain_num) {
-+ case 3:
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 1);
-+ /* fallthrough */
-+ case 2:
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
-+ /* fallthrough */
-+ case 1:
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
-+ break;
-+ }
-+ rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
-+
-+ rt2800_adjust_freq_offset(rt2x00dev);
-+
-+ if (conf_is_ht40(conf)) {
-+ txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw40,
-+ RFCSR24_TX_AGC_FC);
-+ txrx_h20m = rt2x00_get_field8(drv_data->calibration_bw40,
-+ RFCSR24_TX_H20M);
-+ } else {
-+ txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw20,
-+ RFCSR24_TX_AGC_FC);
-+ txrx_h20m = rt2x00_get_field8(drv_data->calibration_bw20,
-+ RFCSR24_TX_H20M);
-+ }
-+
-+ /* NOTE: the reference driver does not writes the new value
-+ * back to RFCSR 32
-+ */
-+ rt2800_rfcsr_read(rt2x00dev, 32, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR32_TX_AGC_FC, txrx_agc_fc);
-+
-+ if (rf->channel <= 14)
-+ rfcsr = 0xa0;
-+ else
-+ rfcsr = 0x80;
-+ rt2800_rfcsr_write(rt2x00dev, 31, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, txrx_h20m);
-+ rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, txrx_h20m);
-+ rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-+
-+ /* Band selection */
-+ rt2800_rfcsr_read(rt2x00dev, 36, &rfcsr);
-+ if (rf->channel <= 14)
-+ rt2x00_set_field8(&rfcsr, RFCSR36_RF_BS, 1);
-+ else
-+ rt2x00_set_field8(&rfcsr, RFCSR36_RF_BS, 0);
-+ rt2800_rfcsr_write(rt2x00dev, 36, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 34, &rfcsr);
-+ if (rf->channel <= 14)
-+ rfcsr = 0x3c;
-+ else
-+ rfcsr = 0x20;
-+ rt2800_rfcsr_write(rt2x00dev, 34, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 12, &rfcsr);
-+ if (rf->channel <= 14)
-+ rfcsr = 0x1a;
-+ else
-+ rfcsr = 0x12;
-+ rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
-+ if (rf->channel >= 1 && rf->channel <= 14)
-+ rt2x00_set_field8(&rfcsr, RFCSR6_VCO_IC, 1);
-+ else if (rf->channel >= 36 && rf->channel <= 64)
-+ rt2x00_set_field8(&rfcsr, RFCSR6_VCO_IC, 2);
-+ else if (rf->channel >= 100 && rf->channel <= 128)
-+ rt2x00_set_field8(&rfcsr, RFCSR6_VCO_IC, 2);
-+ else
-+ rt2x00_set_field8(&rfcsr, RFCSR6_VCO_IC, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR30_RX_VCM, 2);
-+ rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-+
-+ rt2800_rfcsr_write(rt2x00dev, 46, 0x60);
-+
-+ if (rf->channel <= 14) {
-+ rt2800_rfcsr_write(rt2x00dev, 10, 0xd3);
-+ rt2800_rfcsr_write(rt2x00dev, 13, 0x12);
-+ } else {
-+ rt2800_rfcsr_write(rt2x00dev, 10, 0xd8);
-+ rt2800_rfcsr_write(rt2x00dev, 13, 0x23);
-+ }
-+
-+ rt2800_rfcsr_read(rt2x00dev, 51, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR51_BITS01, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 51, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 51, &rfcsr);
-+ if (rf->channel <= 14) {
-+ rt2x00_set_field8(&rfcsr, RFCSR51_BITS24, 5);
-+ rt2x00_set_field8(&rfcsr, RFCSR51_BITS57, 3);
-+ } else {
-+ rt2x00_set_field8(&rfcsr, RFCSR51_BITS24, 4);
-+ rt2x00_set_field8(&rfcsr, RFCSR51_BITS57, 2);
-+ }
-+ rt2800_rfcsr_write(rt2x00dev, 51, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 49, &rfcsr);
-+ if (rf->channel <= 14)
-+ rt2x00_set_field8(&rfcsr, RFCSR49_TX_LO1_IC, 3);
-+ else
-+ rt2x00_set_field8(&rfcsr, RFCSR49_TX_LO1_IC, 2);
-+
-+ if (txbf_enabled)
-+ rt2x00_set_field8(&rfcsr, RFCSR49_TX_DIV, 1);
-+
-+ rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR50_TX_LO1_EN, 0);
-+ rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 57, &rfcsr);
-+ if (rf->channel <= 14)
-+ rt2x00_set_field8(&rfcsr, RFCSR57_DRV_CC, 0x1b);
-+ else
-+ rt2x00_set_field8(&rfcsr, RFCSR57_DRV_CC, 0x0f);
-+ rt2800_rfcsr_write(rt2x00dev, 57, rfcsr);
-+
-+ if (rf->channel <= 14) {
-+ rt2800_rfcsr_write(rt2x00dev, 44, 0x93);
-+ rt2800_rfcsr_write(rt2x00dev, 52, 0x45);
-+ } else {
-+ rt2800_rfcsr_write(rt2x00dev, 44, 0x9b);
-+ rt2800_rfcsr_write(rt2x00dev, 52, 0x05);
-+ }
-+
-+ /* Initiate VCO calibration */
-+ rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
-+ if (rf->channel <= 14) {
-+ rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
-+ } else {
-+ rt2x00_set_field8(&rfcsr, RFCSR3_BIT1, 1);
-+ rt2x00_set_field8(&rfcsr, RFCSR3_BIT2, 1);
-+ rt2x00_set_field8(&rfcsr, RFCSR3_BIT3, 1);
-+ rt2x00_set_field8(&rfcsr, RFCSR3_BIT4, 1);
-+ rt2x00_set_field8(&rfcsr, RFCSR3_BIT5, 1);
-+ rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
-+ }
-+ rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
-+
-+ if (rf->channel >= 1 && rf->channel <= 14) {
-+ rfcsr = 0x23;
-+ if (txbf_enabled)
-+ rt2x00_set_field8(&rfcsr, RFCSR39_RX_DIV, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);
-+
-+ rt2800_rfcsr_write(rt2x00dev, 45, 0xbb);
-+ } else if (rf->channel >= 36 && rf->channel <= 64) {
-+ rfcsr = 0x36;
-+ if (txbf_enabled)
-+ rt2x00_set_field8(&rfcsr, RFCSR39_RX_DIV, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 39, 0x36);
-+
-+ rt2800_rfcsr_write(rt2x00dev, 45, 0xeb);
-+ } else if (rf->channel >= 100 && rf->channel <= 128) {
-+ rfcsr = 0x32;
-+ if (txbf_enabled)
-+ rt2x00_set_field8(&rfcsr, RFCSR39_RX_DIV, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);
-+
-+ rt2800_rfcsr_write(rt2x00dev, 45, 0xb3);
-+ } else {
-+ rfcsr = 0x30;
-+ if (txbf_enabled)
-+ rt2x00_set_field8(&rfcsr, RFCSR39_RX_DIV, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);
-+
-+ rt2800_rfcsr_write(rt2x00dev, 45, 0x9b);
-+ }
- }
-
-+#define POWER_BOUND 0x27
-+#define POWER_BOUND_5G 0x2b
-+
- static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
- struct ieee80211_conf *conf,
- struct rf_channel *rf,
-@@ -2563,6 +3097,23 @@ static void rt2800_iq_calibrate(struct r
- rt2800_bbp_write(rt2x00dev, 159, cal != 0xff ? cal : 0);
- }
-
-+static char rt2800_txpower_to_dev(struct rt2x00_dev *rt2x00dev,
-+ unsigned int channel,
-+ char txpower)
-+{
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ txpower = rt2x00_get_field8(txpower, EEPROM_TXPOWER_ALC);
-+
-+ if (channel <= 14)
-+ return clamp_t(char, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);
-+
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ return clamp_t(char, txpower, MIN_A_TXPOWER_3593,
-+ MAX_A_TXPOWER_3593);
-+ else
-+ return clamp_t(char, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER);
-+}
-+
- static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
- struct ieee80211_conf *conf,
- struct rf_channel *rf,
-@@ -2572,13 +3123,14 @@ static void rt2800_config_channel(struct
- unsigned int tx_pin;
- u8 bbp, rfcsr;
-
-- if (rf->channel <= 14) {
-- info->default_power1 = TXPOWER_G_TO_DEV(info->default_power1);
-- info->default_power2 = TXPOWER_G_TO_DEV(info->default_power2);
-- } else {
-- info->default_power1 = TXPOWER_A_TO_DEV(info->default_power1);
-- info->default_power2 = TXPOWER_A_TO_DEV(info->default_power2);
-- }
-+ info->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,
-+ info->default_power1);
-+ info->default_power2 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,
-+ info->default_power2);
-+ if (rt2x00dev->default_ant.tx_chain_num > 2)
-+ info->default_power3 =
-+ rt2800_txpower_to_dev(rt2x00dev, rf->channel,
-+ info->default_power3);
-
- switch (rt2x00dev->chip.rf) {
- case RF2020:
-@@ -2591,6 +3143,9 @@ static void rt2800_config_channel(struct
- case RF3052:
- rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);
- break;
-+ case RF3053:
-+ rt2800_config_channel_rf3053(rt2x00dev, conf, rf, info);
-+ break;
- case RF3290:
- rt2800_config_channel_rf3290(rt2x00dev, conf, rf, info);
- break;
-@@ -2636,6 +3191,23 @@ static void rt2800_config_channel(struct
- rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
- rt2800_bbp_write(rt2x00dev, 27, 0x20);
- rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
-+ } else if (rt2x00_rt(rt2x00dev, RT3593)) {
-+ if (rf->channel > 14) {
-+ /* Disable CCK Packet detection on 5GHz */
-+ rt2800_bbp_write(rt2x00dev, 70, 0x00);
-+ } else {
-+ rt2800_bbp_write(rt2x00dev, 70, 0x0a);
-+ }
-+
-+ if (conf_is_ht40(conf))
-+ rt2800_bbp_write(rt2x00dev, 105, 0x04);
-+ else
-+ rt2800_bbp_write(rt2x00dev, 105, 0x34);
-+
-+ rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
-+ rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
-+ rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
-+ rt2800_bbp_write(rt2x00dev, 77, 0x98);
- } else {
- rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
- rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
-@@ -2651,16 +3223,27 @@ static void rt2800_config_channel(struct
- rt2800_bbp_write(rt2x00dev, 82, 0x62);
- rt2800_bbp_write(rt2x00dev, 75, 0x46);
- } else {
-- rt2800_bbp_write(rt2x00dev, 82, 0x84);
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ rt2800_bbp_write(rt2x00dev, 82, 0x62);
-+ else
-+ rt2800_bbp_write(rt2x00dev, 82, 0x84);
- rt2800_bbp_write(rt2x00dev, 75, 0x50);
- }
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ rt2800_bbp_write(rt2x00dev, 83, 0x8a);
- }
-+
- } else {
- if (rt2x00_rt(rt2x00dev, RT3572))
- rt2800_bbp_write(rt2x00dev, 82, 0x94);
-+ else if (rt2x00_rt(rt2x00dev, RT3593))
-+ rt2800_bbp_write(rt2x00dev, 82, 0x82);
- else
- rt2800_bbp_write(rt2x00dev, 82, 0xf2);
-
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ rt2800_bbp_write(rt2x00dev, 83, 0x9a);
-+
- if (test_bit(CAPABILITY_EXTERNAL_LNA_A, &rt2x00dev->cap_flags))
- rt2800_bbp_write(rt2x00dev, 75, 0x46);
- else
-@@ -2731,6 +3314,41 @@ static void rt2800_config_channel(struct
- if (rt2x00_rt(rt2x00dev, RT3572))
- rt2800_rfcsr_write(rt2x00dev, 8, 0x80);
-
-+ if (rt2x00_rt(rt2x00dev, RT3593)) {
-+ if (rt2x00_is_usb(rt2x00dev)) {
-+ rt2800_register_read(rt2x00dev, GPIO_CTRL, ®);
-+
-+ /* Band selection. GPIO #8 controls all paths */
-+ rt2x00_set_field32(®, GPIO_CTRL_DIR8, 0);
-+ if (rf->channel <= 14)
-+ rt2x00_set_field32(®, GPIO_CTRL_VAL8, 1);
-+ else
-+ rt2x00_set_field32(®, GPIO_CTRL_VAL8, 0);
-+
-+ rt2x00_set_field32(®, GPIO_CTRL_DIR4, 0);
-+ rt2x00_set_field32(®, GPIO_CTRL_DIR7, 0);
-+
-+ /* LNA PE control.
-+ * GPIO #4 controls PE0 and PE1,
-+ * GPIO #7 controls PE2
-+ */
-+ rt2x00_set_field32(®, GPIO_CTRL_VAL4, 1);
-+ rt2x00_set_field32(®, GPIO_CTRL_VAL7, 1);
-+
-+ rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
-+ }
-+
-+ /* AGC init */
-+ if (rf->channel <= 14)
-+ reg = 0x1c + 2 * rt2x00dev->lna_gain;
-+ else
-+ reg = 0x22 + ((rt2x00dev->lna_gain * 5) / 3);
-+
-+ rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);
-+
-+ usleep_range(1000, 1500);
-+ }
-+
- if (rt2x00_rt(rt2x00dev, RT5592)) {
- rt2800_bbp_write(rt2x00dev, 195, 141);
- rt2800_bbp_write(rt2x00dev, 196, conf_is_ht40(conf) ? 0x10 : 0x1a);
-@@ -2790,6 +3408,13 @@ static int rt2800_get_gain_calibration_d
- int i;
-
- /*
-+ * First check if temperature compensation is supported.
-+ */
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+ if (!rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_EXTERNAL_TX_ALC))
-+ return 0;
-+
-+ /*
- * Read TSSI boundaries for temperature compensation from
- * the EEPROM.
- *
-@@ -2798,62 +3423,62 @@ static int rt2800_get_gain_calibration_d
- * Example TSSI bounds 0xF0 0xD0 0xB5 0xA0 0x88 0x45 0x25 0x15 0x00
- */
- if (rt2x00dev->curr_band == IEEE80211_BAND_2GHZ) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG1, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG1, &eeprom);
- tssi_bounds[0] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG1_MINUS4);
- tssi_bounds[1] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG1_MINUS3);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG2, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG2, &eeprom);
- tssi_bounds[2] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG2_MINUS2);
- tssi_bounds[3] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG2_MINUS1);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG3, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG3, &eeprom);
- tssi_bounds[4] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG3_REF);
- tssi_bounds[5] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG3_PLUS1);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG4, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG4, &eeprom);
- tssi_bounds[6] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG4_PLUS2);
- tssi_bounds[7] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG4_PLUS3);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG5, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_BG5, &eeprom);
- tssi_bounds[8] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG5_PLUS4);
-
- step = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_BG5_AGC_STEP);
- } else {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A1, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A1, &eeprom);
- tssi_bounds[0] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A1_MINUS4);
- tssi_bounds[1] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A1_MINUS3);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A2, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A2, &eeprom);
- tssi_bounds[2] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A2_MINUS2);
- tssi_bounds[3] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A2_MINUS1);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A3, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A3, &eeprom);
- tssi_bounds[4] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A3_REF);
- tssi_bounds[5] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A3_PLUS1);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A4, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A4, &eeprom);
- tssi_bounds[6] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A4_PLUS2);
- tssi_bounds[7] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A4_PLUS3);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A5, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TSSI_BOUND_A5, &eeprom);
- tssi_bounds[8] = rt2x00_get_field16(eeprom,
- EEPROM_TSSI_BOUND_A5_PLUS4);
-
-@@ -2899,7 +3524,7 @@ static int rt2800_get_txpower_bw_comp(st
- u8 comp_type;
- int comp_value = 0;
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_DELTA, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TXPOWER_DELTA, &eeprom);
-
- /*
- * HT40 compensation not required.
-@@ -2966,6 +3591,9 @@ static u8 rt2800_compensate_txpower(stru
- u8 eirp_txpower_criterion;
- u8 reg_limit;
-
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ return min_t(u8, txpower, 0xc);
-+
- if (test_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags)) {
- /*
- * Check if eirp txpower exceed txpower_limit.
-@@ -2974,12 +3602,12 @@ static u8 rt2800_compensate_txpower(stru
- * .11b data rate need add additional 4dbm
- * when calculating eirp txpower.
- */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_BYRATE + 1,
-- &eeprom);
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ 1, &eeprom);
- criterion = rt2x00_get_field16(eeprom,
- EEPROM_TXPOWER_BYRATE_RATE0);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_EIRP_MAX_TX_POWER,
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_EIRP_MAX_TX_POWER,
- &eeprom);
-
- if (band == IEEE80211_BAND_2GHZ)
-@@ -3001,6 +3629,412 @@ static u8 rt2800_compensate_txpower(stru
- return min_t(u8, txpower, 0xc);
- }
-
-+
-+enum {
-+ TX_PWR_CFG_0_IDX,
-+ TX_PWR_CFG_1_IDX,
-+ TX_PWR_CFG_2_IDX,
-+ TX_PWR_CFG_3_IDX,
-+ TX_PWR_CFG_4_IDX,
-+ TX_PWR_CFG_5_IDX,
-+ TX_PWR_CFG_6_IDX,
-+ TX_PWR_CFG_7_IDX,
-+ TX_PWR_CFG_8_IDX,
-+ TX_PWR_CFG_9_IDX,
-+ TX_PWR_CFG_0_EXT_IDX,
-+ TX_PWR_CFG_1_EXT_IDX,
-+ TX_PWR_CFG_2_EXT_IDX,
-+ TX_PWR_CFG_3_EXT_IDX,
-+ TX_PWR_CFG_4_EXT_IDX,
-+ TX_PWR_CFG_IDX_COUNT,
-+};
-+
-+static void rt2800_config_txpower_rt3593(struct rt2x00_dev *rt2x00dev,
-+ struct ieee80211_channel *chan,
-+ int power_level)
-+{
-+ u8 txpower;
-+ u16 eeprom;
-+ u32 regs[TX_PWR_CFG_IDX_COUNT];
-+ unsigned int offset;
-+ enum ieee80211_band band = chan->band;
-+ int delta;
-+ int i;
-+
-+ memset(regs, '\0', sizeof(regs));
-+
-+ /* TODO: adapt TX power reduction from the rt28xx code */
-+
-+ /* calculate temperature compensation delta */
-+ delta = rt2800_get_gain_calibration_delta(rt2x00dev);
-+
-+ if (band == IEEE80211_BAND_5GHZ)
-+ offset = 16;
-+ else
-+ offset = 0;
-+
-+ if (test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
-+ offset += 8;
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset, &eeprom);
-+
-+ /* CCK 1MBS,2MBS */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 1, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_CCK1_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_CCK1_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_EXT_IDX],
-+ TX_PWR_CFG_0_EXT_CCK1_CH2, txpower);
-+
-+ /* CCK 5.5MBS,11MBS */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE1);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 1, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_CCK5_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_CCK5_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_EXT_IDX],
-+ TX_PWR_CFG_0_EXT_CCK5_CH2, txpower);
-+
-+ /* OFDM 6MBS,9MBS */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE2);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_OFDM6_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_OFDM6_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_EXT_IDX],
-+ TX_PWR_CFG_0_EXT_OFDM6_CH2, txpower);
-+
-+ /* OFDM 12MBS,18MBS */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE3);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_OFDM12_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_IDX],
-+ TX_PWR_CFG_0_OFDM12_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_0_EXT_IDX],
-+ TX_PWR_CFG_0_EXT_OFDM12_CH2, txpower);
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset + 1, &eeprom);
-+
-+ /* OFDM 24MBS,36MBS */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_OFDM24_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_OFDM24_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_EXT_IDX],
-+ TX_PWR_CFG_1_EXT_OFDM24_CH2, txpower);
-+
-+ /* OFDM 48MBS */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE1);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_OFDM48_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_OFDM48_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_EXT_IDX],
-+ TX_PWR_CFG_1_EXT_OFDM48_CH2, txpower);
-+
-+ /* OFDM 54MBS */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE2);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_7_IDX],
-+ TX_PWR_CFG_7_OFDM54_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_7_IDX],
-+ TX_PWR_CFG_7_OFDM54_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_7_IDX],
-+ TX_PWR_CFG_7_OFDM54_CH2, txpower);
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset + 2, &eeprom);
-+
-+ /* MCS 0,1 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_MCS0_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_MCS0_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_EXT_IDX],
-+ TX_PWR_CFG_1_EXT_MCS0_CH2, txpower);
-+
-+ /* MCS 2,3 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE1);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_MCS2_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_IDX],
-+ TX_PWR_CFG_1_MCS2_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_1_EXT_IDX],
-+ TX_PWR_CFG_1_EXT_MCS2_CH2, txpower);
-+
-+ /* MCS 4,5 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE2);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS4_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS4_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_EXT_IDX],
-+ TX_PWR_CFG_2_EXT_MCS4_CH2, txpower);
-+
-+ /* MCS 6 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE3);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS6_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS6_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_EXT_IDX],
-+ TX_PWR_CFG_2_EXT_MCS6_CH2, txpower);
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset + 3, &eeprom);
-+
-+ /* MCS 7 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_7_IDX],
-+ TX_PWR_CFG_7_MCS7_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_7_IDX],
-+ TX_PWR_CFG_7_MCS7_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_7_IDX],
-+ TX_PWR_CFG_7_MCS7_CH2, txpower);
-+
-+ /* MCS 8,9 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE1);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS8_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS8_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_EXT_IDX],
-+ TX_PWR_CFG_2_EXT_MCS8_CH2, txpower);
-+
-+ /* MCS 10,11 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE2);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS10_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_IDX],
-+ TX_PWR_CFG_2_MCS10_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_2_EXT_IDX],
-+ TX_PWR_CFG_2_EXT_MCS10_CH2, txpower);
-+
-+ /* MCS 12,13 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE3);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_MCS12_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_MCS12_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_EXT_IDX],
-+ TX_PWR_CFG_3_EXT_MCS12_CH2, txpower);
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset + 4, &eeprom);
-+
-+ /* MCS 14 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_MCS14_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_MCS14_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_EXT_IDX],
-+ TX_PWR_CFG_3_EXT_MCS14_CH2, txpower);
-+
-+ /* MCS 15 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE1);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_8_IDX],
-+ TX_PWR_CFG_8_MCS15_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_8_IDX],
-+ TX_PWR_CFG_8_MCS15_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_8_IDX],
-+ TX_PWR_CFG_8_MCS15_CH2, txpower);
-+
-+ /* MCS 16,17 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE2);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_5_IDX],
-+ TX_PWR_CFG_5_MCS16_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_5_IDX],
-+ TX_PWR_CFG_5_MCS16_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_5_IDX],
-+ TX_PWR_CFG_5_MCS16_CH2, txpower);
-+
-+ /* MCS 18,19 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE3);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_5_IDX],
-+ TX_PWR_CFG_5_MCS18_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_5_IDX],
-+ TX_PWR_CFG_5_MCS18_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_5_IDX],
-+ TX_PWR_CFG_5_MCS18_CH2, txpower);
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset + 5, &eeprom);
-+
-+ /* MCS 20,21 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_6_IDX],
-+ TX_PWR_CFG_6_MCS20_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_6_IDX],
-+ TX_PWR_CFG_6_MCS20_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_6_IDX],
-+ TX_PWR_CFG_6_MCS20_CH2, txpower);
-+
-+ /* MCS 22 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE1);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_6_IDX],
-+ TX_PWR_CFG_6_MCS22_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_6_IDX],
-+ TX_PWR_CFG_6_MCS22_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_6_IDX],
-+ TX_PWR_CFG_6_MCS22_CH2, txpower);
-+
-+ /* MCS 23 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE2);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_8_IDX],
-+ TX_PWR_CFG_8_MCS23_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_8_IDX],
-+ TX_PWR_CFG_8_MCS23_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_8_IDX],
-+ TX_PWR_CFG_8_MCS23_CH2, txpower);
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset + 6, &eeprom);
-+
-+ /* STBC, MCS 0,1 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_STBC0_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_STBC0_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_EXT_IDX],
-+ TX_PWR_CFG_3_EXT_STBC0_CH2, txpower);
-+
-+ /* STBC, MCS 2,3 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE1);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_STBC2_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_IDX],
-+ TX_PWR_CFG_3_STBC2_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_3_EXT_IDX],
-+ TX_PWR_CFG_3_EXT_STBC2_CH2, txpower);
-+
-+ /* STBC, MCS 4,5 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE2);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_4_IDX], TX_PWR_CFG_RATE0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_4_IDX], TX_PWR_CFG_RATE1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_4_EXT_IDX], TX_PWR_CFG_RATE0,
-+ txpower);
-+
-+ /* STBC, MCS 6 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE3);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_4_IDX], TX_PWR_CFG_RATE2, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_4_IDX], TX_PWR_CFG_RATE3, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_4_EXT_IDX], TX_PWR_CFG_RATE2,
-+ txpower);
-+
-+ /* read the next four txpower values */
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ offset + 7, &eeprom);
-+
-+ /* STBC, MCS 7 */
-+ txpower = rt2x00_get_field16(eeprom, EEPROM_TXPOWER_BYRATE_RATE0);
-+ txpower = rt2800_compensate_txpower(rt2x00dev, 0, band, power_level,
-+ txpower, delta);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_9_IDX],
-+ TX_PWR_CFG_9_STBC7_CH0, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_9_IDX],
-+ TX_PWR_CFG_9_STBC7_CH1, txpower);
-+ rt2x00_set_field32(®s[TX_PWR_CFG_9_IDX],
-+ TX_PWR_CFG_9_STBC7_CH2, txpower);
-+
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_0, regs[TX_PWR_CFG_0_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_1, regs[TX_PWR_CFG_1_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_2, regs[TX_PWR_CFG_2_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_3, regs[TX_PWR_CFG_3_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_4, regs[TX_PWR_CFG_4_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_5, regs[TX_PWR_CFG_5_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_6, regs[TX_PWR_CFG_6_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_7, regs[TX_PWR_CFG_7_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_8, regs[TX_PWR_CFG_8_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_9, regs[TX_PWR_CFG_9_IDX]);
-+
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_0_EXT,
-+ regs[TX_PWR_CFG_0_EXT_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_1_EXT,
-+ regs[TX_PWR_CFG_1_EXT_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_2_EXT,
-+ regs[TX_PWR_CFG_2_EXT_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_3_EXT,
-+ regs[TX_PWR_CFG_3_EXT_IDX]);
-+ rt2800_register_write(rt2x00dev, TX_PWR_CFG_4_EXT,
-+ regs[TX_PWR_CFG_4_EXT_IDX]);
-+
-+ for (i = 0; i < TX_PWR_CFG_IDX_COUNT; i++)
-+ rt2x00_dbg(rt2x00dev,
-+ "band:%cGHz, BW:%c0MHz, TX_PWR_CFG_%d%s = %08lx\n",
-+ (band == IEEE80211_BAND_5GHZ) ? '5' : '2',
-+ (test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags)) ?
-+ '4' : '2',
-+ (i > TX_PWR_CFG_9_IDX) ?
-+ (i - TX_PWR_CFG_9_IDX - 1) : i,
-+ (i > TX_PWR_CFG_9_IDX) ? "_EXT" : "",
-+ (unsigned long) regs[i]);
-+}
-+
- /*
- * We configure transmit power using MAC TX_PWR_CFG_{0,...,N} registers and
- * BBP R1 register. TX_PWR_CFG_X allow to configure per rate TX power values,
-@@ -3010,9 +4044,9 @@ static u8 rt2800_compensate_txpower(stru
- * EEPROM_TXPOWER_BYRATE offset. We adjust them and BBP R1 settings according to
- * current conditions (i.e. band, bandwidth, temperature, user settings).
- */
--static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
-- struct ieee80211_channel *chan,
-- int power_level)
-+static void rt2800_config_txpower_rt28xx(struct rt2x00_dev *rt2x00dev,
-+ struct ieee80211_channel *chan,
-+ int power_level)
- {
- u8 txpower, r1;
- u16 eeprom;
-@@ -3080,8 +4114,8 @@ static void rt2800_config_txpower(struct
- rt2800_register_read(rt2x00dev, offset, ®);
-
- /* read the next four txpower values */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_BYRATE + i,
-- &eeprom);
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ i, &eeprom);
-
- is_rate_b = i ? 0 : 1;
- /*
-@@ -3129,8 +4163,8 @@ static void rt2800_config_txpower(struct
- rt2x00_set_field32(®, TX_PWR_CFG_RATE3, txpower);
-
- /* read the next four txpower values */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_BYRATE + i + 1,
-- &eeprom);
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_TXPOWER_BYRATE,
-+ i + 1, &eeprom);
-
- is_rate_b = 0;
- /*
-@@ -3184,6 +4218,16 @@ static void rt2800_config_txpower(struct
- }
- }
-
-+static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
-+ struct ieee80211_channel *chan,
-+ int power_level)
-+{
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ rt2800_config_txpower_rt3593(rt2x00dev, chan, power_level);
-+ else
-+ rt2800_config_txpower_rt28xx(rt2x00dev, chan, power_level);
-+}
-+
- void rt2800_gain_calibration(struct rt2x00_dev *rt2x00dev)
- {
- rt2800_config_txpower(rt2x00dev, rt2x00dev->hw->conf.chandef.chan,
-@@ -3219,6 +4263,7 @@ void rt2800_vco_calibration(struct rt2x0
- rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1);
- rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
- break;
-+ case RF3053:
- case RF3290:
- case RF5360:
- case RF5370:
-@@ -3442,17 +4487,25 @@ static int rt2800_init_registers(struct
- return ret;
-
- rt2800_register_read(rt2x00dev, BCN_OFFSET0, ®);
-- rt2x00_set_field32(®, BCN_OFFSET0_BCN0, 0xe0); /* 0x3800 */
-- rt2x00_set_field32(®, BCN_OFFSET0_BCN1, 0xe8); /* 0x3a00 */
-- rt2x00_set_field32(®, BCN_OFFSET0_BCN2, 0xf0); /* 0x3c00 */
-- rt2x00_set_field32(®, BCN_OFFSET0_BCN3, 0xf8); /* 0x3e00 */
-+ rt2x00_set_field32(®, BCN_OFFSET0_BCN0,
-+ rt2800_get_beacon_offset(rt2x00dev, 0));
-+ rt2x00_set_field32(®, BCN_OFFSET0_BCN1,
-+ rt2800_get_beacon_offset(rt2x00dev, 1));
-+ rt2x00_set_field32(®, BCN_OFFSET0_BCN2,
-+ rt2800_get_beacon_offset(rt2x00dev, 2));
-+ rt2x00_set_field32(®, BCN_OFFSET0_BCN3,
-+ rt2800_get_beacon_offset(rt2x00dev, 3));
- rt2800_register_write(rt2x00dev, BCN_OFFSET0, reg);
-
- rt2800_register_read(rt2x00dev, BCN_OFFSET1, ®);
-- rt2x00_set_field32(®, BCN_OFFSET1_BCN4, 0xc8); /* 0x3200 */
-- rt2x00_set_field32(®, BCN_OFFSET1_BCN5, 0xd0); /* 0x3400 */
-- rt2x00_set_field32(®, BCN_OFFSET1_BCN6, 0x77); /* 0x1dc0 */
-- rt2x00_set_field32(®, BCN_OFFSET1_BCN7, 0x6f); /* 0x1bc0 */
-+ rt2x00_set_field32(®, BCN_OFFSET1_BCN4,
-+ rt2800_get_beacon_offset(rt2x00dev, 4));
-+ rt2x00_set_field32(®, BCN_OFFSET1_BCN5,
-+ rt2800_get_beacon_offset(rt2x00dev, 5));
-+ rt2x00_set_field32(®, BCN_OFFSET1_BCN6,
-+ rt2800_get_beacon_offset(rt2x00dev, 6));
-+ rt2x00_set_field32(®, BCN_OFFSET1_BCN7,
-+ rt2800_get_beacon_offset(rt2x00dev, 7));
- rt2800_register_write(rt2x00dev, BCN_OFFSET1, reg);
-
- rt2800_register_write(rt2x00dev, LEGACY_BASIC_RATE, 0x0000013f);
-@@ -3528,7 +4581,8 @@ static int rt2800_init_registers(struct
- if (rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
- rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||
- rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E)) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1,
-+ &eeprom);
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_DAC_TEST))
- rt2800_register_write(rt2x00dev, TX_SW_CFG2,
- 0x0000002c);
-@@ -3559,6 +4613,23 @@ static int rt2800_init_registers(struct
- } else if (rt2x00_rt(rt2x00dev, RT3572)) {
- rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
- rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
-+ } else if (rt2x00_rt(rt2x00dev, RT3593)) {
-+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000402);
-+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
-+ if (rt2x00_rt_rev_lt(rt2x00dev, RT3593, REV_RT3593E)) {
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1,
-+ &eeprom);
-+ if (rt2x00_get_field16(eeprom,
-+ EEPROM_NIC_CONF1_DAC_TEST))
-+ rt2800_register_write(rt2x00dev, TX_SW_CFG2,
-+ 0x0000001f);
-+ else
-+ rt2800_register_write(rt2x00dev, TX_SW_CFG2,
-+ 0x0000000f);
-+ } else {
-+ rt2800_register_write(rt2x00dev, TX_SW_CFG2,
-+ 0x00000000);
-+ }
- } else if (rt2x00_rt(rt2x00dev, RT5390) ||
- rt2x00_rt(rt2x00dev, RT5392) ||
- rt2x00_rt(rt2x00dev, RT5592)) {
-@@ -3786,14 +4857,8 @@ static int rt2800_init_registers(struct
- /*
- * Clear all beacons
- */
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE0);
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE1);
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE2);
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE3);
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE4);
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE5);
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE6);
-- rt2800_clear_beacon_register(rt2x00dev, HW_BEACON_BASE7);
-+ for (i = 0; i < 8; i++)
-+ rt2800_clear_beacon_register(rt2x00dev, i);
-
- if (rt2x00_is_usb(rt2x00dev)) {
- rt2800_register_read(rt2x00dev, US_CYC_CNT, ®);
-@@ -3989,7 +5054,7 @@ static void rt2800_disable_unused_dac_ad
- u8 value;
-
- rt2800_bbp_read(rt2x00dev, 138, &value);
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
- value |= 0x20;
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
-@@ -4332,6 +5397,22 @@ static void rt2800_init_bbp_3572(struct
- rt2800_disable_unused_dac_adc(rt2x00dev);
- }
-
-+static void rt2800_init_bbp_3593(struct rt2x00_dev *rt2x00dev)
-+{
-+ rt2800_init_bbp_early(rt2x00dev);
-+
-+ rt2800_bbp_write(rt2x00dev, 79, 0x13);
-+ rt2800_bbp_write(rt2x00dev, 80, 0x05);
-+ rt2800_bbp_write(rt2x00dev, 81, 0x33);
-+ rt2800_bbp_write(rt2x00dev, 137, 0x0f);
-+
-+ rt2800_bbp_write(rt2x00dev, 84, 0x19);
-+
-+ /* Enable DC filter */
-+ if (rt2x00_rt_rev_gte(rt2x00dev, RT3593, REV_RT3593E))
-+ rt2800_bbp_write(rt2x00dev, 103, 0xc0);
-+}
-+
- static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev)
- {
- int ant, div_mode;
-@@ -4402,7 +5483,7 @@ static void rt2800_init_bbp_53xx(struct
-
- rt2800_disable_unused_dac_adc(rt2x00dev);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
- div_mode = rt2x00_get_field16(eeprom,
- EEPROM_NIC_CONF1_ANT_DIVERSITY);
- ant = (div_mode == 3) ? 1 : 0;
-@@ -4488,7 +5569,7 @@ static void rt2800_init_bbp_5592(struct
-
- rt2800_bbp4_mac_if_ctrl(rt2x00dev);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
- div_mode = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_ANT_DIVERSITY);
- ant = (div_mode == 3) ? 1 : 0;
- rt2800_bbp_read(rt2x00dev, 152, &value);
-@@ -4547,6 +5628,9 @@ static void rt2800_init_bbp(struct rt2x0
- case RT3572:
- rt2800_init_bbp_3572(rt2x00dev);
- break;
-+ case RT3593:
-+ rt2800_init_bbp_3593(rt2x00dev);
-+ return;
- case RT5390:
- case RT5392:
- rt2800_init_bbp_53xx(rt2x00dev);
-@@ -4557,7 +5641,8 @@ static void rt2800_init_bbp(struct rt2x0
- }
-
- for (i = 0; i < EEPROM_BBP_SIZE; i++) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_BBP_START + i, &eeprom);
-+ rt2800_eeprom_read_from_array(rt2x00dev, EEPROM_BBP_START, i,
-+ &eeprom);
-
- if (eeprom != 0xffff && eeprom != 0x0000) {
- reg_id = rt2x00_get_field16(eeprom, EEPROM_BBP_REG_ID);
-@@ -4728,7 +5813,7 @@ static void rt2800_normal_mode_setup_3xx
- if (rt2x00_rt(rt2x00dev, RT3090)) {
- /* Turn off unused DAC1 and ADC1 to reduce power consumption */
- rt2800_bbp_read(rt2x00dev, 138, &bbp);
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
- rt2x00_set_field8(&bbp, BBP138_RX_ADC1, 0);
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
-@@ -4771,6 +5856,42 @@ static void rt2800_normal_mode_setup_3xx
- }
- }
-
-+static void rt2800_normal_mode_setup_3593(struct rt2x00_dev *rt2x00dev)
-+{
-+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+ u8 rfcsr;
-+ u8 tx_gain;
-+
-+ rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR50_TX_LO2_EN, 0);
-+ rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 51, &rfcsr);
-+ tx_gain = rt2x00_get_field8(drv_data->txmixer_gain_24g,
-+ RFCSR17_TXMIXER_GAIN);
-+ rt2x00_set_field8(&rfcsr, RFCSR51_BITS24, tx_gain);
-+ rt2800_rfcsr_write(rt2x00dev, 51, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR38_RX_LO1_EN, 0);
-+ rt2800_rfcsr_write(rt2x00dev, 38, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 39, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR39_RX_LO2_EN, 0);
-+ rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
-+ rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR30_RX_VCM, 2);
-+ rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-+
-+ /* TODO: enable stream mode */
-+}
-+
- static void rt2800_normal_mode_setup_5xxx(struct rt2x00_dev *rt2x00dev)
- {
- u8 reg;
-@@ -4778,7 +5899,7 @@ static void rt2800_normal_mode_setup_5xx
-
- /* Turn off unused DAC1 and ADC1 to reduce power consumption */
- rt2800_bbp_read(rt2x00dev, 138, ®);
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH) == 1)
- rt2x00_set_field8(®, BBP138_RX_ADC1, 0);
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_TXPATH) == 1)
-@@ -4884,7 +6005,8 @@ static void rt2800_init_rfcsr_30xx(struc
- rt2x00_set_field32(®, LDO_CFG0_BGSEL, 1);
- if (rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
- rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E)) {
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1,
-+ &eeprom);
- if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_DAC_TEST))
- rt2x00_set_field32(®, LDO_CFG0_LDO_CORE_VLEVEL, 3);
- else
-@@ -5152,6 +6274,136 @@ static void rt2800_init_rfcsr_3572(struc
- rt2800_normal_mode_setup_3xxx(rt2x00dev);
- }
-
-+static void rt3593_post_bbp_init(struct rt2x00_dev *rt2x00dev)
-+{
-+ u8 bbp;
-+ bool txbf_enabled = false; /* FIXME */
-+
-+ rt2800_bbp_read(rt2x00dev, 105, &bbp);
-+ if (rt2x00dev->default_ant.rx_chain_num == 1)
-+ rt2x00_set_field8(&bbp, BBP105_MLD, 0);
-+ else
-+ rt2x00_set_field8(&bbp, BBP105_MLD, 1);
-+ rt2800_bbp_write(rt2x00dev, 105, bbp);
-+
-+ rt2800_bbp4_mac_if_ctrl(rt2x00dev);
-+
-+ rt2800_bbp_write(rt2x00dev, 92, 0x02);
-+ rt2800_bbp_write(rt2x00dev, 82, 0x82);
-+ rt2800_bbp_write(rt2x00dev, 106, 0x05);
-+ rt2800_bbp_write(rt2x00dev, 104, 0x92);
-+ rt2800_bbp_write(rt2x00dev, 88, 0x90);
-+ rt2800_bbp_write(rt2x00dev, 148, 0xc8);
-+ rt2800_bbp_write(rt2x00dev, 47, 0x48);
-+ rt2800_bbp_write(rt2x00dev, 120, 0x50);
-+
-+ if (txbf_enabled)
-+ rt2800_bbp_write(rt2x00dev, 163, 0xbd);
-+ else
-+ rt2800_bbp_write(rt2x00dev, 163, 0x9d);
-+
-+ /* SNR mapping */
-+ rt2800_bbp_write(rt2x00dev, 142, 6);
-+ rt2800_bbp_write(rt2x00dev, 143, 160);
-+ rt2800_bbp_write(rt2x00dev, 142, 7);
-+ rt2800_bbp_write(rt2x00dev, 143, 161);
-+ rt2800_bbp_write(rt2x00dev, 142, 8);
-+ rt2800_bbp_write(rt2x00dev, 143, 162);
-+
-+ /* ADC/DAC control */
-+ rt2800_bbp_write(rt2x00dev, 31, 0x08);
-+
-+ /* RX AGC energy lower bound in log2 */
-+ rt2800_bbp_write(rt2x00dev, 68, 0x0b);
-+
-+ /* FIXME: BBP 105 owerwrite? */
-+ rt2800_bbp_write(rt2x00dev, 105, 0x04);
-+
-+}
-+
-+static void rt2800_init_rfcsr_3593(struct rt2x00_dev *rt2x00dev)
-+{
-+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+ u32 reg;
-+ u8 rfcsr;
-+
-+ /* Disable GPIO #4 and #7 function for LAN PE control */
-+ rt2800_register_read(rt2x00dev, GPIO_SWITCH, ®);
-+ rt2x00_set_field32(®, GPIO_SWITCH_4, 0);
-+ rt2x00_set_field32(®, GPIO_SWITCH_7, 0);
-+ rt2800_register_write(rt2x00dev, GPIO_SWITCH, reg);
-+
-+ /* Initialize default register values */
-+ rt2800_rfcsr_write(rt2x00dev, 1, 0x03);
-+ rt2800_rfcsr_write(rt2x00dev, 3, 0x80);
-+ rt2800_rfcsr_write(rt2x00dev, 5, 0x00);
-+ rt2800_rfcsr_write(rt2x00dev, 6, 0x40);
-+ rt2800_rfcsr_write(rt2x00dev, 8, 0xf1);
-+ rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
-+ rt2800_rfcsr_write(rt2x00dev, 10, 0xd3);
-+ rt2800_rfcsr_write(rt2x00dev, 11, 0x40);
-+ rt2800_rfcsr_write(rt2x00dev, 12, 0x4e);
-+ rt2800_rfcsr_write(rt2x00dev, 13, 0x12);
-+ rt2800_rfcsr_write(rt2x00dev, 18, 0x40);
-+ rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
-+ rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
-+ rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-+ rt2800_rfcsr_write(rt2x00dev, 32, 0x78);
-+ rt2800_rfcsr_write(rt2x00dev, 33, 0x3b);
-+ rt2800_rfcsr_write(rt2x00dev, 34, 0x3c);
-+ rt2800_rfcsr_write(rt2x00dev, 35, 0xe0);
-+ rt2800_rfcsr_write(rt2x00dev, 38, 0x86);
-+ rt2800_rfcsr_write(rt2x00dev, 39, 0x23);
-+ rt2800_rfcsr_write(rt2x00dev, 44, 0xd3);
-+ rt2800_rfcsr_write(rt2x00dev, 45, 0xbb);
-+ rt2800_rfcsr_write(rt2x00dev, 46, 0x60);
-+ rt2800_rfcsr_write(rt2x00dev, 49, 0x8e);
-+ rt2800_rfcsr_write(rt2x00dev, 50, 0x86);
-+ rt2800_rfcsr_write(rt2x00dev, 51, 0x75);
-+ rt2800_rfcsr_write(rt2x00dev, 52, 0x45);
-+ rt2800_rfcsr_write(rt2x00dev, 53, 0x18);
-+ rt2800_rfcsr_write(rt2x00dev, 54, 0x18);
-+ rt2800_rfcsr_write(rt2x00dev, 55, 0x18);
-+ rt2800_rfcsr_write(rt2x00dev, 56, 0xdb);
-+ rt2800_rfcsr_write(rt2x00dev, 57, 0x6e);
-+
-+ /* Initiate calibration */
-+ /* TODO: use rt2800_rf_init_calibration ? */
-+ rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-+
-+ rt2800_adjust_freq_offset(rt2x00dev);
-+
-+ rt2800_rfcsr_read(rt2x00dev, 18, &rfcsr);
-+ rt2x00_set_field8(&rfcsr, RFCSR18_XO_TUNE_BYPASS, 1);
-+ rt2800_rfcsr_write(rt2x00dev, 18, rfcsr);
-+
-+ rt2800_register_read(rt2x00dev, LDO_CFG0, ®);
-+ rt2x00_set_field32(®, LDO_CFG0_LDO_CORE_VLEVEL, 3);
-+ rt2x00_set_field32(®, LDO_CFG0_BGSEL, 1);
-+ rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
-+ usleep_range(1000, 1500);
-+ rt2800_register_read(rt2x00dev, LDO_CFG0, ®);
-+ rt2x00_set_field32(®, LDO_CFG0_LDO_CORE_VLEVEL, 0);
-+ rt2800_register_write(rt2x00dev, LDO_CFG0, reg);
-+
-+ /* Set initial values for RX filter calibration */
-+ drv_data->calibration_bw20 = 0x1f;
-+ drv_data->calibration_bw40 = 0x2f;
-+
-+ /* Save BBP 25 & 26 values for later use in channel switching */
-+ rt2800_bbp_read(rt2x00dev, 25, &drv_data->bbp25);
-+ rt2800_bbp_read(rt2x00dev, 26, &drv_data->bbp26);
-+
-+ rt2800_led_open_drain_enable(rt2x00dev);
-+ rt2800_normal_mode_setup_3593(rt2x00dev);
-+
-+ rt3593_post_bbp_init(rt2x00dev);
-+
-+ /* TODO: enable stream mode support */
-+}
-+
- static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
- {
- rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -5380,6 +6632,9 @@ static void rt2800_init_rfcsr(struct rt2
- case RT3572:
- rt2800_init_rfcsr_3572(rt2x00dev);
- break;
-+ case RT3593:
-+ rt2800_init_rfcsr_3593(rt2x00dev);
-+ break;
- case RT5390:
- rt2800_init_rfcsr_5390(rt2x00dev);
- break;
-@@ -5404,19 +6659,20 @@ int rt2800_enable_radio(struct rt2x00_de
- rt2800_init_registers(rt2x00dev)))
- return -EIO;
-
-+ if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev)))
-+ return -EIO;
-+
- /*
- * Send signal to firmware during boot time.
- */
- rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
- rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-- if (rt2x00_is_usb(rt2x00dev)) {
-+ if (rt2x00_is_usb(rt2x00dev))
- rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
-- rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
-- }
-+ rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
- msleep(1);
-
-- if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev) ||
-- rt2800_wait_bbp_ready(rt2x00dev)))
-+ if (unlikely(rt2800_wait_bbp_ready(rt2x00dev)))
- return -EIO;
-
- rt2800_init_bbp(rt2x00dev);
-@@ -5456,15 +6712,15 @@ int rt2800_enable_radio(struct rt2x00_de
- /*
- * Initialize LED control
- */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_LED_AG_CONF, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_LED_AG_CONF, &word);
- rt2800_mcu_request(rt2x00dev, MCU_LED_AG_CONF, 0xff,
- word & 0xff, (word >> 8) & 0xff);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_LED_ACT_CONF, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_LED_ACT_CONF, &word);
- rt2800_mcu_request(rt2x00dev, MCU_LED_ACT_CONF, 0xff,
- word & 0xff, (word >> 8) & 0xff);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_LED_POLARITY, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_LED_POLARITY, &word);
- rt2800_mcu_request(rt2x00dev, MCU_LED_LED_POLARITY, 0xff,
- word & 0xff, (word >> 8) & 0xff);
-
-@@ -5560,6 +6816,34 @@ int rt2800_read_eeprom_efuse(struct rt2x
- }
- EXPORT_SYMBOL_GPL(rt2800_read_eeprom_efuse);
-
-+static u8 rt2800_get_txmixer_gain_24g(struct rt2x00_dev *rt2x00dev)
-+{
-+ u16 word;
-+
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ return 0;
-+
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &word);
-+ if ((word & 0x00ff) != 0x00ff)
-+ return rt2x00_get_field16(word, EEPROM_TXMIXER_GAIN_BG_VAL);
-+
-+ return 0;
-+}
-+
-+static u8 rt2800_get_txmixer_gain_5g(struct rt2x00_dev *rt2x00dev)
-+{
-+ u16 word;
-+
-+ if (rt2x00_rt(rt2x00dev, RT3593))
-+ return 0;
-+
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_A, &word);
-+ if ((word & 0x00ff) != 0x00ff)
-+ return rt2x00_get_field16(word, EEPROM_TXMIXER_GAIN_A_VAL);
-+
-+ return 0;
-+}
-+
- static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
- {
- struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-@@ -5578,18 +6862,18 @@ static int rt2800_validate_eeprom(struct
- /*
- * Start validation of the data that has been read.
- */
-- mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
-+ mac = rt2800_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
- if (!is_valid_ether_addr(mac)) {
- eth_random_addr(mac);
- rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);
- }
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &word);
- if (word == 0xffff) {
- rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 2);
- rt2x00_set_field16(&word, EEPROM_NIC_CONF0_TXPATH, 1);
- rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
- rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
- } else if (rt2x00_rt(rt2x00dev, RT2860) ||
- rt2x00_rt(rt2x00dev, RT2872)) {
-@@ -5598,10 +6882,10 @@ static int rt2800_validate_eeprom(struct
- */
- if (rt2x00_get_field16(word, EEPROM_NIC_CONF0_RXPATH) > 2)
- rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 2);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
- }
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &word);
- if (word == 0xffff) {
- rt2x00_set_field16(&word, EEPROM_NIC_CONF1_HW_RADIO, 0);
- rt2x00_set_field16(&word, EEPROM_NIC_CONF1_EXTERNAL_TX_ALC, 0);
-@@ -5618,24 +6902,24 @@ static int rt2800_validate_eeprom(struct
- rt2x00_set_field16(&word, EEPROM_NIC_CONF1_INTERNAL_TX_ALC, 0);
- rt2x00_set_field16(&word, EEPROM_NIC_CONF1_BT_COEXIST, 0);
- rt2x00_set_field16(&word, EEPROM_NIC_CONF1_DAC_TEST, 0);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF1, word);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF1, word);
- rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);
- }
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_FREQ, &word);
- if ((word & 0x00ff) == 0x00ff) {
- rt2x00_set_field16(&word, EEPROM_FREQ_OFFSET, 0);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
- rt2x00_eeprom_dbg(rt2x00dev, "Freq: 0x%04x\n", word);
- }
- if ((word & 0xff00) == 0xff00) {
- rt2x00_set_field16(&word, EEPROM_FREQ_LED_MODE,
- LED_MODE_TXRX_ACTIVITY);
- rt2x00_set_field16(&word, EEPROM_FREQ_LED_POLARITY, 0);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_AG_CONF, 0x5555);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_ACT_CONF, 0x2221);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_POLARITY, 0xa9f8);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_FREQ, word);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_LED_AG_CONF, 0x5555);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_LED_ACT_CONF, 0x2221);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_LED_POLARITY, 0xa9f8);
- rt2x00_eeprom_dbg(rt2x00dev, "Led Mode: 0x%04x\n", word);
- }
-
-@@ -5644,56 +6928,61 @@ static int rt2800_validate_eeprom(struct
- * lna0 as correct value. Note that EEPROM_LNA
- * is never validated.
- */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_LNA, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_LNA, &word);
- default_lna_gain = rt2x00_get_field16(word, EEPROM_LNA_A0);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG, &word);
- if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG_OFFSET0)) > 10)
- rt2x00_set_field16(&word, EEPROM_RSSI_BG_OFFSET0, 0);
- if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG_OFFSET1)) > 10)
- rt2x00_set_field16(&word, EEPROM_RSSI_BG_OFFSET1, 0);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_BG, word);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_BG, word);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &word);
-- if ((word & 0x00ff) != 0x00ff) {
-- drv_data->txmixer_gain_24g =
-- rt2x00_get_field16(word, EEPROM_TXMIXER_GAIN_BG_VAL);
-- } else {
-- drv_data->txmixer_gain_24g = 0;
-- }
-+ drv_data->txmixer_gain_24g = rt2800_get_txmixer_gain_24g(rt2x00dev);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word);
- if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) > 10)
- rt2x00_set_field16(&word, EEPROM_RSSI_BG2_OFFSET2, 0);
-- if (rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0x00 ||
-- rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0xff)
-- rt2x00_set_field16(&word, EEPROM_RSSI_BG2_LNA_A1,
-- default_lna_gain);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_BG2, word);
--
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_A, &word);
-- if ((word & 0x00ff) != 0x00ff) {
-- drv_data->txmixer_gain_5g =
-- rt2x00_get_field16(word, EEPROM_TXMIXER_GAIN_A_VAL);
-- } else {
-- drv_data->txmixer_gain_5g = 0;
-+ if (!rt2x00_rt(rt2x00dev, RT3593)) {
-+ if (rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0x00 ||
-+ rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0xff)
-+ rt2x00_set_field16(&word, EEPROM_RSSI_BG2_LNA_A1,
-+ default_lna_gain);
- }
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_BG2, word);
-+
-+ drv_data->txmixer_gain_5g = rt2800_get_txmixer_gain_5g(rt2x00dev);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A, &word);
- if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A_OFFSET0)) > 10)
- rt2x00_set_field16(&word, EEPROM_RSSI_A_OFFSET0, 0);
- if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A_OFFSET1)) > 10)
- rt2x00_set_field16(&word, EEPROM_RSSI_A_OFFSET1, 0);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_A, word);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_A, word);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &word);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &word);
- if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A2_OFFSET2)) > 10)
- rt2x00_set_field16(&word, EEPROM_RSSI_A2_OFFSET2, 0);
-- if (rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0x00 ||
-- rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0xff)
-- rt2x00_set_field16(&word, EEPROM_RSSI_A2_LNA_A2,
-- default_lna_gain);
-- rt2x00_eeprom_write(rt2x00dev, EEPROM_RSSI_A2, word);
-+ if (!rt2x00_rt(rt2x00dev, RT3593)) {
-+ if (rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0x00 ||
-+ rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0xff)
-+ rt2x00_set_field16(&word, EEPROM_RSSI_A2_LNA_A2,
-+ default_lna_gain);
-+ }
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_A2, word);
-+
-+ if (rt2x00_rt(rt2x00dev, RT3593)) {
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &word);
-+ if (rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0x00 ||
-+ rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0xff)
-+ rt2x00_set_field16(&word, EEPROM_EXT_LNA2_A1,
-+ default_lna_gain);
-+ if (rt2x00_get_field16(word, EEPROM_EXT_LNA2_A2) == 0x00 ||
-+ rt2x00_get_field16(word, EEPROM_EXT_LNA2_A2) == 0xff)
-+ rt2x00_set_field16(&word, EEPROM_EXT_LNA2_A1,
-+ default_lna_gain);
-+ rt2800_eeprom_write(rt2x00dev, EEPROM_EXT_LNA2, word);
-+ }
-
- return 0;
- }
-@@ -5707,7 +6996,7 @@ static int rt2800_init_eeprom(struct rt2
- /*
- * Read EEPROM word for configuration.
- */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-
- /*
- * Identify RF chipset by EEPROM value
-@@ -5717,7 +7006,7 @@ static int rt2800_init_eeprom(struct rt2
- if (rt2x00_rt(rt2x00dev, RT3290) ||
- rt2x00_rt(rt2x00dev, RT5390) ||
- rt2x00_rt(rt2x00dev, RT5392))
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
- else
- rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
-
-@@ -5731,6 +7020,7 @@ static int rt2800_init_eeprom(struct rt2
- case RF3021:
- case RF3022:
- case RF3052:
-+ case RF3053:
- case RF3290:
- case RF3320:
- case RF3322:
-@@ -5757,7 +7047,7 @@ static int rt2800_init_eeprom(struct rt2
- rt2x00dev->default_ant.rx_chain_num =
- rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RXPATH);
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-
- if (rt2x00_rt(rt2x00dev, RT3070) ||
- rt2x00_rt(rt2x00dev, RT3090) ||
-@@ -5810,7 +7100,7 @@ static int rt2800_init_eeprom(struct rt2
- /*
- * Read frequency offset and RF programming sequence.
- */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_FREQ, &eeprom);
- rt2x00dev->freq_offset = rt2x00_get_field16(eeprom, EEPROM_FREQ_OFFSET);
-
- /*
-@@ -5827,7 +7117,7 @@ static int rt2800_init_eeprom(struct rt2
- /*
- * Check if support EIRP tx power limit feature.
- */
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_EIRP_MAX_TX_POWER, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_EIRP_MAX_TX_POWER, &eeprom);
-
- if (rt2x00_get_field16(eeprom, EEPROM_EIRP_MAX_TX_POWER_2GHZ) <
- EIRP_MAX_TX_POWER_LIMIT)
-@@ -6109,12 +7399,79 @@ static const struct rf_channel rf_vals_5
- {196, 83, 0, 12, 1},
- };
-
-+static const struct rf_channel rf_vals_3053[] = {
-+ /* Channel, N, R, K */
-+ {1, 241, 2, 2},
-+ {2, 241, 2, 7},
-+ {3, 242, 2, 2},
-+ {4, 242, 2, 7},
-+ {5, 243, 2, 2},
-+ {6, 243, 2, 7},
-+ {7, 244, 2, 2},
-+ {8, 244, 2, 7},
-+ {9, 245, 2, 2},
-+ {10, 245, 2, 7},
-+ {11, 246, 2, 2},
-+ {12, 246, 2, 7},
-+ {13, 247, 2, 2},
-+ {14, 248, 2, 4},
-+
-+ {36, 0x56, 0, 4},
-+ {38, 0x56, 0, 6},
-+ {40, 0x56, 0, 8},
-+ {44, 0x57, 0, 0},
-+ {46, 0x57, 0, 2},
-+ {48, 0x57, 0, 4},
-+ {52, 0x57, 0, 8},
-+ {54, 0x57, 0, 10},
-+ {56, 0x58, 0, 0},
-+ {60, 0x58, 0, 4},
-+ {62, 0x58, 0, 6},
-+ {64, 0x58, 0, 8},
-+
-+ {100, 0x5B, 0, 8},
-+ {102, 0x5B, 0, 10},
-+ {104, 0x5C, 0, 0},
-+ {108, 0x5C, 0, 4},
-+ {110, 0x5C, 0, 6},
-+ {112, 0x5C, 0, 8},
-+
-+ /* NOTE: Channel 114 has been removed intentionally.
-+ * The EEPROM contains no TX power values for that,
-+ * and it is disabled in the vendor driver as well.
-+ */
-+
-+ {116, 0x5D, 0, 0},
-+ {118, 0x5D, 0, 2},
-+ {120, 0x5D, 0, 4},
-+ {124, 0x5D, 0, 8},
-+ {126, 0x5D, 0, 10},
-+ {128, 0x5E, 0, 0},
-+ {132, 0x5E, 0, 4},
-+ {134, 0x5E, 0, 6},
-+ {136, 0x5E, 0, 8},
-+ {140, 0x5F, 0, 0},
-+
-+ {149, 0x5F, 0, 9},
-+ {151, 0x5F, 0, 11},
-+ {153, 0x60, 0, 1},
-+ {157, 0x60, 0, 5},
-+ {159, 0x60, 0, 7},
-+ {161, 0x60, 0, 9},
-+ {165, 0x61, 0, 1},
-+ {167, 0x61, 0, 3},
-+ {169, 0x61, 0, 5},
-+ {171, 0x61, 0, 7},
-+ {173, 0x61, 0, 9},
-+};
-+
- static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
- {
- struct hw_mode_spec *spec = &rt2x00dev->spec;
- struct channel_info *info;
- char *default_power1;
- char *default_power2;
-+ char *default_power3;
- unsigned int i;
- u16 eeprom;
- u32 reg;
-@@ -6149,7 +7506,7 @@ static int rt2800_probe_hw_mode(struct r
-
- SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
- SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
-- rt2x00_eeprom_addr(rt2x00dev,
-+ rt2800_eeprom_addr(rt2x00dev,
- EEPROM_MAC_ADDR_0));
-
- /*
-@@ -6165,7 +7522,7 @@ static int rt2800_probe_hw_mode(struct r
- rt2x00dev->hw->max_report_rates = 7;
- rt2x00dev->hw->max_rate_tries = 1;
-
-- rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-+ rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);
-
- /*
- * Initialize hw_mode information.
-@@ -6200,6 +7557,10 @@ static int rt2800_probe_hw_mode(struct r
- spec->supported_bands |= SUPPORT_BAND_5GHZ;
- spec->num_channels = ARRAY_SIZE(rf_vals_3x);
- spec->channels = rf_vals_3x;
-+ } else if (rt2x00_rf(rt2x00dev, RF3053)) {
-+ spec->supported_bands |= SUPPORT_BAND_5GHZ;
-+ spec->num_channels = ARRAY_SIZE(rf_vals_3053);
-+ spec->channels = rf_vals_3053;
- } else if (rt2x00_rf(rt2x00dev, RF5592)) {
- spec->supported_bands |= SUPPORT_BAND_5GHZ;
-
-@@ -6265,21 +7626,40 @@ static int rt2800_probe_hw_mode(struct r
-
- spec->channels_info = info;
-
-- default_power1 = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_BG1);
-- default_power2 = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_BG2);
-+ default_power1 = rt2800_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_BG1);
-+ default_power2 = rt2800_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_BG2);
-+
-+ if (rt2x00dev->default_ant.tx_chain_num > 2)
-+ default_power3 = rt2800_eeprom_addr(rt2x00dev,
-+ EEPROM_EXT_TXPOWER_BG3);
-+ else
-+ default_power3 = NULL;
-
- for (i = 0; i < 14; i++) {
- info[i].default_power1 = default_power1[i];
- info[i].default_power2 = default_power2[i];
-+ if (default_power3)
-+ info[i].default_power3 = default_power3[i];
- }
-
- if (spec->num_channels > 14) {
-- default_power1 = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A1);
-- default_power2 = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A2);
-+ default_power1 = rt2800_eeprom_addr(rt2x00dev,
-+ EEPROM_TXPOWER_A1);
-+ default_power2 = rt2800_eeprom_addr(rt2x00dev,
-+ EEPROM_TXPOWER_A2);
-+
-+ if (rt2x00dev->default_ant.tx_chain_num > 2)
-+ default_power3 =
-+ rt2800_eeprom_addr(rt2x00dev,
-+ EEPROM_EXT_TXPOWER_A3);
-+ else
-+ default_power3 = NULL;
-
- for (i = 14; i < spec->num_channels; i++) {
- info[i].default_power1 = default_power1[i - 14];
- info[i].default_power2 = default_power2[i - 14];
-+ if (default_power3)
-+ info[i].default_power3 = default_power3[i - 14];
- }
- }
-
-@@ -6290,6 +7670,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3022:
- case RF3320:
- case RF3052:
-+ case RF3053:
- case RF3290:
- case RF5360:
- case RF5370:
-@@ -6328,6 +7709,7 @@ static int rt2800_probe_rt(struct rt2x00
- case RT3352:
- case RT3390:
- case RT3572:
-+ case RT3593:
- case RT5390:
- case RT5392:
- case RT5592:
---- a/drivers/net/wireless/rt2x00/rt2800lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
-@@ -226,4 +226,8 @@ int rt2800_get_survey(struct ieee80211_h
- struct survey_info *survey);
- void rt2800_disable_wpdma(struct rt2x00_dev *rt2x00dev);
-
-+void rt2800_get_txwi_rxwi_size(struct rt2x00_dev *rt2x00dev,
-+ unsigned short *txwi_size,
-+ unsigned short *rxwi_size);
-+
- #endif /* RT2800LIB_H */
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -507,9 +507,13 @@ static int rt2800pci_init_registers(stru
- rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
-
- if (rt2x00_is_pcie(rt2x00dev) &&
-- (rt2x00_rt(rt2x00dev, RT3572) ||
-+ (rt2x00_rt(rt2x00dev, RT3090) ||
-+ rt2x00_rt(rt2x00dev, RT3390) ||
-+ rt2x00_rt(rt2x00dev, RT3572) ||
-+ rt2x00_rt(rt2x00dev, RT3593) ||
- rt2x00_rt(rt2x00dev, RT5390) ||
-- rt2x00_rt(rt2x00dev, RT5392))) {
-+ rt2x00_rt(rt2x00dev, RT5392) ||
-+ rt2x00_rt(rt2x00dev, RT5592))) {
- rt2x00mmio_register_read(rt2x00dev, AUX_CTRL, ®);
- rt2x00_set_field32(®, AUX_CTRL_FORCE_PCIE_CLK, 1);
- rt2x00_set_field32(®, AUX_CTRL_WAKE_PCIE_EN, 1);
-@@ -1189,12 +1193,17 @@ static const struct rt2x00lib_ops rt2800
-
- static void rt2800pci_queue_init(struct data_queue *queue)
- {
-+ struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
-+ unsigned short txwi_size, rxwi_size;
-+
-+ rt2800_get_txwi_rxwi_size(rt2x00dev, &txwi_size, &rxwi_size);
-+
- switch (queue->qid) {
- case QID_RX:
- queue->limit = 128;
- queue->data_size = AGGREGATION_SIZE;
- queue->desc_size = RXD_DESC_SIZE;
-- queue->winfo_size = RXWI_DESC_SIZE_4WORDS;
-+ queue->winfo_size = rxwi_size;
- queue->priv_size = sizeof(struct queue_entry_priv_mmio);
- break;
-
-@@ -1205,7 +1214,7 @@ static void rt2800pci_queue_init(struct
- queue->limit = 64;
- queue->data_size = AGGREGATION_SIZE;
- queue->desc_size = TXD_DESC_SIZE;
-- queue->winfo_size = TXWI_DESC_SIZE_4WORDS;
-+ queue->winfo_size = txwi_size;
- queue->priv_size = sizeof(struct queue_entry_priv_mmio);
- break;
-
-@@ -1213,7 +1222,7 @@ static void rt2800pci_queue_init(struct
- queue->limit = 8;
- queue->data_size = 0; /* No DMA required for beacons */
- queue->desc_size = TXD_DESC_SIZE;
-- queue->winfo_size = TXWI_DESC_SIZE_4WORDS;
-+ queue->winfo_size = txwi_size;
- queue->priv_size = sizeof(struct queue_entry_priv_mmio);
- break;
-
---- a/drivers/net/wireless/rt2x00/rt2800usb.c
-+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -176,8 +176,8 @@ static bool rt2800usb_tx_sta_fifo_read_c
- queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
-
- if (rt2800usb_txstatus_pending(rt2x00dev)) {
-- /* Read register after 250 us */
-- hrtimer_start(&rt2x00dev->txstatus_timer, ktime_set(0, 250000),
-+ /* Read register after 1 ms */
-+ hrtimer_start(&rt2x00dev->txstatus_timer, ktime_set(0, 1000000),
- HRTIMER_MODE_REL);
- return false;
- }
-@@ -202,8 +202,8 @@ static void rt2800usb_async_read_tx_stat
- if (test_and_set_bit(TX_STATUS_READING, &rt2x00dev->flags))
- return;
-
-- /* Read TX_STA_FIFO register after 500 us */
-- hrtimer_start(&rt2x00dev->txstatus_timer, ktime_set(0, 500000),
-+ /* Read TX_STA_FIFO register after 2 ms */
-+ hrtimer_start(&rt2x00dev->txstatus_timer, ktime_set(0, 2000000),
- HRTIMER_MODE_REL);
- }
-
-@@ -854,13 +854,7 @@ static void rt2800usb_queue_init(struct
- struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
- unsigned short txwi_size, rxwi_size;
-
-- if (rt2x00_rt(rt2x00dev, RT5592)) {
-- txwi_size = TXWI_DESC_SIZE_5WORDS;
-- rxwi_size = RXWI_DESC_SIZE_6WORDS;
-- } else {
-- txwi_size = TXWI_DESC_SIZE_4WORDS;
-- rxwi_size = RXWI_DESC_SIZE_4WORDS;
-- }
-+ rt2800_get_txwi_rxwi_size(rt2x00dev, &txwi_size, &rxwi_size);
-
- switch (queue->qid) {
- case QID_RX:
-@@ -1194,6 +1188,40 @@ static struct usb_device_id rt2800usb_de
- /* Zinwell */
- { USB_DEVICE(0x5a57, 0x0284) },
- #endif
-+#ifdef CPTCFG_RT2800USB_RT3573
-+ /* AirLive */
-+ { USB_DEVICE(0x1b75, 0x7733) },
-+ /* ASUS */
-+ { USB_DEVICE(0x0b05, 0x17bc) },
-+ { USB_DEVICE(0x0b05, 0x17ad) },
-+ /* Belkin */
-+ { USB_DEVICE(0x050d, 0x1103) },
-+ /* Cameo */
-+ { USB_DEVICE(0x148f, 0xf301) },
-+ /* Edimax */
-+ { USB_DEVICE(0x7392, 0x7733) },
-+ /* Hawking */
-+ { USB_DEVICE(0x0e66, 0x0020) },
-+ { USB_DEVICE(0x0e66, 0x0021) },
-+ /* I-O DATA */
-+ { USB_DEVICE(0x04bb, 0x094e) },
-+ /* Linksys */
-+ { USB_DEVICE(0x13b1, 0x003b) },
-+ /* Logitec */
-+ { USB_DEVICE(0x0789, 0x016b) },
-+ /* NETGEAR */
-+ { USB_DEVICE(0x0846, 0x9012) },
-+ { USB_DEVICE(0x0846, 0x9019) },
-+ /* Planex */
-+ { USB_DEVICE(0x2019, 0xed19) },
-+ /* Ralink */
-+ { USB_DEVICE(0x148f, 0x3573) },
-+ /* Sitecom */
-+ { USB_DEVICE(0x0df6, 0x0067) },
-+ { USB_DEVICE(0x0df6, 0x006a) },
-+ /* ZyXEL */
-+ { USB_DEVICE(0x0586, 0x3421) },
-+#endif
- #ifdef CPTCFG_RT2800USB_RT53XX
- /* Arcadyan */
- { USB_DEVICE(0x043e, 0x7a12) },
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -211,6 +211,7 @@ struct channel_info {
- short max_power;
- short default_power1;
- short default_power2;
-+ short default_power3;
- };
-
- /*
diff --git a/package/kernel/mac80211/patches/310-ap_scan.patch b/package/kernel/mac80211/patches/310-ap_scan.patch
index e81dfc98cac1a43dc06e94d2af89de51b7ff9dc0..869bff7b63cf74b653c2be43b6540420135c7098 100644
--- a/package/kernel/mac80211/patches/310-ap_scan.patch
+++ b/package/kernel/mac80211/patches/310-ap_scan.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2102,7 +2102,7 @@ static int ieee80211_scan(struct wiphy *
+@@ -2113,7 +2113,7 @@ static int ieee80211_scan(struct wiphy *
* the frames sent while scanning on other channel will be
* lost)
*/
diff --git a/package/kernel/mac80211/patches/400-ath_move_debug_code.patch b/package/kernel/mac80211/patches/400-ath_move_debug_code.patch
index aa5ce94d1edd48125717a30f06e6f6859cac128d..901dcb1cd448cfd2c6688c02c30611934b8f3b39 100644
--- a/package/kernel/mac80211/patches/400-ath_move_debug_code.patch
+++ b/package/kernel/mac80211/patches/400-ath_move_debug_code.patch
@@ -1,12 +1,12 @@
--- a/drivers/net/wireless/ath/Makefile
+++ b/drivers/net/wireless/ath/Makefile
-@@ -11,7 +11,7 @@ obj-$(CPTCFG_ATH_COMMON) += ath.o
- ath-objs := main.o \
+@@ -13,8 +13,8 @@ ath-objs := main.o \
regd.o \
hw.o \
-- key.o
-+ key.o \
-+ debug.o
+ key.o \
++ debug.o \
+ dfs_pattern_detector.o \
+ dfs_pri_detector.o
-ath-$(CPTCFG_ATH_DEBUG) += debug.o
ccflags-y += -D__CHECK_ENDIAN__
diff --git a/package/kernel/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch b/package/kernel/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
index c25f9d0cce318ed611fc1f50e5c9f203423a14b1..e347f534ff0fe6c848fed04ac58cfbba1e11f823 100644
--- a/package/kernel/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/kernel/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,7 +8,7 @@
#include <asm/unaligned.h>
#include "hw.h"
-@@ -513,8 +514,16 @@ static int ath9k_hw_init_macaddr(struct
+@@ -512,8 +513,16 @@ static int ath9k_hw_init_macaddr(struct
common->macaddr[2 * i] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff;
}
diff --git a/package/kernel/mac80211/patches/403-ath_regd_optional.patch b/package/kernel/mac80211/patches/403-ath_regd_optional.patch
index 303c4d7792dd5cd2dfd99a3d9414bf03f439a000..7b175edb1bc087db2e1f8bf5b2f9fa7e4e12abe9 100644
--- a/package/kernel/mac80211/patches/403-ath_regd_optional.patch
+++ b/package/kernel/mac80211/patches/403-ath_regd_optional.patch
@@ -11,7 +11,7 @@
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (!wiphy->bands[band])
-@@ -250,6 +254,10 @@ ath_reg_apply_active_scan_flags(struct w
+@@ -249,6 +253,10 @@ ath_reg_apply_active_scan_flags(struct w
struct ieee80211_channel *ch;
const struct ieee80211_reg_rule *reg_rule;
@@ -22,7 +22,7 @@
sband = wiphy->bands[IEEE80211_BAND_2GHZ];
if (!sband)
return;
-@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st
+@@ -298,6 +306,10 @@ static void ath_reg_apply_radar_flags(st
struct ieee80211_channel *ch;
unsigned int i;
@@ -33,7 +33,7 @@
if (!wiphy->bands[IEEE80211_BAND_5GHZ])
return;
-@@ -503,6 +515,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -606,6 +618,10 @@ ath_regd_init_wiphy(struct ath_regulator
{
const struct ieee80211_regdomain *regd;
@@ -58,11 +58,11 @@
---help---
--- a/.local-symbols
+++ b/.local-symbols
-@@ -123,6 +123,7 @@ RTL8187_LEDS=
+@@ -126,6 +126,7 @@ RTL8187_LEDS=
ATH_COMMON=
ATH_CARDS=
ATH_DEBUG=
+ATH_USER_REGD=
+ ATH_REG_DYNAMIC_USER_REG_HINTS=
+ ATH_REG_DYNAMIC_USER_CERT_TESTING=
ATH5K=
- ATH5K_DEBUG=
- ATH5K_TRACER=
diff --git a/package/kernel/mac80211/patches/404-world_regd_fixup.patch b/package/kernel/mac80211/patches/404-world_regd_fixup.patch
index 7a5840eb1878a0ca28379f9692562192ae407706..a0f4d1f52a701146302dd023f125372d23d86dd9 100644
--- a/package/kernel/mac80211/patches/404-world_regd_fixup.patch
+++ b/package/kernel/mac80211/patches/404-world_regd_fixup.patch
@@ -1,15 +1,15 @@
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -42,7 +42,8 @@ static int __ath_regd_init(struct ath_re
- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)
+ NL80211_RRF_NO_IR | NL80211_RRF_NO_OFDM)
/* We allow IBSS on these on a case by case basis by regulatory domain */
-#define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5350+10, 80, 0, 30,\
-+#define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5250, 80, 0, 30, 0), \
-+ REG_RULE(5250, 5350+10, 80, 0, 30,\
- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
++#define ATH9K_5GHZ_5150_5350 REG_RULE(5150-10, 5240+10, 80, 0, 30, 0),\
++ REG_RULE(5260-10, 5350+10, 80, 0, 30,\
+ NL80211_RRF_NO_IR)
#define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 5850+10, 80, 0, 30,\
- NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
+ NL80211_RRF_NO_IR)
@@ -60,57 +61,56 @@ static int __ath_regd_init(struct ath_re
#define ATH9K_5GHZ_NO_MIDBAND ATH9K_5GHZ_5150_5350, \
ATH9K_5GHZ_5725_5850
diff --git a/package/kernel/mac80211/patches/405-regd_no_assoc_hints.patch b/package/kernel/mac80211/patches/405-regd_no_assoc_hints.patch
index 5380853df65a56a9aed72a6e4a6c28e76cf08ebe..f6668b04cca7d2bf0a98ee417e37f4a8e7d2c364 100644
--- a/package/kernel/mac80211/patches/405-regd_no_assoc_hints.patch
+++ b/package/kernel/mac80211/patches/405-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
-@@ -1696,6 +1696,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1706,6 +1706,8 @@ void regulatory_hint_country_ie(struct w
enum environment_cap env = ENVIRON_ANY;
struct regulatory_request *request = NULL, *lr;
@@ -9,7 +9,7 @@
/* IE len must be evenly divisible by 2 */
if (country_ie_len & 0x01)
return;
-@@ -1890,6 +1892,7 @@ static void restore_regulatory_settings(
+@@ -1900,6 +1902,7 @@ static void restore_regulatory_settings(
void regulatory_hint_disconnect(void)
{
diff --git a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
index 7d69ced99b1474369f63565ec36a522d5880f684..8f8ae785a6e6f2f9ef7bf59b0d5770227dd37e6d 100644
--- a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
+++ b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
@@ -1,10 +1,10 @@
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -814,6 +814,7 @@ static const struct ieee80211_iface_limi
+@@ -844,6 +844,7 @@ static const struct ieee80211_iface_limi
#endif
BIT(NL80211_IFTYPE_AP) |
BIT(NL80211_IFTYPE_P2P_GO) },
+ { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
};
-
+ static const struct ieee80211_iface_limit if_dfs_limits[] = {
diff --git a/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
index 12e03e1bb13876affaf06f91c8fa3979cf3354ab..5af3bd8dffdb500ce43bdf14c544aebdb45caec0 100644
--- a/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
+++ b/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
@@ -18,7 +18,7 @@
goto end;
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -1916,7 +1916,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
+@@ -1951,7 +1951,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
}
if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs +
@@ -27,7 +27,7 @@
ah->opmode == NL80211_IFTYPE_MESH_POINT) {
u64 tsf = ath5k_hw_get_tsf64(ah);
u32 tsftu = TSF_TO_TU(tsf);
-@@ -2002,7 +2002,7 @@ ath5k_beacon_update_timers(struct ath5k_
+@@ -2037,7 +2037,7 @@ ath5k_beacon_update_timers(struct ath5k_
intval = ah->bintval & AR5K_BEACON_PERIOD;
if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs
@@ -36,7 +36,7 @@
intval /= ATH_BCBUF; /* staggered multi-bss beacons */
if (intval < 15)
ATH5K_WARN(ah, "intval %u is too low, min 15\n",
-@@ -2469,6 +2469,7 @@ static const struct ieee80211_iface_limi
+@@ -2504,6 +2504,7 @@ static const struct ieee80211_iface_limi
BIT(NL80211_IFTYPE_MESH_POINT) |
#endif
BIT(NL80211_IFTYPE_AP) },
diff --git a/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch b/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
index 01c28bcca262f94cb3263a28d2aee51e6b1dcec1..61b3fb93f6aef2703305009cb388a11da05b8153 100644
--- a/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
+++ b/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
@@ -11,7 +11,7 @@ drivers/net/wireless/ath/ath5k/debug.c | 86 ++++++++++++++++++++++++++++++++
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
-@@ -811,6 +811,89 @@ static const struct file_operations fops
+@@ -821,6 +821,89 @@ static const struct file_operations fops
.llseek = default_llseek,
};
@@ -101,7 +101,7 @@ drivers/net/wireless/ath/ath5k/debug.c | 86 ++++++++++++++++++++++++++++++++
/* debugfs: queues etc */
-@@ -902,6 +985,9 @@ ath5k_debug_init_device(struct ath5k_hw
+@@ -914,6 +997,9 @@ ath5k_debug_init_device(struct ath5k_hw
debugfs_create_file("beacon", S_IWUSR | S_IRUSR, phydir, ah,
&fops_beacon);
diff --git a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
index e50429f733d7fb1d9e1287911f3cfbce9030915f..321e75e43ca11c498be336a4d432e79654cc1433 100644
--- a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1871,6 +1871,53 @@ void ath9k_deinit_debug(struct ath_softc
+@@ -1782,6 +1782,53 @@ void ath9k_deinit_debug(struct ath_softc
}
}
@@ -54,9 +54,9 @@
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
-@@ -1888,6 +1935,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-
+@@ -1800,6 +1847,8 @@ int ath9k_init_debug(struct ath_hw *ah)
ath9k_dfs_init_debug(sc);
+ ath9k_tx99_init_debug(sc);
+ debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+ &fops_eeprom);
diff --git a/package/kernel/mac80211/patches/501-ath9k-eeprom_endianess.patch b/package/kernel/mac80211/patches/501-ath9k-eeprom_endianess.patch
index 284a82a273be0c485d4b95e0bef1e7d2645345d6..0ce6a6a38ad4dbd96143b37c9def1b89b9a8ddc3 100644
--- a/package/kernel/mac80211/patches/501-ath9k-eeprom_endianess.patch
+++ b/package/kernel/mac80211/patches/501-ath9k-eeprom_endianess.patch
@@ -71,7 +71,7 @@
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -717,6 +717,7 @@ enum ath_cal_list {
+@@ -727,6 +727,7 @@ enum ath_cal_list {
#define AH_USE_EEPROM 0x1
#define AH_UNPLUGGED 0x2 /* The card has been physically removed. */
#define AH_FASTCC 0x4
@@ -81,7 +81,7 @@
struct ath_ops reg_ops;
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -665,6 +665,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -695,6 +695,8 @@ static int ath9k_init_softc(u16 devid, s
ah->is_clk_25mhz = pdata->is_clk_25mhz;
ah->get_mac_revision = pdata->get_mac_revision;
ah->external_reset = pdata->external_reset;
@@ -89,7 +89,7 @@
+ ah->ah_flags |= AH_NO_EEP_SWAP;
}
- common = ath9k_hw_common(ah);
+ common->ops = &ah->reg_ops;
--- a/include/linux/ath9k_platform.h
+++ b/include/linux/ath9k_platform.h
@@ -31,6 +31,7 @@ struct ath9k_platform_data {
diff --git a/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
index 0a031392bc2764f88e7e298bc798f52b2b5837d8..c45b638143a3b546c400dd097af4079711028630 100644
--- a/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
+++ b/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -1072,23 +1072,23 @@ static int __init ath9k_init(void)
+@@ -1086,23 +1086,23 @@ static int __init ath9k_init(void)
goto err_out;
}
diff --git a/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch b/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
index d6cce38f5f333dc2a54a718decfc8608b291a755..c1c1ea84f378e17c5aec1f3fe25686e528de0ffc 100644
--- a/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
+++ b/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1993,8 +1993,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -2014,8 +2014,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
REG_WRITE(ah, AR_OBS, 8);
if (ah->config.rx_intr_mitigation) {
diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index dce58607313536486cc5f570c63906c4680bb571..2b16ae12785593e2e09c9a37c4325deb87489806 100644
--- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1918,6 +1918,52 @@ static const struct file_operations fops
+@@ -1829,6 +1829,52 @@ static const struct file_operations fops
.owner = THIS_MODULE
};
@@ -53,7 +53,7 @@
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
-@@ -1937,6 +1983,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1849,6 +1895,8 @@ int ath9k_init_debug(struct ath_hw *ah)
debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
&fops_eeprom);
diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
index dc428743f97cf722e5860a52837c5a049f239019..dd5bb2fb146dd9bf94b5913c45c4d7bba111ce24 100644
--- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
+++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
@@ -1,10 +1,10 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -724,6 +724,7 @@ int ath9k_hw_init(struct ath_hw *ah)
+@@ -732,6 +732,7 @@ int ath9k_hw_init(struct ath_hw *ah)
case AR9300_DEVID_AR9462:
case AR9485_DEVID_AR1111:
case AR9300_DEVID_AR9565:
-+ case AR9300_DEVID_AR9381:
++ case AR9300_DEVID_INVALID:
break;
default:
if (common->bus_ops->ath_bus_type == ATH_USB)
@@ -14,17 +14,17 @@
#define AR9300_DEVID_QCA955X 0x0038
#define AR9485_DEVID_AR1111 0x0037
#define AR9300_DEVID_AR9565 0x0036
-+#define AR9300_DEVID_AR9381 0xabcd
++#define AR9300_DEVID_INVALID 0xabcd
#define AR5416_AR9100_DEVID 0x000b
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -270,6 +270,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
- { PCI_VDEVICE(ATHEROS, 0x0034) }, /* PCI-E AR9462 */
- { PCI_VDEVICE(ATHEROS, 0x0037) }, /* PCI-E AR1111/AR9485 */
- { PCI_VDEVICE(ATHEROS, 0x0036) }, /* PCI-E AR9565 */
-+ { PCI_VDEVICE(ATHEROS, 0xabcd) }, /* PCI-E AR9381 */
+@@ -463,6 +463,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
+ { PCI_VDEVICE(ATHEROS, 0x0036),
+ .driver_data = ATH9K_PCI_BT_ANT_DIV },
+
++ { PCI_VDEVICE(ATHEROS, 0xabcd) }, /* PCI-E internal chip default ID */
{ 0 }
};
diff --git a/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
index dc848774d445f505d3f61e3c2b30d74386355830..f2b87f2edd4fca5be53f0c1a64083394868f0ea4 100644
--- a/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
+++ b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -1,6 +1,6 @@
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -1622,6 +1622,7 @@ struct ieee80211_hw {
+@@ -1659,6 +1659,7 @@ struct ieee80211_hw {
u8 max_tx_aggregation_subframes;
u8 offchannel_tx_hw_queue;
u8 radiotap_mcs_details;
@@ -10,7 +10,7 @@
u8 uapsd_queues;
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2283,7 +2283,9 @@ static int ieee80211_get_tx_power(struct
+@@ -2294,7 +2294,9 @@ static int ieee80211_get_tx_power(struct
struct ieee80211_local *local = wiphy_priv(wiphy);
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
@@ -23,7 +23,7 @@
*dbm = sdata->vif.bss_conf.txpower;
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -167,6 +167,7 @@ static u32 ieee80211_hw_conf_chan(struct
+@@ -158,6 +158,7 @@ static u32 ieee80211_hw_conf_chan(struct
if (local->hw.conf.power_level != power) {
changed |= IEEE80211_CONF_CHANGE_POWER;
diff --git a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
index 9d5acb9a0ffb1aeae088017720ba61a37436a163..ab59411db9d9c85283b39d20001a7f6522416a13 100644
--- a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
+++ b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
@@ -14,7 +14,7 @@
out:
spin_unlock_bh(&sc->sc_pcu_lock);
-@@ -1304,6 +1308,7 @@ static int ath9k_config(struct ieee80211
+@@ -1340,6 +1344,7 @@ static int ath9k_config(struct ieee80211
sc->config.txpowlimit = 2 * conf->power_level;
ath9k_cmn_update_txpow(ah, sc->curtxpow,
sc->config.txpowlimit, &sc->curtxpow);
diff --git a/package/kernel/mac80211/patches/522-ath9k_per_chain_signal_strength.patch b/package/kernel/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
index 5a6c503f26623efd9f2a5686fa725ab2a825313a..94e0154551da00d773e2fe7d6a04a682215e13a6 100644
--- a/package/kernel/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
+++ b/package/kernel/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
@@ -17,7 +17,7 @@
u8 rs_moreaggr;
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -892,6 +892,7 @@ static void ath9k_process_rssi(struct at
+@@ -906,6 +906,7 @@ static void ath9k_process_rssi(struct at
struct ath_hw *ah = common->ah;
int last_rssi;
int rssi = rx_stats->rs_rssi;
@@ -25,7 +25,7 @@
/*
* RSSI is not available for subframes in an A-MPDU.
-@@ -910,6 +911,20 @@ static void ath9k_process_rssi(struct at
+@@ -924,6 +925,20 @@ static void ath9k_process_rssi(struct at
return;
}
@@ -46,15 +46,34 @@
/*
* Update Beacon RSSI, this is used by ANI.
*/
-@@ -1000,7 +1015,7 @@ static int ath_process_fft(struct ath_so
- fft_sample.tlv.length = __cpu_to_be16(length);
+@@ -1073,14 +1088,14 @@ static int ath_process_fft(struct ath_so
+ fft_sample_40.channel_type = chan_type;
- fft_sample.freq = __cpu_to_be16(ah->curchan->chan->center_freq);
-- fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
-+ fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
- fft_sample.noise = ah->noise;
+ if (chan_type == NL80211_CHAN_HT40PLUS) {
+- lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
+- upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ext0);
++ lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
++ upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ext[0]);
- switch (len - SPECTRAL_HT20_TOTAL_DATA_LEN) {
+ fft_sample_40.lower_noise = ah->noise;
+ fft_sample_40.upper_noise = ext_nf;
+ } else {
+- lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ext0);
+- upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
++ lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ext[0]);
++ upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
+
+ fft_sample_40.lower_noise = ext_nf;
+ fft_sample_40.upper_noise = ah->noise;
+@@ -1116,7 +1131,7 @@ static int ath_process_fft(struct ath_so
+ fft_sample_20.tlv.length = __cpu_to_be16(length);
+ fft_sample_20.freq = __cpu_to_be16(freq);
+
+- fft_sample_20.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
++ fft_sample_20.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
+ fft_sample_20.noise = ah->noise;
+
+ mag_info = ((struct ath_ht20_mag_info *)radar_info) - 1;
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -476,12 +476,12 @@ int ath9k_hw_process_rxdesc_edma(struct
@@ -131,7 +150,7 @@
* hardware stores this as 8 bit signed value.
--- a/drivers/net/wireless/ath/ath9k/antenna.c
+++ b/drivers/net/wireless/ath/ath9k/antenna.c
-@@ -744,14 +744,14 @@ void ath_ant_comb_scan(struct ath_softc
+@@ -724,14 +724,14 @@ void ath_ant_comb_scan(struct ath_softc
struct ath_ant_comb *antcomb = &sc->ant_comb;
int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
int curr_main_set;
diff --git a/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch
index f223f7e78b760253067330ad1af046e87a9190ec..6901184e3e279a1f71b1c599dd686e49e933be6f 100644
--- a/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch
@@ -1,6 +1,24 @@
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -2081,6 +2081,7 @@ struct cfg80211_update_ft_ies_params {
+ * (as advertised by the nl80211 feature flag.)
+ * @get_tx_power: store the current TX power into the dbm variable;
+ * return 0 if successful
++ * @set_antenna_gain: set antenna gain to reduce maximum tx power if necessary
+ *
+ * @set_wds_peer: set the WDS peer for a WDS interface
+ *
+@@ -2303,6 +2304,7 @@ struct cfg80211_ops {
+ enum nl80211_tx_power_setting type, int mbm);
+ int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
+ int *dbm);
++ int (*set_antenna_gain)(struct wiphy *wiphy, int dbi);
+
+ int (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *addr);
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -1002,6 +1002,7 @@ enum ieee80211_smps_mode {
+@@ -1029,6 +1029,7 @@ enum ieee80211_smps_mode {
*
* @power_level: requested transmit power (in dBm), backward compatibility
* value only that is set to the minimum of all interfaces
@@ -8,7 +26,7 @@
*
* @chandef: the channel definition to tune to
* @radar_enabled: whether radar detection is enabled
-@@ -1023,6 +1024,7 @@ struct ieee80211_conf {
+@@ -1050,6 +1051,7 @@ struct ieee80211_conf {
u32 flags;
int power_level, dynamic_ps_timeout;
int max_sleep_period;
@@ -16,73 +34,30 @@
u16 listen_interval;
u8 ps_dtim_period;
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -1130,6 +1130,7 @@ struct ieee80211_local {
- int dynamic_ps_forced_timeout;
-
- int user_power_level; /* in dBm, for all interfaces */
-+ int user_antenna_gain; /* in dBi */
-
- enum ieee80211_smps_mode smps_mode;
-
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
-@@ -1460,6 +1460,9 @@ enum nl80211_commands {
- * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
- * field in the probe response (%NL80211_ATTR_PROBE_RESP).
+@@ -1511,6 +1511,9 @@ enum nl80211_commands {
+ * @NL80211_ATTR_SUPPORT_5_10_MHZ: A flag indicating that the device supports
+ * 5 MHz and 10 MHz channel bandwidth.
*
+ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
-+ * transmit power to stay within regulatory limits.
++ * transmit power to stay within regulatory limits. u32, dBi.
+ *
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
*/
-@@ -1766,6 +1769,8 @@ enum nl80211_attrs {
- NL80211_ATTR_CSA_C_OFF_BEACON,
- NL80211_ATTR_CSA_C_OFF_PRESP,
+@@ -1829,6 +1832,8 @@ enum nl80211_attrs {
+
+ NL80211_ATTR_SUPPORT_5_10_MHZ,
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
---- a/net/wireless/nl80211.c
-+++ b/net/wireless/nl80211.c
-@@ -354,6 +354,7 @@ static const struct nla_policy nl80211_p
- [NL80211_ATTR_CSA_IES] = { .type = NLA_NESTED },
- [NL80211_ATTR_CSA_C_OFF_BEACON] = { .type = NLA_U16 },
- [NL80211_ATTR_CSA_C_OFF_PRESP] = { .type = NLA_U16 },
-+ [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
- };
-
- /* policy for the key attributes */
-@@ -2000,6 +2001,22 @@ static int nl80211_set_wiphy(struct sk_b
- goto bad_res;
- }
-
-+ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
-+ int idx, dbi = 0;
-+
-+ if (!rdev->ops->set_antenna_gain) {
-+ result = -EOPNOTSUPP;
-+ goto bad_res;
-+ }
-+
-+ idx = NL80211_ATTR_WIPHY_ANTENNA_GAIN;
-+ dbi = nla_get_u32(info->attrs[idx]);
-+
-+ result = rdev->ops->set_antenna_gain(&rdev->wiphy, dbi);
-+ if (result)
-+ goto bad_res;
-+ }
-+
- if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
- info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
- u32 tx_ant, rx_ant;
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2293,6 +2293,19 @@ static int ieee80211_get_tx_power(struct
+@@ -2304,6 +2304,19 @@ static int ieee80211_get_tx_power(struct
return 0;
}
@@ -102,7 +77,7 @@
static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
const u8 *addr)
{
-@@ -3656,6 +3669,7 @@ struct cfg80211_ops mac80211_config_ops
+@@ -3839,6 +3852,7 @@ struct cfg80211_ops mac80211_config_ops
.set_wiphy_params = ieee80211_set_wiphy_params,
.set_tx_power = ieee80211_set_tx_power,
.get_tx_power = ieee80211_get_tx_power,
@@ -110,37 +85,30 @@
.set_wds_peer = ieee80211_set_wds_peer,
.rfkill_poll = ieee80211_rfkill_poll,
CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -1994,6 +1994,7 @@ struct cfg80211_update_ft_ies_params {
- * (as advertised by the nl80211 feature flag.)
- * @get_tx_power: store the current TX power into the dbm variable;
- * return 0 if successful
-+ * @set_antenna_gain: set antenna gain to reduce maximum tx power if necessary
- *
- * @set_wds_peer: set the WDS peer for a WDS interface
- *
-@@ -2215,6 +2216,7 @@ struct cfg80211_ops {
- enum nl80211_tx_power_setting type, int mbm);
- int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
- int *dbm);
-+ int (*set_antenna_gain)(struct wiphy *wiphy, int dbi);
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1179,6 +1179,7 @@ struct ieee80211_local {
+ int dynamic_ps_forced_timeout;
+
+ int user_power_level; /* in dBm, for all interfaces */
++ int user_antenna_gain; /* in dBi */
+
+ enum ieee80211_smps_mode smps_mode;
- int (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
- const u8 *addr);
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -102,6 +102,7 @@ static u32 ieee80211_hw_conf_chan(struct
+@@ -101,7 +101,7 @@ static u32 ieee80211_hw_conf_chan(struct
+ struct ieee80211_sub_if_data *sdata;
struct cfg80211_chan_def chandef = {};
u32 changed = 0;
- int power = 0;
-+ int ant_gain, max_power;
+- int power;
++ int power, ant_gain, max_power;
u32 offchannel_flag;
offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
-@@ -165,8 +166,21 @@ static u32 ieee80211_hw_conf_chan(struct
-
- power = min(power, chandef.chan->max_power);
+@@ -156,8 +156,21 @@ static u32 ieee80211_hw_conf_chan(struct
+ }
+ rcu_read_unlock();
- if (local->hw.conf.power_level != power) {
+ max_power = chandef.chan->max_reg_power;
@@ -155,13 +123,13 @@
+ }
+
+ if (local->hw.conf.power_level != power ||
-+ local->hw.conf.max_antenna_gain != ant_gain) {
++ local->hw.conf.max_antenna_gain != ant_gain) {
changed |= IEEE80211_CONF_CHANGE_POWER;
+ local->hw.conf.max_antenna_gain = ant_gain;
local->hw.cur_power_level = power;
local->hw.conf.power_level = power;
}
-@@ -597,6 +611,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -588,6 +601,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(
IEEE80211_RADIOTAP_MCS_HAVE_BW;
local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
@@ -169,3 +137,36 @@
local->hw.uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
local->hw.uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -357,6 +357,7 @@ static const struct nla_policy nl80211_p
+ [NL80211_ATTR_STA_SUPPORTED_CHANNELS] = { .type = NLA_BINARY },
+ [NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES] = { .type = NLA_BINARY },
+ [NL80211_ATTR_HANDLE_DFS] = { .type = NLA_FLAG },
++ [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
+ };
+
+ /* policy for the key attributes */
+@@ -2038,6 +2039,22 @@ static int nl80211_set_wiphy(struct sk_b
+ goto bad_res;
+ }
+
++ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
++ int idx, dbi = 0;
++
++ if (!rdev->ops->set_antenna_gain) {
++ result = -EOPNOTSUPP;
++ goto bad_res;
++ }
++
++ idx = NL80211_ATTR_WIPHY_ANTENNA_GAIN;
++ dbi = nla_get_u32(info->attrs[idx]);
++
++ result = rdev->ops->set_antenna_gain(&rdev->wiphy, dbi);
++ if (result)
++ goto bad_res;
++ }
++
+ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
+ info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
+ u32 tx_ant, rx_ant;
diff --git a/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch b/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch
index 20f94b6bc745c2ed1fc7f36f411ccb1b1ca9c72c..9f93869178790f55a62991a4e3e506a9dcff2dcd 100644
--- a/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch
@@ -10,7 +10,7 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2832,7 +2832,7 @@ void ath9k_hw_apply_txpower(struct ath_h
+@@ -2853,7 +2853,7 @@ void ath9k_hw_apply_txpower(struct ath_h
channel = chan->chan;
chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
new_pwr = min_t(int, chan_pwr, reg->power_limit);
@@ -21,7 +21,7 @@
if (ant_gain > max_gain)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1304,7 +1304,10 @@ static int ath9k_config(struct ieee80211
+@@ -1340,7 +1340,10 @@ static int ath9k_config(struct ieee80211
}
if (changed & IEEE80211_CONF_CHANGE_POWER) {
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index 2d548492756d8d56fc4f040b157b6152f4502d80..e136d6b03c70d6a1aac1251d5812c437c8000a30 100644
--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -561,6 +561,9 @@ struct ath9k_wow_pattern {
+@@ -558,6 +558,9 @@ struct ath9k_wow_pattern {
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
void ath_fill_led_pin(struct ath_softc *sc);
@@ -10,7 +10,7 @@
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
-@@ -705,6 +708,13 @@ enum spectral_mode {
+@@ -732,6 +735,13 @@ enum spectral_mode {
SPECTRAL_CHANSCAN,
};
@@ -24,7 +24,7 @@
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
-@@ -747,9 +757,8 @@ struct ath_softc {
+@@ -774,9 +784,8 @@ struct ath_softc {
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
#ifdef CPTCFG_MAC80211_LEDS
@@ -162,7 +162,7 @@
void ath_fill_led_pin(struct ath_softc *sc)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -978,7 +978,7 @@ int ath9k_init_device(u16 devid, struct
+@@ -992,7 +992,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CPTCFG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */
@@ -173,7 +173,7 @@
#endif
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1963,6 +1963,61 @@ static const struct file_operations fops
+@@ -1874,6 +1874,61 @@ static const struct file_operations fops
.llseek = default_llseek,
};
@@ -235,7 +235,7 @@
int ath9k_init_debug(struct ath_hw *ah)
{
-@@ -1985,6 +2040,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1897,6 +1952,10 @@ int ath9k_init_debug(struct ath_hw *ah)
&fops_eeprom);
debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
sc, &fops_chanbw);
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
index e3125bf8be8db7cc7ada9c86c45aabb25bbfed9e..b17585575a48cb27badc6cb28706db9b0f8b7a20 100644
--- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -2019,6 +2019,50 @@ static const struct file_operations fops
+@@ -1930,6 +1930,50 @@ static const struct file_operations fops
#endif
@@ -51,7 +51,7 @@
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
-@@ -2044,6 +2088,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1956,6 +2000,8 @@ int ath9k_init_debug(struct ath_hw *ah)
debugfs_create_file("gpio_led", S_IWUSR,
sc->debug.debugfs_phy, sc, &fops_gpio_led);
#endif
@@ -62,7 +62,7 @@
debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -475,6 +475,12 @@ enum {
+@@ -480,6 +480,12 @@ enum {
ATH9K_RESET_COLD,
};
@@ -75,7 +75,7 @@
struct ath9k_hw_version {
u32 magic;
u16 devid;
-@@ -755,6 +761,8 @@ struct ath_hw {
+@@ -765,6 +771,8 @@ struct ath_hw {
u32 rfkill_polarity;
u32 ah_flags;
@@ -84,7 +84,7 @@
bool reset_power_on;
bool htc_reset_init;
-@@ -1005,6 +1013,7 @@ void ath9k_hw_set_sta_beacon_timers(stru
+@@ -1016,6 +1024,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
bool ath9k_hw_check_alive(struct ath_hw *ah);
bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
@@ -94,7 +94,7 @@
void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause);
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1840,6 +1840,20 @@ fail:
+@@ -1861,6 +1861,20 @@ fail:
return -EINVAL;
}
@@ -115,7 +115,7 @@
int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
struct ath9k_hw_cal_data *caldata, bool fastcc)
{
-@@ -2039,6 +2053,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -2060,6 +2074,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
}
ath9k_hw_apply_gpio_override(ah);
@@ -125,7 +125,7 @@
REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -565,6 +565,11 @@ irqreturn_t ath_isr(int irq, void *dev)
+@@ -571,6 +571,11 @@ irqreturn_t ath_isr(int irq, void *dev)
ath9k_hw_getisr(ah, &status); /* NB: clears ISR too */
status &= ah->imask; /* discard unasked-for bits */
diff --git a/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch b/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch
index 779ed6498d11654cf6439c70ae5be8149ddf921c..573a735282aaeb1a1741e8fbbaefecc557681967 100644
--- a/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch
+++ b/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch
@@ -12,7 +12,7 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2432,17 +2432,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+@@ -2453,17 +2453,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
}
eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE);
@@ -48,7 +48,7 @@
AR_SREV_9285(ah) ||
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -925,6 +925,8 @@ struct ath_hw {
+@@ -935,6 +935,8 @@ struct ath_hw {
bool is_clk_25mhz;
int (*get_mac_revision)(void);
int (*external_reset)(void);
@@ -59,7 +59,7 @@
};
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -665,6 +665,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -695,6 +695,8 @@ static int ath9k_init_softc(u16 devid, s
ah->is_clk_25mhz = pdata->is_clk_25mhz;
ah->get_mac_revision = pdata->get_mac_revision;
ah->external_reset = pdata->external_reset;
diff --git a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
index d6333459b0dfb20752a8007073300fe5fd1ce13e..d49dc65887f814b90f1e501c89e49ac04fb8b644 100644
--- a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
+++ b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -676,6 +676,7 @@ struct ath_spec_scan {
+@@ -682,6 +682,7 @@ struct ath_spec_scan {
* @config_pci_powersave:
* @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
*
@@ -8,7 +8,7 @@
* @spectral_scan_config: set parameters for spectral scan and enable/disable it
* @spectral_scan_trigger: trigger a spectral scan run
* @spectral_scan_wait: wait for a spectral scan run to finish
-@@ -698,6 +699,7 @@ struct ath_hw_ops {
+@@ -704,6 +705,7 @@ struct ath_hw_ops {
struct ath_hw_antcomb_conf *antconf);
void (*antdiv_comb_conf_set)(struct ath_hw *ah,
struct ath_hw_antcomb_conf *antconf);
@@ -18,8 +18,8 @@
void (*spectral_scan_trigger)(struct ath_hw *ah);
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -1609,6 +1609,26 @@ static void ar9003_hw_spectral_scan_wait
- }
+@@ -1709,6 +1709,26 @@ static void ar9003_hw_tx99_set_txpower(s
+ ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14], 0));
}
+static void ar9003_hw_get_adc_entropy(struct ath_hw *ah, u8 *buf, size_t len)
@@ -45,7 +45,7 @@
void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
{
struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
-@@ -1639,6 +1659,7 @@ void ar9003_hw_attach_phy_ops(struct ath
+@@ -1739,6 +1759,7 @@ void ar9003_hw_attach_phy_ops(struct ath
priv_ops->set_radar_params = ar9003_hw_set_radar_params;
priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;
@@ -55,7 +55,7 @@
ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -794,7 +794,8 @@ static void ath9k_init_txpower_limits(st
+@@ -824,7 +824,8 @@ static void ath9k_init_txpower_limits(st
if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
@@ -65,7 +65,7 @@
}
void ath9k_reload_chainmask_settings(struct ath_softc *sc)
-@@ -940,6 +941,18 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -954,6 +955,18 @@ void ath9k_set_hw_capab(struct ath_softc
SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
}
@@ -84,7 +84,7 @@
int ath9k_init_device(u16 devid, struct ath_softc *sc,
const struct ath_bus_ops *bus_ops)
{
-@@ -985,6 +998,8 @@ int ath9k_init_device(u16 devid, struct
+@@ -999,6 +1012,8 @@ int ath9k_init_device(u16 devid, struct
ARRAY_SIZE(ath9k_tpt_blink));
#endif
@@ -95,8 +95,8 @@
if (error)
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
-@@ -78,6 +78,12 @@ static inline void ath9k_hw_antdiv_comb_
- ath9k_hw_ops(ah)->antdiv_comb_conf_set(ah, antconf);
+@@ -94,6 +94,12 @@ static inline void ath9k_hw_tx99_set_txp
+ ath9k_hw_ops(ah)->tx99_set_txpower(ah, power);
}
+static inline void ath9k_hw_get_adc_entropy(struct ath_hw *ah,
@@ -110,7 +110,7 @@
static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
--- a/drivers/net/wireless/ath/ath9k/link.c
+++ b/drivers/net/wireless/ath/ath9k/link.c
-@@ -342,6 +342,11 @@ void ath_ani_calibrate(unsigned long dat
+@@ -354,6 +354,11 @@ void ath_ani_calibrate(unsigned long dat
unsigned int timestamp = jiffies_to_msecs(jiffies);
u32 cal_interval, short_cal_interval, long_cal_interval;
unsigned long flags;
@@ -120,11 +120,11 @@
+ ath9k_hw_get_adc_entropy(ah, buf, sizeof(buf));
+ add_device_randomness(buf, sizeof(buf));
- if (ah->caldata && ah->caldata->nfcal_interference)
+ if (ah->caldata && test_bit(NFCAL_INTF, &ah->caldata->cal_flags))
long_cal_interval = ATH_LONG_CALINTERVAL_INT;
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
-@@ -1299,9 +1299,30 @@ static void ar5008_hw_set_radar_conf(str
+@@ -1296,9 +1296,30 @@ static void ar5008_hw_set_radar_conf(str
conf->radar_inband = 8;
}
@@ -155,7 +155,7 @@
static const u32 ar5416_cca_regs[6] = {
AR_PHY_CCA,
AR_PHY_CH1_CCA,
-@@ -1316,6 +1337,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
+@@ -1313,6 +1334,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
if (ret)
return ret;
diff --git a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
index 6c80c3dfa81d65c3adb1724ac8fb1ebbf1d6a7d0..8893bc1b2ad1da9a7a6f4a45c1680430d9586a91 100644
--- a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
+++ b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
@@ -22,10 +22,10 @@
+#endif /* _RT2X00_PLATFORM_H */
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -39,6 +39,7 @@
- #include <linux/input-polldev.h>
+@@ -40,6 +40,7 @@
#include <linux/kfifo.h>
#include <linux/hrtimer.h>
+ #include <linux/average.h>
+#include <linux/rt2x00_platform.h>
#include <net/mac80211.h>
diff --git a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
index be95fae8a027bbe4bb02b4041135c5d3e98e0e21..40176c27ba01740114593bf77dfc1bf0739bb033 100644
--- a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
+++ b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
@@ -1,6 +1,158 @@
+--- a/.local-symbols
++++ b/.local-symbols
+@@ -283,6 +283,7 @@ RT2X00_LIB_FIRMWARE=
+ RT2X00_LIB_CRYPTO=
+ RT2X00_LIB_LEDS=
+ RT2X00_LIB_DEBUGFS=
++RT2X00_LIB_EEPROM=
+ RT2X00_DEBUG=
+ RTL_CARDS=
+ RTL8192CE=
+--- a/drivers/net/wireless/rt2x00/Kconfig
++++ b/drivers/net/wireless/rt2x00/Kconfig
+@@ -69,6 +69,7 @@ config RT2800PCI
+ select RT2X00_LIB_MMIO
+ select RT2X00_LIB_PCI
+ select RT2X00_LIB_FIRMWARE
++ select RT2X00_LIB_EEPROM
+ select RT2X00_LIB_CRYPTO
+ depends on CRC_CCITT
+ depends on EEPROM_93CX6
+@@ -215,6 +216,7 @@ config RT2800SOC
+ select RT2X00_LIB_MMIO
+ select RT2X00_LIB_CRYPTO
+ select RT2X00_LIB_FIRMWARE
++ select RT2X00_LIB_EEPROM
+ select RT2800_LIB
+ select RT2800_LIB_MMIO
+ ---help---
+@@ -266,6 +268,9 @@ config RT2X00_LIB_FIRMWARE
+ config RT2X00_LIB_CRYPTO
+ boolean
+
++config RT2X00_LIB_EEPROM
++ boolean
++
+ config RT2X00_LIB_LEDS
+ boolean
+ default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)
+--- a/drivers/net/wireless/rt2x00/Makefile
++++ b/drivers/net/wireless/rt2x00/Makefile
+@@ -7,6 +7,7 @@ rt2x00lib-$(CPTCFG_RT2X00_LIB_DEBUGFS) +
+ rt2x00lib-$(CPTCFG_RT2X00_LIB_CRYPTO) += rt2x00crypto.o
+ rt2x00lib-$(CPTCFG_RT2X00_LIB_FIRMWARE) += rt2x00firmware.o
+ rt2x00lib-$(CPTCFG_RT2X00_LIB_LEDS) += rt2x00leds.o
++rt2x00lib-$(CPTCFG_RT2X00_LIB_EEPROM) += rt2x00eeprom.o
+
+ obj-$(CPTCFG_RT2X00_LIB) += rt2x00lib.o
+ obj-$(CPTCFG_RT2X00_LIB_MMIO) += rt2x00mmio.o
+--- a/drivers/net/wireless/rt2x00/rt2800lib.h
++++ b/drivers/net/wireless/rt2x00/rt2800lib.h
+@@ -22,6 +22,8 @@
+ #ifndef RT2800LIB_H
+ #define RT2800LIB_H
+
++#include "rt2800.h"
++
+ struct rt2800_ops {
+ void (*register_read)(struct rt2x00_dev *rt2x00dev,
+ const unsigned int offset, u32 *value);
+@@ -121,6 +123,15 @@ static inline int rt2800_read_eeprom(str
+ {
+ const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
+
++ if (rt2x00dev->eeprom_file) {
++ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data,
++ EEPROM_SIZE);
++ return 0;
++ }
++
++ if (!rt2800ops->read_eeprom)
++ return -EINVAL;
++
+ return rt2800ops->read_eeprom(rt2x00dev);
+ }
+
+--- a/drivers/net/wireless/rt2x00/rt2800soc.c
++++ b/drivers/net/wireless/rt2x00/rt2800soc.c
+@@ -97,19 +97,6 @@ static int rt2800soc_set_device_state(st
+ return retval;
+ }
+
+-static int rt2800soc_read_eeprom(struct rt2x00_dev *rt2x00dev)
+-{
+- void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
+-
+- if (!base_addr)
+- return -ENOMEM;
+-
+- memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
+-
+- iounmap(base_addr);
+- return 0;
+-}
+-
+ /* Firmware functions */
+ static char *rt2800soc_get_firmware_name(struct rt2x00_dev *rt2x00dev)
+ {
+@@ -173,7 +160,6 @@ static const struct rt2800_ops rt2800soc
+ .register_multiread = rt2x00mmio_register_multiread,
+ .register_multiwrite = rt2x00mmio_register_multiwrite,
+ .regbusy_read = rt2x00mmio_regbusy_read,
+- .read_eeprom = rt2800soc_read_eeprom,
+ .hwcrypt_disabled = rt2800soc_hwcrypt_disabled,
+ .drv_write_firmware = rt2800soc_write_firmware,
+ .drv_init_registers = rt2800mmio_init_registers,
+--- a/drivers/net/wireless/rt2x00/rt2x00.h
++++ b/drivers/net/wireless/rt2x00/rt2x00.h
+@@ -696,6 +696,7 @@ enum rt2x00_capability_flags {
+ REQUIRE_SW_SEQNO,
+ REQUIRE_HT_TX_DESC,
+ REQUIRE_PS_AUTOWAKE,
++ REQUIRE_EEPROM_FILE,
+
+ /*
+ * Capabilities
+@@ -965,6 +966,11 @@ struct rt2x00_dev {
+ const struct firmware *fw;
+
+ /*
++ * EEPROM image.
++ */
++ const struct firmware *eeprom_file;
++
++ /*
+ * FIFO for storing tx status reports between isr and tasklet.
+ */
+ DECLARE_KFIFO_PTR(txstatus_fifo, u32);
+--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+@@ -1325,6 +1325,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+ INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
+ INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
+
++ retval = rt2x00lib_load_eeprom_file(rt2x00dev);
++ if (retval)
++ goto exit;
++
+ /*
+ * Let the driver probe the device to detect the capabilities.
+ */
+@@ -1455,6 +1459,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+ */
+ if (rt2x00dev->drv_data)
+ kfree(rt2x00dev->drv_data);
++
++ /*
++ * Free EEPROM image.
++ */
++ rt2x00lib_free_eeprom_file(rt2x00dev);
+ }
+ EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
+
--- /dev/null
+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,111 @@
+/*
+ Copyright (C) 2004 - 2009 Ivo van Doorn <IvDoorn@gmail.com>
+ Copyright (C) 2004 - 2009 Gertjan van Wingerde <gwingerde@gmail.com>
@@ -33,13 +185,24 @@
+#include "rt2x00.h"
+#include "rt2x00lib.h"
+
++static const char *
++rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
++{
++ struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
++
++ if (pdata && pdata->eeprom_file_name)
++ return pdata->eeprom_file_name;
++
++ return NULL
++}
++
+static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
+{
+ const struct firmware *ee;
+ char *ee_name;
+ int retval;
+
-+ ee_name = rt2x00dev->ops->lib->get_eeprom_file_name(rt2x00dev);
++ ee_name = rt2x00lib_get_eeprom_file_name(rt2x00dev);
+ if (!ee_name) {
+ rt2x00_err(rt2x00dev,
+ "Invalid EEPROM filename.\n"
@@ -82,9 +245,11 @@
+{
+ int retval;
+
-+ if (!test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
++ if (!rt2x00lib_get_eeprom_file_name(rt2x00dev))
+ return 0;
+
++ set_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags);
++
+ if (!rt2x00dev->eeprom_file) {
+ retval = rt2x00lib_request_eeprom_file(rt2x00dev);
+ if (retval)
@@ -99,36 +264,6 @@
+ release_firmware(rt2x00dev->eeprom_file);
+ rt2x00dev->eeprom_file = NULL;
+}
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -550,6 +550,7 @@ struct rt2x00lib_ops {
- const u8 *data, const size_t len);
- int (*load_firmware) (struct rt2x00_dev *rt2x00dev,
- const u8 *data, const size_t len);
-+ char *(*get_eeprom_file_name) (struct rt2x00_dev *rt2x00dev);
-
- /*
- * Device initialization/deinitialization handlers.
-@@ -706,6 +707,7 @@ enum rt2x00_capability_flags {
- REQUIRE_SW_SEQNO,
- REQUIRE_HT_TX_DESC,
- REQUIRE_PS_AUTOWAKE,
-+ REQUIRE_EEPROM_FILE,
-
- /*
- * Capabilities
-@@ -975,6 +977,11 @@ struct rt2x00_dev {
- const struct firmware *fw;
-
- /*
-+ * EEPROM image.
-+ */
-+ const struct firmware *eeprom_file;
-+
-+ /*
- * FIFO for storing tx status reports between isr and tasklet.
- */
- DECLARE_KFIFO_PTR(txstatus_fifo, u32);
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -322,6 +322,22 @@ static inline void rt2x00lib_free_firmwa
@@ -154,119 +289,6 @@
* Debugfs handlers.
*/
#ifdef CPTCFG_RT2X00_LIB_DEBUGFS
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -69,6 +69,7 @@ config RT2800PCI
- select RT2X00_LIB_PCI if PCI
- select RT2X00_LIB_SOC if SOC_RT288X || SOC_RT305X
- select RT2X00_LIB_FIRMWARE
-+ select RT2X00_LIB_EEPROM
- select RT2X00_LIB_CRYPTO
- depends on CRC_CCITT
- depends on EEPROM_93CX6
-@@ -244,6 +245,9 @@ config RT2X00_LIB_FIRMWARE
- config RT2X00_LIB_CRYPTO
- boolean
-
-+config RT2X00_LIB_EEPROM
-+ boolean
-+
- config RT2X00_LIB_LEDS
- depends on !BACKPORT_KERNEL_2_6_25
- boolean
---- a/drivers/net/wireless/rt2x00/Makefile
-+++ b/drivers/net/wireless/rt2x00/Makefile
-@@ -7,6 +7,7 @@ rt2x00lib-$(CPTCFG_RT2X00_LIB_DEBUGFS) +
- rt2x00lib-$(CPTCFG_RT2X00_LIB_CRYPTO) += rt2x00crypto.o
- rt2x00lib-$(CPTCFG_RT2X00_LIB_FIRMWARE) += rt2x00firmware.o
- rt2x00lib-$(CPTCFG_RT2X00_LIB_LEDS) += rt2x00leds.o
-+rt2x00lib-$(CPTCFG_RT2X00_LIB_EEPROM) += rt2x00eeprom.o
-
- obj-$(CPTCFG_RT2X00_LIB) += rt2x00lib.o
- obj-$(CPTCFG_RT2X00_LIB_MMIO) += rt2x00mmio.o
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -90,25 +90,11 @@ static void rt2800pci_mcu_status(struct
- rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
- }
-
--#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
- static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
- {
-- void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
--
-- if (!base_addr)
-- return -ENOMEM;
--
-- memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
--
-- iounmap(base_addr);
-+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
- return 0;
- }
--#else
--static inline int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
--{
-- return -ENOMEM;
--}
--#endif /* CONFIG_SOC_RT288X || CONFIG_SOC_RT305X */
-
- #ifdef CONFIG_PCI
- static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
-@@ -332,6 +318,20 @@ static int rt2800pci_write_firmware(stru
- }
-
- /*
-+ * EEPROM file functions.
-+ */
-+static char *rt2800pci_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
-+{
-+ struct rt2x00_platform_data *pdata;
-+
-+ pdata = rt2x00dev->dev->platform_data;
-+ if (pdata)
-+ return pdata->eeprom_file_name;
-+
-+ return NULL;
-+}
-+
-+/*
- * Initialization functions.
- */
- static bool rt2800pci_get_entry_state(struct queue_entry *entry)
-@@ -1160,6 +1160,7 @@ static const struct rt2x00lib_ops rt2800
- .get_firmware_name = rt2800pci_get_firmware_name,
- .check_firmware = rt2800_check_firmware,
- .load_firmware = rt2800_load_firmware,
-+ .get_eeprom_file_name = rt2800pci_get_eeprom_file_name,
- .initialize = rt2x00mmio_initialize,
- .uninitialize = rt2x00mmio_uninitialize,
- .get_entry_state = rt2800pci_get_entry_state,
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -1325,6 +1325,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
- INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
- INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
-
-+ retval = rt2x00lib_load_eeprom_file(rt2x00dev);
-+ if (retval)
-+ goto exit;
-+
- /*
- * Let the driver probe the device to detect the capabilities.
- */
-@@ -1455,6 +1459,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
- */
- if (rt2x00dev->drv_data)
- kfree(rt2x00dev->drv_data);
-+
-+ /*
-+ * Free EEPROM image.
-+ */
-+ rt2x00lib_free_eeprom_file(rt2x00dev);
- }
- EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
-
--- a/drivers/net/wireless/rt2x00/rt2x00soc.c
+++ b/drivers/net/wireless/rt2x00/rt2x00soc.c
@@ -94,6 +94,7 @@ int rt2x00soc_probe(struct platform_devi
@@ -277,13 +299,3 @@
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
---- a/.local-symbols
-+++ b/.local-symbols
-@@ -272,6 +272,7 @@ RT2X00_LIB_FIRMWARE=
- RT2X00_LIB_CRYPTO=
- RT2X00_LIB_LEDS=
- RT2X00_LIB_DEBUGFS=
-+RT2X00_LIB_EEPROM=
- RT2X00_DEBUG=
- RTLWIFI=
- RTLWIFI_DEBUG=
diff --git a/package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch b/package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch
new file mode 100644
index 0000000000000000000000000000000000000000..666bc2dc55adf0594d72791ec73f9676b6a15374
--- /dev/null
+++ b/package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch
@@ -0,0 +1,31 @@
+--- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
++++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
+@@ -26,6 +26,7 @@
+
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/of.h>
+
+ #include "rt2x00.h"
+ #include "rt2x00lib.h"
+@@ -34,11 +35,19 @@ static const char *
+ rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
+ {
+ struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
++ struct device_node *np;
++ char *eep;
+
+ if (pdata && pdata->eeprom_file_name)
+ return pdata->eeprom_file_name;
+
+- return NULL
++#ifdef CONFIG_OF
++ np = rt2x00dev->dev->of_node;
++ if (np && of_property_read_string(np, "ralink,eeprom", &eep) == 0)
++ return eep;
++#endif
++
++ return NULL;
+ }
+
+ static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
diff --git a/package/kernel/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
similarity index 69%
rename from package/kernel/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
rename to package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
index d5af4c9ae2a709e493b784ab40db48e8fe586566..7d999f9c6cf1fa2bfb7a64a51f92bd4e60902455 100644
--- a/package/kernel/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
+++ b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
@@ -12,32 +12,35 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -71,6 +71,7 @@ config RT2800PCI
- select RT2X00_LIB_FIRMWARE
+@@ -219,6 +219,7 @@ config RT2800SOC
select RT2X00_LIB_EEPROM
- select RT2X00_LIB_CRYPTO
+ select RT2800_LIB
+ select RT2800_LIB_MMIO
+ select MTD if SOC_RT288X || SOC_RT305X
- depends on CRC_CCITT
- depends on EEPROM_93CX6
---help---
+ This adds support for Ralink WiSoC devices.
+ Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352.
--- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-@@ -30,12 +30,77 @@
- #include "rt2x00.h"
- #include "rt2x00lib.h"
+@@ -26,17 +26,72 @@
-+#ifdef CONFIG_OF
-+#include <linux/of.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
-+
-+static struct firmware mtd_fw;
-+
-+static int rt2800pci_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
+ #include <linux/of.h>
+
+ #include "rt2x00.h"
+ #include "rt2x00lib.h"
+
++static int rt2800lib_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
+{
++ int ret = -EINVAL;
++#ifdef CONFIG_OF
++ static struct firmware mtd_fw;
+ struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL;
+ size_t retlen, len = rt2x00dev->ops->eeprom_size;
-+ int ret, size, offset = 0;
++ int size, offset = 0;
+ struct mtd_info *mtd;
+ const char *part;
+ const __be32 *list;
@@ -78,25 +81,32 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ mtd_fw.size = len;
+ mtd_fw.data = rt2x00dev->eeprom;
+ }
++#endif
+
+ return ret;
+}
-+#else
-+static inline int rt2800pci_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
-+{
-+ return -EINVAL;
-+}
-+#endif
+
+ static const char *
+ rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
+ {
+ struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
+ struct device_node *np;
+- char *eep;
++ const char *eep;
+
+ if (pdata && pdata->eeprom_file_name)
+ return pdata->eeprom_file_name;
+@@ -53,9 +108,12 @@ rt2x00lib_get_eeprom_file_name(struct rt
static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
{
const struct firmware *ee;
- char *ee_name;
+- char *ee_name;
++ const char *ee_name;
int retval;
-+ if (!rt2800pci_read_eeprom_mtd(rt2x00dev))
++ if (!rt2800lib_read_eeprom_mtd(rt2x00dev))
+ return 0;
+
- ee_name = rt2x00dev->ops->lib->get_eeprom_file_name(rt2x00dev);
+ ee_name = rt2x00lib_get_eeprom_file_name(rt2x00dev);
if (!ee_name) {
rt2x00_err(rt2x00dev,
diff --git a/package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch
deleted file mode 100644
index 325dba97c684c220421a7ab83254ffe619430ca9..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -90,7 +90,7 @@ static void rt2800pci_mcu_status(struct
- rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
- }
-
--static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
-+static int rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev)
- {
- memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
- return 0;
-@@ -1097,8 +1097,9 @@ static int rt2800pci_read_eeprom(struct
- {
- int retval;
-
-- if (rt2x00_is_soc(rt2x00dev))
-- retval = rt2800pci_read_eeprom_soc(rt2x00dev);
-+ if (rt2x00_is_soc(rt2x00dev) ||
-+ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
-+ retval = rt2800pci_read_eeprom_file(rt2x00dev);
- else if (rt2800pci_efuse_detect(rt2x00dev))
- retval = rt2800pci_read_eeprom_efuse(rt2x00dev);
- else
---- a/drivers/net/wireless/rt2x00/rt2x00pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -78,6 +78,7 @@ exit:
- int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
- {
- struct ieee80211_hw *hw;
-+ struct rt2x00_platform_data *pdata;
- struct rt2x00_dev *rt2x00dev;
- int retval;
- u16 chip;
-@@ -125,6 +126,12 @@ int rt2x00pci_probe(struct pci_dev *pci_
- rt2x00dev->irq = pci_dev->irq;
- rt2x00dev->name = pci_name(pci_dev);
-
-+ /* if we get passed the name of a eeprom_file_name, then use this in
-+ favour of the eeprom */
-+ pdata = rt2x00dev->dev->platform_data;
-+ if (pdata && pdata->eeprom_file_name)
-+ set_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags);
-+
- if (pci_is_pcie(pci_dev))
- rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
- else
diff --git a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
index d9820be0d53176959266620e140c12c9e64d2501..c2d7618dce8b507d19314e3bbf8be48977c31157 100644
--- a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
+++ b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
@@ -37,7 +37,7 @@
num_rates += 4;
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -415,6 +415,7 @@ struct hw_mode_spec {
+@@ -405,6 +405,7 @@ struct hw_mode_spec {
unsigned int supported_bands;
#define SUPPORT_BAND_2GHZ 0x00000001
#define SUPPORT_BAND_5GHZ 0x00000002
diff --git a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
index 278df72b2d633e0f6074377eb81c5cf1d1f74cdc..16401a39cbd1b5aa537a21508f4a90369678b31a 100644
--- a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
+++ b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
@@ -31,7 +31,7 @@
{
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -1327,6 +1327,7 @@ static inline void rt2x00debug_dump_fram
+@@ -1403,6 +1403,7 @@ static inline void rt2x00debug_dump_fram
*/
u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
struct ieee80211_vif *vif);
diff --git a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
index c0829d74fbbb278fae78f82b2afdadb4ace53e8f..edcfa6e43d445e2cde138c1587fb63d1a489cb21 100644
--- a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
+++ b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -3186,11 +3186,17 @@ static void rt2800_config_channel(struct
+@@ -3178,11 +3178,17 @@ static void rt2800_config_channel(struct
/*
* Change BBP settings
*/
@@ -18,7 +18,7 @@
} else if (rt2x00_rt(rt2x00dev, RT3593)) {
if (rf->channel > 14) {
/* Disable CCK Packet detection on 5GHz */
-@@ -3204,14 +3210,8 @@ static void rt2800_config_channel(struct
+@@ -3196,14 +3202,8 @@ static void rt2800_config_channel(struct
else
rt2800_bbp_write(rt2x00dev, 105, 0x34);
@@ -33,7 +33,7 @@
rt2800_bbp_write(rt2x00dev, 86, 0);
}
-@@ -6093,6 +6093,12 @@ static void rt2800_init_rfcsr_3290(struc
+@@ -6127,6 +6127,12 @@ static void rt2800_init_rfcsr_3290(struc
static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
{
@@ -46,7 +46,7 @@
rt2800_rf_init_calibration(rt2x00dev, 30);
rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
-@@ -6128,15 +6134,30 @@ static void rt2800_init_rfcsr_3352(struc
+@@ -6162,15 +6168,30 @@ static void rt2800_init_rfcsr_3352(struc
rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
@@ -80,7 +80,7 @@
rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
-@@ -6144,15 +6165,20 @@ static void rt2800_init_rfcsr_3352(struc
+@@ -6178,15 +6199,20 @@ static void rt2800_init_rfcsr_3352(struc
rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
@@ -110,7 +110,7 @@
rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
-@@ -7004,6 +7030,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7046,6 +7072,7 @@ static int rt2800_init_eeprom(struct rt2
* RT53xx: defined in "EEPROM_CHIP_ID" field
*/
if (rt2x00_rt(rt2x00dev, RT3290) ||
@@ -118,7 +118,7 @@
rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392))
rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-@@ -7094,7 +7121,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7137,7 +7164,8 @@ static int rt2800_init_eeprom(struct rt2
/*
* Detect if this device has Bluetooth co-existence.
*/
@@ -128,7 +128,7 @@
__set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
/*
-@@ -7123,6 +7151,22 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7166,6 +7194,22 @@ static int rt2800_init_eeprom(struct rt2
EIRP_MAX_TX_POWER_LIMIT)
__set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);
@@ -153,7 +153,7 @@
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -2299,6 +2299,12 @@ struct mac_iveiv_entry {
+@@ -2301,6 +2301,12 @@ struct mac_iveiv_entry {
#define RFCSR36_RF_BS FIELD8(0x80)
/*
@@ -166,7 +166,7 @@
* RFCSR 38:
*/
#define RFCSR38_RX_LO1_EN FIELD8(0x20)
-@@ -2310,6 +2316,18 @@ struct mac_iveiv_entry {
+@@ -2312,6 +2318,18 @@ struct mac_iveiv_entry {
#define RFCSR39_RX_LO2_EN FIELD8(0x80)
/*
@@ -185,7 +185,7 @@
* RFCSR 49:
*/
#define RFCSR49_TX FIELD8(0x3f)
-@@ -2322,6 +2340,8 @@ struct mac_iveiv_entry {
+@@ -2324,6 +2342,8 @@ struct mac_iveiv_entry {
* RFCSR 50:
*/
#define RFCSR50_TX FIELD8(0x3f)
@@ -194,7 +194,7 @@
#define RFCSR50_EP FIELD8(0xc0)
/* bits for RT3593 */
#define RFCSR50_TX_LO1_EN FIELD8(0x20)
-@@ -2469,6 +2489,8 @@ enum rt2800_eeprom_word {
+@@ -2471,6 +2491,8 @@ enum rt2800_eeprom_word {
* INTERNAL_TX_ALC: 0: disable, 1: enable
* BT_COEXIST: 0: disable, 1: enable
* DAC_TEST: 0: disable, 1: enable
@@ -202,9 +202,9 @@
+ * EXTERNAL_TX1_PA: 0: disable, 1: enable (only on RT3352)
*/
#define EEPROM_NIC_CONF1_HW_RADIO FIELD16(0x0001)
- #define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC FIELD16(0x0002)
-@@ -2485,6 +2507,8 @@ enum rt2800_eeprom_word {
- #define EEPROM_NIC_CONF1_INTERNAL_TX_ALC FIELD16(0x2000)
+ #define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC FIELD16(0x0002)
+@@ -2487,6 +2509,8 @@ enum rt2800_eeprom_word {
+ #define EEPROM_NIC_CONF1_INTERNAL_TX_ALC FIELD16(0x2000)
#define EEPROM_NIC_CONF1_BT_COEXIST FIELD16(0x4000)
#define EEPROM_NIC_CONF1_DAC_TEST FIELD16(0x8000)
+#define EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352 FIELD16(0x4000)
@@ -214,7 +214,7 @@
* EEPROM frequency
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -727,6 +727,8 @@ enum rt2x00_capability_flags {
+@@ -716,6 +716,8 @@ enum rt2x00_capability_flags {
CAPABILITY_DOUBLE_ANTENNA,
CAPABILITY_BT_COEXIST,
CAPABILITY_VCO_RECALIBRATION,
diff --git a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
index 212b31ee963a56bc33c7d9ada4c6ba01f327f583..804614035592d19734e945c8f9b4c3ad80074f0c 100644
--- a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
+++ b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
@@ -1,7 +1,7 @@
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7509,6 +7509,27 @@ static const struct rf_channel rf_vals_3
- {173, 0x61, 0, 9},
+@@ -7486,6 +7486,27 @@ static const struct rf_channel rf_vals_5
+ {196, 83, 0, 12, 1},
};
+/*
@@ -28,28 +28,19 @@
static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
{
struct hw_mode_spec *spec = &rt2x00dev->spec;
-@@ -7589,7 +7610,6 @@ static int rt2800_probe_hw_mode(struct r
- rt2x00_rf(rt2x00dev, RF3022) ||
- rt2x00_rf(rt2x00dev, RF3290) ||
- rt2x00_rf(rt2x00dev, RF3320) ||
-- rt2x00_rf(rt2x00dev, RF3322) ||
- rt2x00_rf(rt2x00dev, RF5360) ||
- rt2x00_rf(rt2x00dev, RF5370) ||
- rt2x00_rf(rt2x00dev, RF5372) ||
-@@ -7597,6 +7617,12 @@ static int rt2800_probe_hw_mode(struct r
- rt2x00_rf(rt2x00dev, RF5392)) {
+@@ -7574,7 +7595,10 @@ static int rt2800_probe_hw_mode(struct r
+ case RF5390:
+ case RF5392:
spec->num_channels = 14;
- spec->channels = rf_vals_3x;
-+ } else if (rt2x00_rf(rt2x00dev, RF3322)) {
-+ spec->num_channels = 14;
+- spec->channels = rf_vals_3x;
+ if (spec->clk_is_20mhz)
+ spec->channels = rf_vals_xtal20mhz_3x;
+ else
+ spec->channels = rf_vals_3x;
- } else if (rt2x00_rf(rt2x00dev, RF3052)) {
- spec->supported_bands |= SUPPORT_BAND_5GHZ;
- spec->num_channels = ARRAY_SIZE(rf_vals_3x);
-@@ -7769,6 +7795,19 @@ static int rt2800_probe_rt(struct rt2x00
+ break;
+
+ case RF3052:
+@@ -7750,6 +7774,19 @@ static int rt2800_probe_rt(struct rt2x00
return 0;
}
@@ -69,7 +60,7 @@
int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
{
int retval;
-@@ -7798,6 +7837,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
+@@ -7779,6 +7816,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
/*
@@ -87,7 +78,7 @@
retval = rt2800_probe_hw_mode(rt2x00dev);
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -410,6 +410,7 @@ static inline struct rt2x00_intf* vif_to
+@@ -400,6 +400,7 @@ static inline struct rt2x00_intf* vif_to
* @channels: Device/chipset specific channel values (See &struct rf_channel).
* @channels_info: Additional information for channels (See &struct channel_info).
* @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap).
@@ -95,7 +86,7 @@
*/
struct hw_mode_spec {
unsigned int supported_bands;
-@@ -426,6 +427,7 @@ struct hw_mode_spec {
+@@ -416,6 +417,7 @@ struct hw_mode_spec {
const struct channel_info *channels_info;
struct ieee80211_sta_ht_cap ht;
diff --git a/package/kernel/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch b/package/kernel/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch
index 4c4ae204b7109a41e2d57a83525c44227207163f..432a31656319527fc95f0b4800f911d112557478 100644
--- a/package/kernel/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch
+++ b/package/kernel/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/net/wireless/rt2x00/rt2800pci.c | 7 +++++++
1 file changed, 7 insertions(+)
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -1318,11 +1318,18 @@ static int rt2800soc_probe(struct platfo
- return rt2x00soc_probe(pdev, &rt2800pci_ops);
+--- a/drivers/net/wireless/rt2x00/rt2800soc.c
++++ b/drivers/net/wireless/rt2x00/rt2800soc.c
+@@ -229,11 +229,18 @@ static int rt2800soc_probe(struct platfo
+ return rt2x00soc_probe(pdev, &rt2800soc_ops);
}
+static const struct of_device_id rt2880_wmac_match[] = {
diff --git a/package/kernel/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch b/package/kernel/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch
deleted file mode 100644
index 293b71a1832fa79f9d3937c3e99f2cf750e4c004..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -39,6 +39,7 @@
- #include <linux/pci.h>
- #include <linux/platform_device.h>
- #include <linux/eeprom_93cx6.h>
-+#include <linux/of.h>
-
- #include "rt2x00.h"
- #include "rt2x00mmio.h"
-@@ -323,11 +324,17 @@ static int rt2800pci_write_firmware(stru
- static char *rt2800pci_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
- {
- struct rt2x00_platform_data *pdata;
-+ struct device_node *np;
-+ char *eep;
-
- pdata = rt2x00dev->dev->platform_data;
- if (pdata)
- return pdata->eeprom_file_name;
-
-+ np = rt2x00dev->dev->of_node;
-+ if (np && !of_property_read_string(np, "ralink,eeprom", &eep))
-+ return eep;
-+
- return NULL;
- }
-
diff --git a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
index 1873b6295e8113ad1e1315801050545cb76d1511..a21546fca6d9e8b88598c78ccfbaaf98c393c133 100644
--- a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
+++ b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
@@ -8,7 +8,7 @@
#include "rt2x00.h"
#include "rt2800lib.h"
-@@ -7797,13 +7798,14 @@ static int rt2800_probe_rt(struct rt2x00
+@@ -7776,13 +7777,14 @@ static int rt2800_probe_rt(struct rt2x00
int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
{
diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
index 6acc70eaa2dab40842832dfe189986b8691e8b27..90f48c0951414f3c222a469966840d40be0fb3ac 100644
--- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
+++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
@@ -1,8 +1,8 @@
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -71,6 +71,7 @@
- #define RF3053 0x000d
+@@ -73,6 +73,7 @@
#define RF5592 0x000f
+ #define RF3070 0x3070
#define RF3290 0x3290
+#define RF5350 0x5350
#define RF5360 0x5360
@@ -10,39 +10,37 @@
#define RF5372 0x5372
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -2675,6 +2675,15 @@ static void rt2800_config_channel_rf53xx
- if (rf->channel <= 14) {
- int idx = rf->channel-1;
+@@ -2707,6 +2707,13 @@ static void rt2800_config_channel_rf53xx
-+ if (rt2x00_rt(rt2x00dev, RT5350)) {
-+ static const char r59_non_bt[] = {0x0b, 0x0b,
-+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
-+ 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
+ rt2800_rfcsr_write(rt2x00dev, 59,
+ r59_non_bt[idx]);
++ } else if (rt2x00_rt(rt2x00dev, RT5350)) {
++ static const char r59_non_bt[] = {0x0b, 0x0b,
++ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
++ 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
+
-+ rt2800_rfcsr_write(rt2x00dev, 59,
-+ r59_non_bt[idx]);
-+ }
-+
- if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags)) {
- if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
- /* r55/r59 value array of channel 1~14 */
-@@ -3153,6 +3162,7 @@ static void rt2800_config_channel(struct
- case RF3322:
++ rt2800_rfcsr_write(rt2x00dev, 59,
++ r59_non_bt[idx]);
+ }
+ }
+ }
+@@ -3144,6 +3151,7 @@ static void rt2800_config_channel(struct
rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);
break;
+ case RF3070:
+ case RF5350:
case RF5360:
case RF5370:
case RF5372:
-@@ -3169,6 +3179,7 @@ static void rt2800_config_channel(struct
-
- if (rt2x00_rf(rt2x00dev, RF3290) ||
+@@ -3161,6 +3169,7 @@ static void rt2800_config_channel(struct
+ if (rt2x00_rf(rt2x00dev, RF3070) ||
+ rt2x00_rf(rt2x00dev, RF3290) ||
rt2x00_rf(rt2x00dev, RF3322) ||
+ rt2x00_rf(rt2x00dev, RF5350) ||
rt2x00_rf(rt2x00dev, RF5360) ||
rt2x00_rf(rt2x00dev, RF5370) ||
rt2x00_rf(rt2x00dev, RF5372) ||
-@@ -3393,7 +3404,8 @@ static void rt2800_config_channel(struct
+@@ -3401,7 +3410,8 @@ static void rt2800_config_channel(struct
/*
* Clear update flag
*/
@@ -52,15 +50,15 @@
rt2800_bbp_read(rt2x00dev, 49, &bbp);
rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
rt2800_bbp_write(rt2x00dev, 49, bbp);
-@@ -4266,6 +4278,7 @@ void rt2800_vco_calibration(struct rt2x0
- break;
+@@ -4275,6 +4285,7 @@ void rt2800_vco_calibration(struct rt2x0
case RF3053:
+ case RF3070:
case RF3290:
+ case RF5350:
case RF5360:
case RF5370:
case RF5372:
-@@ -4637,6 +4650,8 @@ static int rt2800_init_registers(struct
+@@ -4671,6 +4682,8 @@ static int rt2800_init_registers(struct
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
@@ -69,7 +67,7 @@
} else {
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
-@@ -5278,9 +5293,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5312,9 +5325,13 @@ static void rt2800_init_bbp_3352(struct
rt2800_bbp_write(rt2x00dev, 82, 0x62);
@@ -86,7 +84,7 @@
rt2800_bbp_write(rt2x00dev, 86, 0x38);
-@@ -5294,9 +5313,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5328,9 +5345,13 @@ static void rt2800_init_bbp_3352(struct
rt2800_bbp_write(rt2x00dev, 104, 0x92);
@@ -103,7 +101,7 @@
rt2800_bbp_write(rt2x00dev, 120, 0x50);
-@@ -5321,6 +5344,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5355,6 +5376,13 @@ static void rt2800_init_bbp_3352(struct
rt2800_bbp_write(rt2x00dev, 143, 0xa2);
rt2800_bbp_write(rt2x00dev, 148, 0xc8);
@@ -117,7 +115,7 @@
}
static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
-@@ -5621,6 +5651,7 @@ static void rt2800_init_bbp(struct rt2x0
+@@ -5655,6 +5683,7 @@ static void rt2800_init_bbp(struct rt2x0
rt2800_init_bbp_3290(rt2x00dev);
break;
case RT3352:
@@ -125,7 +123,7 @@
rt2800_init_bbp_3352(rt2x00dev);
break;
case RT3390:
-@@ -6431,6 +6462,76 @@ static void rt2800_init_rfcsr_3593(struc
+@@ -6465,6 +6494,76 @@ static void rt2800_init_rfcsr_3593(struc
/* TODO: enable stream mode support */
}
@@ -202,7 +200,7 @@
static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
{
rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -6662,6 +6763,9 @@ static void rt2800_init_rfcsr(struct rt2
+@@ -6695,6 +6794,9 @@ static void rt2800_init_rfcsr(struct rt2
case RT3593:
rt2800_init_rfcsr_3593(rt2x00dev);
break;
@@ -212,7 +210,7 @@
case RT5390:
rt2800_init_rfcsr_5390(rt2x00dev);
break;
-@@ -6902,6 +7006,12 @@ static int rt2800_validate_eeprom(struct
+@@ -6944,6 +7046,12 @@ static int rt2800_validate_eeprom(struct
rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
@@ -225,7 +223,7 @@
} else if (rt2x00_rt(rt2x00dev, RT2860) ||
rt2x00_rt(rt2x00dev, RT2872)) {
/*
-@@ -7035,6 +7145,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7077,6 +7185,8 @@ static int rt2800_init_eeprom(struct rt2
rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392))
rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
@@ -234,7 +232,15 @@
else
rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
-@@ -7052,6 +7164,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7095,6 +7205,7 @@ static int rt2800_init_eeprom(struct rt2
+ case RF3290:
+ case RF3320:
+ case RF3322:
++ case RF5350:
+ case RF5360:
+ case RF5370:
+ case RF5372:
+@@ -7590,6 +7701,7 @@ static int rt2800_probe_hw_mode(struct r
case RF3290:
case RF3320:
case RF3322:
@@ -242,25 +248,15 @@
case RF5360:
case RF5370:
case RF5372:
-@@ -7618,7 +7731,8 @@ static int rt2800_probe_hw_mode(struct r
- rt2x00_rf(rt2x00dev, RF5392)) {
- spec->num_channels = 14;
- spec->channels = rf_vals_3x;
-- } else if (rt2x00_rf(rt2x00dev, RF3322)) {
-+ } else if (rt2x00_rf(rt2x00dev, RF3322) ||
-+ rt2x00_rf(rt2x00dev, RF5350)) {
- spec->num_channels = 14;
- if (spec->clk_is_20mhz)
- spec->channels = rf_vals_xtal20mhz_3x;
-@@ -7743,6 +7857,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3052:
+@@ -7722,6 +7834,7 @@ static int rt2800_probe_hw_mode(struct r
case RF3053:
+ case RF3070:
case RF3290:
+ case RF5350:
case RF5360:
case RF5370:
case RF5372:
-@@ -7781,6 +7896,7 @@ static int rt2800_probe_rt(struct rt2x00
+@@ -7760,6 +7873,7 @@ static int rt2800_probe_rt(struct rt2x00
case RT3390:
case RT3572:
case RT3593:
@@ -270,7 +266,7 @@
case RT5592:
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -181,6 +181,7 @@ struct rt2x00_chip {
+@@ -171,6 +171,7 @@ struct rt2x00_chip {
#define RT3572 0x3572
#define RT3593 0x3593
#define RT3883 0x3883 /* WSOC */
diff --git a/package/kernel/mac80211/patches/618-rt2x00-msi-fix.patch b/package/kernel/mac80211/patches/618-rt2x00-msi-fix.patch
deleted file mode 100644
index ceddbe439d07c51e30715f6ec13e3b4f4fd11670..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/618-rt2x00-msi-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2x00pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -108,7 +108,9 @@ int rt2x00pci_probe(struct pci_dev *pci_
- goto exit_release_regions;
- }
-
-+#ifdef CONFIG_PCI_MSI
- pci_enable_msi(pci_dev);
-+#endif
-
- hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
- if (!hw) {
-@@ -162,7 +164,9 @@ exit_free_device:
- ieee80211_free_hw(hw);
-
- exit_disable_msi:
-+#ifdef CONFIG_PCI_SET_MWI
- pci_disable_msi(pci_dev);
-+#endif
-
- exit_release_regions:
- pci_release_regions(pci_dev);
-@@ -188,7 +192,9 @@ void rt2x00pci_remove(struct pci_dev *pc
- rt2x00pci_free_reg(rt2x00dev);
- ieee80211_free_hw(hw);
-
-+#ifdef CONFIG_PCI_MSI
- pci_disable_msi(pci_dev);
-+#endif
-
- /*
- * Free the PCI device data.
diff --git a/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch b/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch
index a81d6c96fdb54670f72066d49041e18d3a31c103..63e92bd41ba2d7e26b3c2328e751d00fe29107ea 100644
--- a/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch
+++ b/package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch
@@ -8,7 +8,7 @@
#include "rt2x00.h"
#include "rt2800lib.h"
-@@ -7253,6 +7254,17 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7294,6 +7295,17 @@ static int rt2800_init_eeprom(struct rt2
rt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC);
rt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY);
diff --git a/package/kernel/mac80211/patches/620-rt2x00-rt3352-rf-id.patch b/package/kernel/mac80211/patches/620-rt2x00-rt3352-rf-id.patch
index e7e15973419f3b9747446e6031bd21f6cb12c542..4763c10c48fc548913f8650b9140a905a50190f5 100644
--- a/package/kernel/mac80211/patches/620-rt2x00-rt3352-rf-id.patch
+++ b/package/kernel/mac80211/patches/620-rt2x00-rt3352-rf-id.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7142,10 +7142,11 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7182,10 +7182,11 @@ static int rt2800_init_eeprom(struct rt2
* RT53xx: defined in "EEPROM_CHIP_ID" field
*/
if (rt2x00_rt(rt2x00dev, RT3290) ||
diff --git a/package/kernel/mac80211/patches/750-rtlwifi-Align-private-space-in-rtl_priv-struct.patch b/package/kernel/mac80211/patches/750-rtlwifi-Align-private-space-in-rtl_priv-struct.patch
deleted file mode 100644
index 050defaef003c7a4acd8199f7ec2fe64c3cb9d5b..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/750-rtlwifi-Align-private-space-in-rtl_priv-struct.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 60ce314d1750fef843e9db70050e09e49f838b69 Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Thu, 19 Sep 2013 02:21:35 +0000
-Subject: rtlwifi: Align private space in rtl_priv struct
-
-The private array at the end of the rtl_priv struct is not aligned.
-On ARM architecture, this causes an alignment trap and is fixed by aligning
-that array with __align(sizeof(void *)). That should properly align that
-space according to the requirements of all architectures.
-
-Reported-by: Jason Andrews <jasona@cadence.com>
-Tested-by: Jason Andrews <jasona@cadence.com>
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-Cc: Stable <stable@vger.kernel.org>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
----
---- a/drivers/net/wireless/rtlwifi/wifi.h
-+++ b/drivers/net/wireless/rtlwifi/wifi.h
-@@ -2057,7 +2057,7 @@ struct rtl_priv {
- that it points to the data allocated
- beyond this structure like:
- rtl_pci_priv or rtl_usb_priv */
-- u8 priv[0];
-+ u8 priv[0] __aligned(sizeof(void *));
- };
-
- #define rtl_priv(hw) (((struct rtl_priv *)(hw)->priv))
diff --git a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
index 56aef894bcd07e2976e1931e19e0d705b167fc9f..4ea609e3b1cef742f422b3e5c323ffa20808a2e0 100644
--- a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
+++ b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
@@ -42,7 +42,7 @@
if (wl->radio_enabled != phy->radio_on) {
if (wl->radio_enabled) {
-@@ -5028,6 +5025,47 @@ static int b43_op_get_survey(struct ieee
+@@ -5029,6 +5026,47 @@ static int b43_op_get_survey(struct ieee
return 0;
}
@@ -90,7 +90,7 @@
static const struct ieee80211_ops b43_hw_ops = {
.tx = b43_op_tx,
.conf_tx = b43_op_conf_tx,
-@@ -5049,6 +5087,8 @@ static const struct ieee80211_ops b43_hw
+@@ -5050,6 +5088,8 @@ static const struct ieee80211_ops b43_hw
.sw_scan_complete = b43_op_sw_scan_complete_notifier,
.get_survey = b43_op_get_survey,
.rfkill_poll = b43_rfkill_poll,
@@ -99,7 +99,7 @@
};
/* Hard-reset the chip. Do not call this directly.
-@@ -5295,6 +5335,8 @@ static int b43_one_core_attach(struct b4
+@@ -5292,6 +5332,8 @@ static int b43_one_core_attach(struct b4
if (!wldev)
goto out;
@@ -108,7 +108,7 @@
wldev->use_pio = b43_modparam_pio;
wldev->dev = dev;
wldev->wl = wl;
-@@ -5385,6 +5427,9 @@ static struct b43_wl *b43_wireless_init(
+@@ -5382,6 +5424,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
diff --git a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
index c039f41451b1811502fc042f1ae116c9c9288653..2f8ba58c3763ff993d61903ea58313db890c8013 100644
--- a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
+++ b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
@@ -19,7 +19,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
-@@ -1061,6 +1061,32 @@ static inline bool b43_using_pio_transfe
+@@ -1058,6 +1058,32 @@ static inline bool b43_using_pio_transfe
return dev->__using_pio_transfers;
}
@@ -88,7 +88,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
dev->phy.writes_counter = 0;
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
-@@ -5417,14 +5417,14 @@ static inline void check_phyreg(struct b
+@@ -5418,14 +5418,14 @@ static inline void check_phyreg(struct b
static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)
{
check_phyreg(dev, reg);
@@ -105,7 +105,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
b43_write16(dev, B43_MMIO_PHY_DATA, value);
}
-@@ -5432,7 +5432,7 @@ static void b43_nphy_op_maskset(struct b
+@@ -5433,7 +5433,7 @@ static void b43_nphy_op_maskset(struct b
u16 set)
{
check_phyreg(dev, reg);
@@ -114,7 +114,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
}
-@@ -5443,7 +5443,7 @@ static u16 b43_nphy_op_radio_read(struct
+@@ -5444,7 +5444,7 @@ static u16 b43_nphy_op_radio_read(struct
/* N-PHY needs 0x100 for read access */
reg |= 0x100;
@@ -123,7 +123,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
}
-@@ -5452,7 +5452,7 @@ static void b43_nphy_op_radio_write(stru
+@@ -5453,7 +5453,7 @@ static void b43_nphy_op_radio_write(stru
/* Register 1 is a 32-bit register. */
B43_WARN_ON(reg == 1);
diff --git a/package/kernel/mac80211/patches/850-brcmsmac-remove-extra-regulation-restriction.patch b/package/kernel/mac80211/patches/850-brcmsmac-remove-extra-regulation-restriction.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b2efa00b2cbf04d7bbdf84698ef92f129adb6cc6
--- /dev/null
+++ b/package/kernel/mac80211/patches/850-brcmsmac-remove-extra-regulation-restriction.patch
@@ -0,0 +1,29 @@
+--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+@@ -58,21 +58,12 @@
+ (((c) < 149) ? 3 : 4))))
+
+ #define BRCM_2GHZ_2412_2462 REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
+-#define BRCM_2GHZ_2467_2472 REG_RULE(2467-10, 2472+10, 20, 0, 19, \
+- NL80211_RRF_NO_IR)
++#define BRCM_2GHZ_2467_2472 REG_RULE(2467-10, 2472+10, 20, 0, 19, 0)
+
+-#define BRCM_5GHZ_5180_5240 REG_RULE(5180-10, 5240+10, 40, 0, 21, \
+- NL80211_RRF_NO_IR)
+-#define BRCM_5GHZ_5260_5320 REG_RULE(5260-10, 5320+10, 40, 0, 21, \
+- NL80211_RRF_NO_IR | \
+- NL80211_RRF_DFS | \
+- NL80211_RRF_NO_IR)
+-#define BRCM_5GHZ_5500_5700 REG_RULE(5500-10, 5700+10, 40, 0, 21, \
+- NL80211_RRF_NO_IR | \
+- NL80211_RRF_DFS | \
+- NL80211_RRF_NO_IR)
+-#define BRCM_5GHZ_5745_5825 REG_RULE(5745-10, 5825+10, 40, 0, 21, \
+- NL80211_RRF_NO_IR)
++#define BRCM_5GHZ_5180_5240 REG_RULE(5180-10, 5240+10, 40, 0, 21, 0)
++#define BRCM_5GHZ_5260_5320 REG_RULE(5260-10, 5320+10, 40, 0, 21, 0)
++#define BRCM_5GHZ_5500_5700 REG_RULE(5500-10, 5700+10, 40, 0, 21, 0)
++#define BRCM_5GHZ_5745_5825 REG_RULE(5745-10, 5825+10, 40, 0, 21, 0)
+
+ static const struct ieee80211_regdomain brcms_regdom_x2 = {
+ .n_reg_rules = 6,
diff --git a/package/kernel/mac80211/patches/851-brcmsmac-remove-extra-regulation-restriction.patch b/package/kernel/mac80211/patches/851-brcmsmac-remove-extra-regulation-restriction.patch
deleted file mode 100644
index dd1393ae5d9e26c4212a50c4301c5fee7690064a..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/851-brcmsmac-remove-extra-regulation-restriction.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
-@@ -59,23 +59,16 @@
-
- #define BRCM_2GHZ_2412_2462 REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
- #define BRCM_2GHZ_2467_2472 REG_RULE(2467-10, 2472+10, 20, 0, 19, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ 0)
-
- #define BRCM_5GHZ_5180_5240 REG_RULE(5180-10, 5240+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ 0)
- #define BRCM_5GHZ_5260_5320 REG_RULE(5260-10, 5320+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_DFS | \
-- NL80211_RRF_NO_IBSS)
-+ 0)
- #define BRCM_5GHZ_5500_5700 REG_RULE(5500-10, 5700+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_DFS | \
-- NL80211_RRF_NO_IBSS)
-+ 0)
- #define BRCM_5GHZ_5745_5825 REG_RULE(5745-10, 5825+10, 40, 0, 21, \
-- NL80211_RRF_PASSIVE_SCAN | \
-- NL80211_RRF_NO_IBSS)
-+ 0)
-
- static const struct ieee80211_regdomain brcms_regdom_x2 = {
- .n_reg_rules = 6,
diff --git a/package/kernel/mac80211/patches/860-brcmsmac-use-bcma-PCIe-up-and-down-functions.patch b/package/kernel/mac80211/patches/860-brcmsmac-use-bcma-PCIe-up-and-down-functions.patch
deleted file mode 100644
index d89b9847a3861af0c6a697e0472744e97a4c1c17..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/860-brcmsmac-use-bcma-PCIe-up-and-down-functions.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-brcmsmac: use bcma PCIe up and down functions
-
-replace the calls to bcma_core_pci_extend_L1timer() by calls to the
-newly introduced bcma_core_pci_ip() and bcma_core_pci_down()
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-
---- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
-@@ -679,27 +679,6 @@ bool ai_clkctl_cc(struct si_pub *sih, en
- return mode == BCMA_CLKMODE_FAST;
- }
-
--void ai_pci_up(struct si_pub *sih)
--{
-- struct si_info *sii;
--
-- sii = container_of(sih, struct si_info, pub);
--
-- if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
-- bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);
--}
--
--/* Unconfigure and/or apply various WARs when going down */
--void ai_pci_down(struct si_pub *sih)
--{
-- struct si_info *sii;
--
-- sii = container_of(sih, struct si_info, pub);
--
-- if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
-- bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);
--}
--
- /* Enable BT-COEX & Ex-PA for 4313 */
- void ai_epa_4313war(struct si_pub *sih)
- {
---- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
-@@ -183,9 +183,6 @@ extern u16 ai_clkctl_fast_pwrup_delay(st
- extern bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode);
- extern bool ai_deviceremoved(struct si_pub *sih);
-
--extern void ai_pci_down(struct si_pub *sih);
--extern void ai_pci_up(struct si_pub *sih);
--
- /* Enable Ex-PA for 4313 */
- extern void ai_epa_4313war(struct si_pub *sih);
-
---- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -4667,7 +4667,7 @@ static int brcms_b_attach(struct brcms_c
- brcms_c_coredisable(wlc_hw);
-
- /* Match driver "down" state */
-- ai_pci_down(wlc_hw->sih);
-+ bcma_core_pci_down(wlc_hw->d11core->bus);
-
- /* turn off pll and xtal to match driver "down" state */
- brcms_b_xtal(wlc_hw, OFF);
-@@ -5010,12 +5010,12 @@ static int brcms_b_up_prep(struct brcms_
- */
- if (brcms_b_radio_read_hwdisabled(wlc_hw)) {
- /* put SB PCI in down state again */
-- ai_pci_down(wlc_hw->sih);
-+ bcma_core_pci_down(wlc_hw->d11core->bus);
- brcms_b_xtal(wlc_hw, OFF);
- return -ENOMEDIUM;
- }
-
-- ai_pci_up(wlc_hw->sih);
-+ bcma_core_pci_up(wlc_hw->d11core->bus);
-
- /* reset the d11 core */
- brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
-@@ -5212,7 +5212,7 @@ static int brcms_b_down_finish(struct br
-
- /* turn off primary xtal and pll */
- if (!wlc_hw->noreset) {
-- ai_pci_down(wlc_hw->sih);
-+ bcma_core_pci_down(wlc_hw->d11core->bus);
- brcms_b_xtal(wlc_hw, OFF);
- }
- }
diff --git a/package/kernel/mac80211/patches/861-b43-call-PCIe-up-and-down-functions.patch b/package/kernel/mac80211/patches/861-b43-call-PCIe-up-and-down-functions.patch
deleted file mode 100644
index f09cc3ee89368c56f0342142e66e8be8453149ba..0000000000000000000000000000000000000000
--- a/package/kernel/mac80211/patches/861-b43-call-PCIe-up-and-down-functions.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-b43: call PCIe up and down functions
-
-Tell the PCIe host core when the wifi is activated.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -4670,6 +4670,19 @@ static void b43_wireless_core_exit(struc
- b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_RUN,
- B43_MACCTL_PSM_JMP0);
-
-+ switch (dev->dev->bus_type) {
-+#ifdef CPTCFG_B43_BCMA
-+ case B43_BUS_BCMA:
-+ bcma_core_pci_down(dev->dev->bdev->bus);
-+ break;
-+#endif
-+#ifdef CPTCFG_B43_SSB
-+ case B43_BUS_SSB:
-+ /* TODO */
-+ break;
-+#endif
-+ }
-+
- b43_dma_free(dev);
- b43_pio_free(dev);
- b43_chip_exit(dev);
-@@ -4709,6 +4722,7 @@ static int b43_wireless_core_init(struct
- case B43_BUS_BCMA:
- bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],
- dev->dev->bdev, true);
-+ bcma_core_pci_up(dev->dev->bdev->bus);
- break;
- #endif
- #ifdef CPTCFG_B43_SSB