diff options
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/fw.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 0296df625cd5..c0de7bb86cf7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c | |||
@@ -196,8 +196,6 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait, | |||
196 | mvm->error_event_table[1] = | 196 | mvm->error_event_table[1] = |
197 | le32_to_cpu(lmac2->error_event_table_ptr); | 197 | le32_to_cpu(lmac2->error_event_table_ptr); |
198 | mvm->log_event_table = le32_to_cpu(lmac1->log_event_table_ptr); | 198 | mvm->log_event_table = le32_to_cpu(lmac1->log_event_table_ptr); |
199 | mvm->sf_space.addr = le32_to_cpu(lmac1->st_fwrd_addr); | ||
200 | mvm->sf_space.size = le32_to_cpu(lmac1->st_fwrd_size); | ||
201 | 199 | ||
202 | umac_error_event_table = le32_to_cpu(umac->error_info_addr); | 200 | umac_error_event_table = le32_to_cpu(umac->error_info_addr); |
203 | 201 | ||
@@ -266,7 +264,6 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, | |||
266 | int ret, i; | 264 | int ret, i; |
267 | enum iwl_ucode_type old_type = mvm->fwrt.cur_fw_img; | 265 | enum iwl_ucode_type old_type = mvm->fwrt.cur_fw_img; |
268 | static const u16 alive_cmd[] = { MVM_ALIVE }; | 266 | static const u16 alive_cmd[] = { MVM_ALIVE }; |
269 | struct iwl_sf_region st_fwrd_space; | ||
270 | 267 | ||
271 | if (ucode_type == IWL_UCODE_REGULAR && | 268 | if (ucode_type == IWL_UCODE_REGULAR && |
272 | iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_START_FROM_ALIVE) && | 269 | iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_START_FROM_ALIVE) && |
@@ -320,18 +317,6 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, | |||
320 | return -EIO; | 317 | return -EIO; |
321 | } | 318 | } |
322 | 319 | ||
323 | /* | ||
324 | * update the sdio allocation according to the pointer we get in the | ||
325 | * alive notification. | ||
326 | */ | ||
327 | st_fwrd_space.addr = mvm->sf_space.addr; | ||
328 | st_fwrd_space.size = mvm->sf_space.size; | ||
329 | ret = iwl_trans_update_sf(mvm->trans, &st_fwrd_space); | ||
330 | if (ret) { | ||
331 | IWL_ERR(mvm, "Failed to update SF size. ret %d\n", ret); | ||
332 | return ret; | ||
333 | } | ||
334 | |||
335 | iwl_trans_fw_alive(mvm->trans, alive_data.scd_base_addr); | 320 | iwl_trans_fw_alive(mvm->trans, alive_data.scd_base_addr); |
336 | 321 | ||
337 | /* | 322 | /* |