iwlwifi: mvm: Change NVM default section read size

Signed-off-by: Dor Shaish <dor.shaish@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/iwlwifi/mvm/nvm.c
index 555095cf4afc25356d63b5a39d3160347ade074b..93e3d0f174ccfc29e9324510707ca421a91ff01d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/iwlwifi/mvm/nvm.c
@@ -74,6 +74,9 @@ static const int nvm_to_read[] = {
        NVM_SECTION_TYPE_PRODUCTION,
 };
 
+/* Default NVM size to read */
+#define IWL_NVM_DEFAULT_CHUNK_SIZE (2*1024);
+
 /* used to simplify the shared operations on NCM_ACCESS_CMD versions */
 union iwl_nvm_access_cmd {
        struct iwl_nvm_access_cmd_ver1 ver1;
@@ -193,9 +196,9 @@ static int iwl_nvm_read_section(struct iwl_mvm *mvm, u16 section,
        int ret;
        bool old_eeprom = mvm->cfg->device_family != IWL_DEVICE_FAMILY_7000;
 
-       length = (iwlwifi_mod_params.amsdu_size_8K ? (8 * 1024) : (4 * 1024))
-               - sizeof(union iwl_nvm_access_cmd)
-               - sizeof(struct iwl_rx_packet);
+       /* Set nvm section read length */
+       length = IWL_NVM_DEFAULT_CHUNK_SIZE;
+
        /*
         * if length is greater than EEPROM size, truncate it because uCode
         * doesn't check it by itself, and exit the loop when reached.