aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-07-01 18:09:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-02 13:44:33 -0400
commitf504f5f63a4d1d1372043a3aa3d64342a705caa3 (patch)
tree69d7b03cf68d689c625519ebb2f45d16083673e9
parent88c1f4f6dffe66e2fed8e7e3276e091ee850bed0 (diff)
ath9k_hw: fix a few inconsistencies in initval array names
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9001_initvals.h2
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9002_hw.c12
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9002_initvals.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
index 0b94bd385b0a..760be1f20c7b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
@@ -1217,7 +1217,7 @@ static const u32 ar5416Addac_9160[][2] = {
1217 {0x000098cc, 0x00000000 }, 1217 {0x000098cc, 0x00000000 },
1218}; 1218};
1219 1219
1220static const u32 ar5416Addac_91601_1[][2] = { 1220static const u32 ar5416Addac_9160_1_1[][2] = {
1221 {0x0000989c, 0x00000000 }, 1221 {0x0000989c, 0x00000000 },
1222 {0x0000989c, 0x00000000 }, 1222 {0x0000989c, 0x00000000 },
1223 {0x0000989c, 0x00000000 }, 1223 {0x0000989c, 0x00000000 },
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index 0317ac9fc1b7..75b80d13ff91 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -179,8 +179,8 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
179 ARRAY_SIZE(ar5416Bank7_9160), 2); 179 ARRAY_SIZE(ar5416Bank7_9160), 2);
180 if (AR_SREV_9160_11(ah)) { 180 if (AR_SREV_9160_11(ah)) {
181 INIT_INI_ARRAY(&ah->iniAddac, 181 INIT_INI_ARRAY(&ah->iniAddac,
182 ar5416Addac_91601_1, 182 ar5416Addac_9160_1_1,
183 ARRAY_SIZE(ar5416Addac_91601_1), 2); 183 ARRAY_SIZE(ar5416Addac_9160_1_1), 2);
184 } else { 184 } else {
185 INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160, 185 INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160,
186 ARRAY_SIZE(ar5416Addac_9160), 2); 186 ARRAY_SIZE(ar5416Addac_9160), 2);
@@ -239,12 +239,12 @@ void ar9002_hw_cck_chan14_spread(struct ath_hw *ah)
239{ 239{
240 if (AR_SREV_9287_11_OR_LATER(ah)) { 240 if (AR_SREV_9287_11_OR_LATER(ah)) {
241 INIT_INI_ARRAY(&ah->iniCckfirNormal, 241 INIT_INI_ARRAY(&ah->iniCckfirNormal,
242 ar9287Common_normal_cck_fir_coeff_92871_1, 242 ar9287Common_normal_cck_fir_coeff_9287_1_1,
243 ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_92871_1), 243 ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_9287_1_1),
244 2); 244 2);
245 INIT_INI_ARRAY(&ah->iniCckfirJapan2484, 245 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
246 ar9287Common_japan_2484_cck_fir_coeff_92871_1, 246 ar9287Common_japan_2484_cck_fir_coeff_9287_1_1,
247 ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_92871_1), 247 ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_9287_1_1),
248 2); 248 2);
249 } 249 }
250} 250}
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
index 8ab24ee8564b..620fa8c712b0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
@@ -4142,13 +4142,13 @@ static const u32 ar9287Common_9287_1_1[][2] = {
4142 * registers be programmed differently from the channel between 2412 and 4142 * registers be programmed differently from the channel between 2412 and
4143 * 2472 MHz. 4143 * 2472 MHz.
4144 */ 4144 */
4145static const u32 ar9287Common_normal_cck_fir_coeff_92871_1[][2] = { 4145static const u32 ar9287Common_normal_cck_fir_coeff_9287_1_1[][2] = {
4146 { 0x0000a1f4, 0x00fffeff }, 4146 { 0x0000a1f4, 0x00fffeff },
4147 { 0x0000a1f8, 0x00f5f9ff }, 4147 { 0x0000a1f8, 0x00f5f9ff },
4148 { 0x0000a1fc, 0xb79f6427 }, 4148 { 0x0000a1fc, 0xb79f6427 },
4149}; 4149};
4150 4150
4151static const u32 ar9287Common_japan_2484_cck_fir_coeff_92871_1[][2] = { 4151static const u32 ar9287Common_japan_2484_cck_fir_coeff_9287_1_1[][2] = {
4152 { 0x0000a1f4, 0x00000000 }, 4152 { 0x0000a1f4, 0x00000000 },
4153 { 0x0000a1f8, 0xefff0301 }, 4153 { 0x0000a1f8, 0xefff0301 },
4154 { 0x0000a1fc, 0xca9228ee }, 4154 { 0x0000a1fc, 0xca9228ee },