1 --- a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
2 +++ b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
3 @@ -1217,7 +1217,7 @@ static const u32 ar5416Addac_9160[][2] =
4 {0x000098cc, 0x00000000 },
7 -static const u32 ar5416Addac_91601_1[][2] = {
8 +static const u32 ar5416Addac_9160_1_1[][2] = {
9 {0x0000989c, 0x00000000 },
10 {0x0000989c, 0x00000000 },
11 {0x0000989c, 0x00000000 },
12 --- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
13 +++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
14 @@ -179,8 +179,8 @@ static void ar9002_hw_init_mode_regs(str
15 ARRAY_SIZE(ar5416Bank7_9160), 2);
16 if (AR_SREV_9160_11(ah)) {
17 INIT_INI_ARRAY(&ah->iniAddac,
18 - ar5416Addac_91601_1,
19 - ARRAY_SIZE(ar5416Addac_91601_1), 2);
20 + ar5416Addac_9160_1_1,
21 + ARRAY_SIZE(ar5416Addac_9160_1_1), 2);
23 INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160,
24 ARRAY_SIZE(ar5416Addac_9160), 2);
25 @@ -239,12 +239,12 @@ void ar9002_hw_cck_chan14_spread(struct
27 if (AR_SREV_9287_11_OR_LATER(ah)) {
28 INIT_INI_ARRAY(&ah->iniCckfirNormal,
29 - ar9287Common_normal_cck_fir_coeff_92871_1,
30 - ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_92871_1),
31 + ar9287Common_normal_cck_fir_coeff_9287_1_1,
32 + ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_9287_1_1),
34 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
35 - ar9287Common_japan_2484_cck_fir_coeff_92871_1,
36 - ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_92871_1),
37 + ar9287Common_japan_2484_cck_fir_coeff_9287_1_1,
38 + ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_9287_1_1),
42 --- a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
43 +++ b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
44 @@ -4142,13 +4142,13 @@ static const u32 ar9287Common_9287_1_1[]
45 * registers be programmed differently from the channel between 2412 and
48 -static const u32 ar9287Common_normal_cck_fir_coeff_92871_1[][2] = {
49 +static const u32 ar9287Common_normal_cck_fir_coeff_9287_1_1[][2] = {
50 { 0x0000a1f4, 0x00fffeff },
51 { 0x0000a1f8, 0x00f5f9ff },
52 { 0x0000a1fc, 0xb79f6427 },
55 -static const u32 ar9287Common_japan_2484_cck_fir_coeff_92871_1[][2] = {
56 +static const u32 ar9287Common_japan_2484_cck_fir_coeff_9287_1_1[][2] = {
57 { 0x0000a1f4, 0x00000000 },
58 { 0x0000a1f8, 0xefff0301 },
59 { 0x0000a1fc, 0xca9228ee },