diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-10 17:50:47 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-10 17:50:47 (GMT) |
commit | 1e13f863ca88014d9550876c05c939fdab1017d1 (patch) | |
tree | 1ede9804ee33d7eefb73e9535e0399dfd7f58c00 /drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |
parent | f404c2fea37e02bec7c8b6edddf5edd22ca60505 (diff) | |
parent | f435d9eea01309aa7b6c1f134569a7b5957918ae (diff) | |
download | linux-fsl-qoriq-1e13f863ca88014d9550876c05c939fdab1017d1.tar.xz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_eeprom.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index f2eec38..73a8014 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c @@ -57,10 +57,11 @@ #define SUB_NUM_CTL_MODES_AT_5G_40 2 /* excluding HT40, EXT-OFDM */ #define SUB_NUM_CTL_MODES_AT_2G_40 3 /* excluding HT40, EXT-OFDM, EXT-CCK */ +#define CTL(_tpower, _flag) ((_tpower) | ((_flag) << 6)) + static int ar9003_hw_power_interpolate(int32_t x, int32_t *px, int32_t *py, u_int16_t np); -#define CTL(_tpower, _flag) ((_tpower) | ((_flag) << 6)) static const struct ar9300_eeprom ar9300_default = { .eepromVersion = 2, @@ -3032,6 +3033,8 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah, return le32_to_cpu(pBase->swreg); case EEP_PAPRD: return !!(pBase->featureEnable & BIT(5)); + case EEP_CHAIN_MASK_REDUCE: + return (pBase->miscConfiguration >> 0x3) & 0x1; default: return 0; } |