diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-14 16:01:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-16 14:38:52 -0400 |
commit | 21bd6ea3116998e429dad796bce785e18df39daa (patch) | |
tree | 71c57dc41000e96023aa27f6fc7e1bd660a37ef8 | |
parent | d9e9145e497f2cb9a3891a065342ca0593824aa2 (diff) |
ath9k: use consistent value for REDUCE_SCALED_POWER_BY_THREE_CHAIN
The REDUCE_SCALED_POWER_BY_THREE_CHAIN symbol is
defined in different eeprom files, and the value
varies between the different files.
In eeprom_def.c and in ar9003_eeprom.c the value
of the symbol is 9, however the comments in these
files indicates the value should be 10*log10(3)*2
which is 9.54242509439325. Replace the the value
to 10 in these files.
Also add comments to eeprom_9287.c.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_9287.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 672b6c9dc80..25a4a022f85 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #define CTL_11G_EXT (CTL_11G | EXT_ADDITIVE) | 31 | #define CTL_11G_EXT (CTL_11G | EXT_ADDITIVE) |
32 | #define CTL_11B_EXT (CTL_11B | EXT_ADDITIVE) | 32 | #define CTL_11B_EXT (CTL_11B | EXT_ADDITIVE) |
33 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 /* 10*log10(2)*2 */ | 33 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 /* 10*log10(2)*2 */ |
34 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 9 /* 10*log10(3)*2 */ | 34 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 /* 10*log10(3)*2 */ |
35 | #define PWRINCR_3_TO_1_CHAIN 9 /* 10*log(3)*2 */ | 35 | #define PWRINCR_3_TO_1_CHAIN 9 /* 10*log(3)*2 */ |
36 | #define PWRINCR_3_TO_2_CHAIN 3 /* floor(10*log(3/2)*2) */ | 36 | #define PWRINCR_3_TO_2_CHAIN 3 /* floor(10*log(3/2)*2) */ |
37 | #define PWRINCR_2_TO_1_CHAIN 6 /* 10*log(2)*2 */ | 37 | #define PWRINCR_2_TO_1_CHAIN 6 /* 10*log(2)*2 */ |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c index f272236d805..604eab85898 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c | |||
@@ -564,8 +564,8 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, | |||
564 | (((cfgCtl & ~CTL_MODE_M) | (pCtlMode[ctlMode] & CTL_MODE_M)) == \ | 564 | (((cfgCtl & ~CTL_MODE_M) | (pCtlMode[ctlMode] & CTL_MODE_M)) == \ |
565 | ((pEepData->ctlIndex[i] & CTL_MODE_M) | SD_NO_CTL)) | 565 | ((pEepData->ctlIndex[i] & CTL_MODE_M) | SD_NO_CTL)) |
566 | 566 | ||
567 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 | 567 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 /* 10*log10(2)*2 */ |
568 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 | 568 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 /* 10*log10(3)*2 */ |
569 | 569 | ||
570 | u16 twiceMaxEdgePower; | 570 | u16 twiceMaxEdgePower; |
571 | int i; | 571 | int i; |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c index 43f554eb632..6a85796a342 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c | |||
@@ -992,7 +992,7 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, | |||
992 | u16 powerLimit) | 992 | u16 powerLimit) |
993 | { | 993 | { |
994 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 /* 10*log10(2)*2 */ | 994 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 /* 10*log10(2)*2 */ |
995 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 9 /* 10*log10(3)*2 */ | 995 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 /* 10*log10(3)*2 */ |
996 | 996 | ||
997 | struct ar5416_eeprom_def *pEepData = &ah->eeprom.def; | 997 | struct ar5416_eeprom_def *pEepData = &ah->eeprom.def; |
998 | u16 twiceMaxEdgePower; | 998 | u16 twiceMaxEdgePower; |