diff options
author | David Spinadel <david.spinadel@intel.com> | 2012-03-13 08:46:38 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-16 17:36:20 -0400 |
commit | 0e02fe5ff3178ef288a8d3adaa412c09fa329bd2 (patch) | |
tree | 1b9b560ccb2c663e81f72703617e25e2f284953e /drivers/net/wireless | |
parent | 1176f431fd5c1f378587cdc7ef7d6b59fdd47887 (diff) |
iwlwifi: remove double verification of ucode sections
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index da4d85a32d31..17485e715424 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c | |||
@@ -808,42 +808,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) | |||
808 | IWL_INFO(drv, "loaded firmware version %s", drv->fw.fw_version); | 808 | IWL_INFO(drv, "loaded firmware version %s", drv->fw.fw_version); |
809 | 809 | ||
810 | /* | 810 | /* |
811 | * For any of the failures below (before allocating pci memory) | ||
812 | * we will try to load a version with a smaller API -- maybe the | ||
813 | * user just got a corrupted version of the latest API. | ||
814 | */ | ||
815 | |||
816 | IWL_DEBUG_INFO(drv, "f/w package hdr ucode version raw = 0x%x\n", | ||
817 | drv->fw.ucode_ver); | ||
818 | IWL_DEBUG_INFO(drv, "f/w package hdr runtime inst size = %Zd\n", | ||
819 | get_sec_size(&pieces, IWL_UCODE_REGULAR, | ||
820 | IWL_UCODE_SECTION_INST)); | ||
821 | IWL_DEBUG_INFO(drv, "f/w package hdr runtime data size = %Zd\n", | ||
822 | get_sec_size(&pieces, IWL_UCODE_REGULAR, | ||
823 | IWL_UCODE_SECTION_DATA)); | ||
824 | IWL_DEBUG_INFO(drv, "f/w package hdr init inst size = %Zd\n", | ||
825 | get_sec_size(&pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST)); | ||
826 | IWL_DEBUG_INFO(drv, "f/w package hdr init data size = %Zd\n", | ||
827 | get_sec_size(&pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA)); | ||
828 | |||
829 | /* Verify that uCode images will fit in card's SRAM */ | ||
830 | if (get_sec_size(&pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_INST) > | ||
831 | cfg->max_inst_size) { | ||
832 | IWL_ERR(drv, "uCode instr len %Zd too large to fit in\n", | ||
833 | get_sec_size(&pieces, IWL_UCODE_REGULAR, | ||
834 | IWL_UCODE_SECTION_INST)); | ||
835 | goto try_again; | ||
836 | } | ||
837 | |||
838 | if (get_sec_size(&pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_DATA) > | ||
839 | cfg->max_data_size) { | ||
840 | IWL_ERR(drv, "uCode data len %Zd too large to fit in\n", | ||
841 | get_sec_size(&pieces, IWL_UCODE_REGULAR, | ||
842 | IWL_UCODE_SECTION_DATA)); | ||
843 | goto try_again; | ||
844 | } | ||
845 | |||
846 | /* | ||
847 | * In mvm uCode there is no difference between data and instructions | 811 | * In mvm uCode there is no difference between data and instructions |
848 | * sections. | 812 | * sections. |
849 | */ | 813 | */ |