Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[karo-tx-linux.git] / drivers / net / wireless / ath / ath9k / ar9003_hw.c

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 79fd3b2dcbdef9fc117b99177cb44fe46a581ae4..8b238c15916df3281189b015a7df6a9034263161 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -857,7 +857,7 @@ static void ar9003_rx_gain_table_mode0(struct ath_hw *ah)
                               qca956x_1p0_common_rx_gain_table);
                INIT_INI_ARRAY(&ah->ini_modes_rx_gain_bounds,
                               qca956x_1p0_common_rx_gain_bounds);
-               INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
+               INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,
                               qca956x_1p0_xlna_only);
        } else if (AR_SREV_9580(ah))
                INIT_INI_ARRAY(&ah->iniModesRxGain,
@@ -942,7 +942,7 @@ static void ar9003_rx_gain_table_mode2(struct ath_hw *ah)
                               ar9462_2p1_baseband_core_mix_rxgain);
                INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_postamble,
                               ar9462_2p1_baseband_postamble_mix_rxgain);
-               INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
+               INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,
                               ar9462_2p1_baseband_postamble_5g_xlna);
        } else if (AR_SREV_9462_20(ah)) {
                INIT_INI_ARRAY(&ah->iniModesRxGain,
@@ -951,7 +951,7 @@ static void ar9003_rx_gain_table_mode2(struct ath_hw *ah)
                               ar9462_2p0_baseband_core_mix_rxgain);
                INIT_INI_ARRAY(&ah->ini_modes_rxgain_bb_postamble,
                               ar9462_2p0_baseband_postamble_mix_rxgain);
-               INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
+               INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,
                               ar9462_2p0_baseband_postamble_5g_xlna);
        }
 }
@@ -961,12 +961,12 @@ static void ar9003_rx_gain_table_mode3(struct ath_hw *ah)
        if (AR_SREV_9462_21(ah)) {
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                               ar9462_2p1_common_5g_xlna_only_rxgain);
-               INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
+               INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,
                               ar9462_2p1_baseband_postamble_5g_xlna);
        } else if (AR_SREV_9462_20(ah)) {
                INIT_INI_ARRAY(&ah->iniModesRxGain,
                               ar9462_2p0_common_5g_xlna_only_rxgain);
-               INIT_INI_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
+               INIT_INI_ARRAY(&ah->ini_modes_rxgain_xlna,
                               ar9462_2p0_baseband_postamble_5g_xlna);
        }
 }