iwlwifi: track current firmware image in common code

Track the current firmware image in the common code instead
of in the opmode so that later patches can access it there
in a common way.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index fc5a490880d0..4e80c8fa4741 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -464,8 +464,8 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
                 IWL_ERR(mvm,
                         "Not valid error log pointer 0x%08X for %s uCode\n",
                         base,
-                        (mvm->cur_ucode == IWL_UCODE_INIT)
-                                        ? "Init" : "RT");
+                        (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT)
+                        ? "Init" : "RT");
                 return;
         }
 
@@ -500,7 +500,7 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u32 base)
         struct iwl_error_event_table table;
         u32 val;
 
-        if (mvm->cur_ucode == IWL_UCODE_INIT) {
+        if (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT) {
                 if (!base)
                         base = mvm->fw->init_errlog_ptr;
         } else {
@@ -512,8 +512,8 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u32 base)
                 IWL_ERR(mvm,
                         "Not valid error log pointer 0x%08X for %s uCode\n",
                         base,
-                        (mvm->cur_ucode == IWL_UCODE_INIT)
-                                        ? "Init" : "RT");
+                        (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT)
+                        ? "Init" : "RT");
                 return;
         }