Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / net / wireless / iwlwifi / iwl-eeprom-parse.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
index e3c7dea..f0548b8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
@@ -81,16 +81,17 @@ struct iwl_nvm_data {
        bool sku_cap_band_24GHz_enable;
        bool sku_cap_band_52GHz_enable;
        bool sku_cap_11n_enable;
+       bool sku_cap_11ac_enable;
        bool sku_cap_amt_enable;
        bool sku_cap_ipan_enable;
 
-       u8 radio_cfg_type;
+       u16 radio_cfg_type;
        u8 radio_cfg_step;
        u8 radio_cfg_dash;
        u8 radio_cfg_pnum;
        u8 valid_tx_ant, valid_rx_ant;
 
-       u16 nvm_version;
+       u32 nvm_version;
        s8 max_tx_pwr_half_dbm;
 
        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];