diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-02-07 12:56:26 +0200 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-17 10:58:19 -0800 |
| commit | dae66d0d2ee1a188fcfd437c4e6b2bf32dc7a1b2 (patch) | |
| tree | 5ed45fda6f17832087660bc76120893aef5f65b4 /drivers/net/wireless/iwlwifi/iwl-ucode.c | |
| parent | 4a986777a53d5fe8fd92ef30e0e8eedd0ff800b1 (diff) | |
| download | op-kernel-dev-dae66d0d2ee1a188fcfd437c4e6b2bf32dc7a1b2.zip op-kernel-dev-dae66d0d2ee1a188fcfd437c4e6b2bf32dc7a1b2.tar.gz | |
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-ucode.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-ucode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c index 9e21fc1..61c6c05 100644 --- a/drivers/net/wireless/iwlwifi/iwl-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c @@ -1135,25 +1135,25 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) pieces.init_data_size); /* Verify that uCode images will fit in card's SRAM */ - if (pieces.inst_size > hw_params(nic).max_inst_size) { + if (pieces.inst_size > cfg->max_inst_size) { IWL_ERR(nic, "uCode instr len %Zd too large to fit in\n", pieces.inst_size); goto try_again; } - if (pieces.data_size > hw_params(nic).max_data_size) { + if (pieces.data_size > cfg->max_data_size) { IWL_ERR(nic, "uCode data len %Zd too large to fit in\n", pieces.data_size); goto try_again; } - if (pieces.init_size > hw_params(nic).max_inst_size) { + if (pieces.init_size > cfg->max_inst_size) { IWL_ERR(nic, "uCode init instr len %Zd too large to fit in\n", pieces.init_size); goto try_again; } - if (pieces.init_data_size > hw_params(nic).max_data_size) { + if (pieces.init_data_size > cfg->max_data_size) { IWL_ERR(nic, "uCode init data len %Zd too large to fit in\n", pieces.init_data_size); goto try_again; |
