diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-12 14:35:23 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 14:35:23 -0400 |
| commit | 861bca265e7808e2493590843b8585f6943af16f (patch) | |
| tree | f9c6d3beee927191856479888bc845859cd135cf /drivers/net/wireless/ath/ath9k/ar9003_phy.c | |
| parent | 8b3e7be437a6b62118d0485ad971e724afe23fdf (diff) | |
| parent | e0e29b683d6784ef59bbc914eac85a04b650e63c (diff) | |
| download | linux-861bca265e7808e2493590843b8585f6943af16f.tar.gz linux-861bca265e7808e2493590843b8585f6943af16f.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
net/mac80211/iface.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_phy.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 0d053503b8bf..83e03857c014 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -334,7 +334,8 @@ static void ar9003_hw_spur_ofdm(struct ath_hw *ah, REG_RMW_FIELD(ah, AR_PHY_SPUR_REG, AR_PHY_SPUR_REG_EN_VIT_SPUR_RSSI, 1); - if (REG_READ_FIELD(ah, AR_PHY_MODE, + if (!AR_SREV_9340(ah) && + REG_READ_FIELD(ah, AR_PHY_MODE, AR_PHY_MODE_DYNAMIC) == 0x1) REG_RMW_FIELD(ah, AR_PHY_SPUR_REG, AR_PHY_SPUR_REG_ENABLE_NF_RSSI_SPUR_MIT, 1); |