diff options
| author | John W. Linville | 2010-07-29 20:47:07 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-07-29 20:47:07 +0200 |
| commit | ae3568adf42d5d3bb3cfa505b94351c5d1ce4924 (patch) | |
| tree | 112865a6e6b1e4ddf70362f3efb295c495ec85b9 /drivers/net/wireless/ath/ath9k/ar9003_phy.c | |
| parent | net: bnx2x_cmn.c needs net/ip6_checksum.h for csum_ipv6_magic (diff) | |
| parent | cfg80211: fix dev <-> wiphy typo (diff) | |
| download | kernel-qcow2-linux-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.tar.gz kernel-qcow2-linux-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.tar.xz kernel-qcow2-linux-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
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, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 7c93338540ae..a753a431bb13 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -1029,6 +1029,9 @@ static void ar9003_hw_do_getnf(struct ath_hw *ah, nf = MS(REG_READ(ah, AR_PHY_CCA_2), AR_PHY_CH2_MINCCA_PWR); nfarray[2] = sign_extend(nf, 9); + if (!IS_CHAN_HT40(ah->curchan)) + return; + nf = MS(REG_READ(ah, AR_PHY_EXT_CCA), AR_PHY_EXT_MINCCA_PWR); nfarray[3] = sign_extend(nf, 9); |