aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-drv.c
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2014-02-04 07:21:38 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-02-13 06:49:37 -0500
commit77db0a3c27dc0f027e5f3956f4ba77246c89a548 (patch)
tree343938182601b80be4b451661e4efaa19fc35b6a /drivers/net/wireless/iwlwifi/iwl-drv.c
parent7303dd7f312f0d07a4bf45c62608d5233b5e8062 (diff)
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-drv.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-drv.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index b3bc30b4292b..662d9936485c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -728,6 +728,12 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
728 if (tlv_len != sizeof(u32)) 728 if (tlv_len != sizeof(u32))
729 goto invalid_tlv_len; 729 goto invalid_tlv_len;
730 drv->fw.phy_config = le32_to_cpup((__le32 *)tlv_data); 730 drv->fw.phy_config = le32_to_cpup((__le32 *)tlv_data);
731 drv->fw.valid_tx_ant = (drv->fw.phy_config &
732 FW_PHY_CFG_TX_CHAIN) >>
733 FW_PHY_CFG_TX_CHAIN_POS;
734 drv->fw.valid_rx_ant = (drv->fw.phy_config &
735 FW_PHY_CFG_RX_CHAIN) >>
736 FW_PHY_CFG_RX_CHAIN_POS;
731 break; 737 break;
732 case IWL_UCODE_TLV_SECURE_SEC_RT: 738 case IWL_UCODE_TLV_SECURE_SEC_RT:
733 iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_REGULAR, 739 iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_REGULAR,