diff options
| author | Eran Harary <eran.harary@intel.com> | 2014-09-29 02:27:56 -0400 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-10-29 06:52:24 -0400 |
| commit | c7583d7dd62d44a5e930d67e7e6b881a569a5561 (patch) | |
| tree | 7bb2b13b3e3d682e732c49b96a421158f113ec72 /drivers/net/wireless/iwlwifi/iwl-drv.c | |
| parent | a3ead6568c511d47b6cdc3d624ef0b4924e9dd27 (diff) | |
iwlwifi: always run the secured flow for family 8000
In the new format the "CSS section" has the same TLV type
as the "mem section". So we need to run the secured flow
for all the 8000 products.
Signed-off-by: Eran Harary <eran.harary@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.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index 0f1084f09caa..d9fa8e034da2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c | |||
| @@ -807,19 +807,16 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, | |||
| 807 | iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_REGULAR, | 807 | iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_REGULAR, |
| 808 | tlv_len); | 808 | tlv_len); |
| 809 | drv->fw.mvm_fw = true; | 809 | drv->fw.mvm_fw = true; |
| 810 | drv->fw.img[IWL_UCODE_REGULAR].is_secure = true; | ||
| 811 | break; | 810 | break; |
| 812 | case IWL_UCODE_TLV_SECURE_SEC_INIT: | 811 | case IWL_UCODE_TLV_SECURE_SEC_INIT: |
| 813 | iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_INIT, | 812 | iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_INIT, |
| 814 | tlv_len); | 813 | tlv_len); |
| 815 | drv->fw.mvm_fw = true; | 814 | drv->fw.mvm_fw = true; |
| 816 | drv->fw.img[IWL_UCODE_INIT].is_secure = true; | ||
| 817 | break; | 815 | break; |
| 818 | case IWL_UCODE_TLV_SECURE_SEC_WOWLAN: | 816 | case IWL_UCODE_TLV_SECURE_SEC_WOWLAN: |
| 819 | iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_WOWLAN, | 817 | iwl_store_ucode_sec(pieces, tlv_data, IWL_UCODE_WOWLAN, |
| 820 | tlv_len); | 818 | tlv_len); |
| 821 | drv->fw.mvm_fw = true; | 819 | drv->fw.mvm_fw = true; |
| 822 | drv->fw.img[IWL_UCODE_WOWLAN].is_secure = true; | ||
| 823 | break; | 820 | break; |
| 824 | case IWL_UCODE_TLV_NUM_OF_CPU: | 821 | case IWL_UCODE_TLV_NUM_OF_CPU: |
| 825 | if (tlv_len != sizeof(u32)) | 822 | if (tlv_len != sizeof(u32)) |