iwlwifi: SRAM size moves from hw_params to cfg

This will allow to set the hw_params after we fetch the uCode.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 458e6778c72f..1527dec7a267 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -170,8 +170,6 @@ static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
                         iwlagn_mod_params.num_of_queues;
 
         hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;
-        hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;
-        hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;
 
         hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
                                         BIT(IEEE80211_BAND_5GHZ);
@@ -195,8 +193,6 @@ static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)
                         iwlagn_mod_params.num_of_queues;
 
         hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;
-        hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;
-        hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;
 
         hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
                                         BIT(IEEE80211_BAND_5GHZ);
@@ -352,6 +348,8 @@ static struct iwl_ht_params iwl5000_ht_params = {
         .fw_name_pre = IWL5000_FW_PRE,                          \
         .ucode_api_max = IWL5000_UCODE_API_MAX,                 \
         .ucode_api_min = IWL5000_UCODE_API_MIN,                 \
+        .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
+        .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,       \
         .lib = &iwl5000_lib,                                    \
@@ -395,6 +393,8 @@ struct iwl_cfg iwl5350_agn_cfg = {
         .fw_name_pre = IWL5000_FW_PRE,
         .ucode_api_max = IWL5000_UCODE_API_MAX,
         .ucode_api_min = IWL5000_UCODE_API_MIN,
+        .max_inst_size = IWLAGN_RTC_INST_SIZE,
+        .max_data_size = IWLAGN_RTC_DATA_SIZE,
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
         .lib = &iwl5000_lib,
@@ -408,6 +408,8 @@ struct iwl_cfg iwl5350_agn_cfg = {
         .fw_name_pre = IWL5150_FW_PRE,                          \
         .ucode_api_max = IWL5150_UCODE_API_MAX,                 \
         .ucode_api_min = IWL5150_UCODE_API_MIN,                 \
+        .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
+        .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,       \
         .lib = &iwl5150_lib,                                    \