diff options
| author | Eran Harary <eran.harary@intel.com> | 2014-02-04 14:21:38 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-02-13 13:49:37 +0200 |
| commit | 77db0a3c27dc0f027e5f3956f4ba77246c89a548 (patch) | |
| tree | 343938182601b80be4b451661e4efaa19fc35b6a /drivers/net/wireless/iwlwifi/iwl-fw.h | |
| parent | 7303dd7f312f0d07a4bf45c62608d5233b5e8062 (diff) | |
| download | lwn-77db0a3c27dc0f027e5f3956f4ba77246c89a548.tar.gz lwn-77db0a3c27dc0f027e5f3956f4ba77246c89a548.zip | |
iwlwifi: mvm: new NVM format in family 8000
Support the changes below:
- Fields and sections structure were changed.
- the NVM file built from DWord instead of Words.
- sections header format was changed.
Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fw.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h index b0d09987540d..73671072d0f6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw.h @@ -288,6 +288,8 @@ struct iwl_fw { struct iwl_tlv_calib_ctrl default_calib[IWL_UCODE_TYPE_MAX]; u32 phy_config; + u8 valid_tx_ant; + u8 valid_rx_ant; bool mvm_fw; @@ -296,14 +298,12 @@ struct iwl_fw { static inline u8 iwl_fw_valid_tx_ant(const struct iwl_fw *fw) { - return (fw->phy_config & FW_PHY_CFG_TX_CHAIN) >> - FW_PHY_CFG_TX_CHAIN_POS; + return fw->valid_tx_ant; } static inline u8 iwl_fw_valid_rx_ant(const struct iwl_fw *fw) { - return (fw->phy_config & FW_PHY_CFG_RX_CHAIN) >> - FW_PHY_CFG_RX_CHAIN_POS; + return fw->valid_rx_ant; } #endif /* __iwl_fw_h__ */ |