Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.git] / drivers / net / wireless / ath / ath9k / hw.h

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index e8454db17634b95450f643ada6f52db82a57aa84..831a54415a2512fe890832dcd6ec688d160b1a7c 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -332,14 +332,14 @@ enum ath9k_hw_hang_checks {
 struct ath9k_ops_config {
        int dma_beacon_response_time;
        int sw_beacon_response_time;
-       u32 cwm_ignore_extcca;
+       bool cwm_ignore_extcca;
        u32 pcie_waen;
        u8 analog_shiftreg;
        u32 ofdm_trig_low;
        u32 ofdm_trig_high;
        u32 cck_trig_high;
        u32 cck_trig_low;
-       u32 enable_paprd;
+       bool enable_paprd;
        int serialize_regmode;
        bool rx_intr_mitigation;
        bool tx_intr_mitigation;
@@ -919,7 +919,7 @@ struct ath_hw {
        struct ar5416IniArray iniCckfirJapan2484;
        struct ar5416IniArray iniModes_9271_ANI_reg;
        struct ar5416IniArray ini_radio_post_sys2ant;
-       struct ar5416IniArray ini_modes_rxgain_5g_xlna;
+       struct ar5416IniArray ini_modes_rxgain_xlna;
        struct ar5416IniArray ini_modes_rxgain_bb_core;
        struct ar5416IniArray ini_modes_rxgain_bb_postamble;