iwlwifi: mvm: change the name of init_ucode_run flag

In RF KILL the init ucode is running, but don't complete
all its tasks, so we need to run the init ucode again.
Change the flag name to init_ucode_complete, to be more appropriate.

Signed-off-by: Eytan Lifshitz <eytan.lifshitz@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/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index c76299a3a1e0821708a91885ffab780b624fdbc1..f96186f2803580bea1959f7a2bd10dc8d630bd62 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -243,7 +243,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
 
        lockdep_assert_held(&mvm->mutex);
 
-       if (mvm->init_ucode_run)
+       if (mvm->init_ucode_complete)
                return 0;
 
        iwl_init_notification_wait(&mvm->notif_wait,
@@ -310,7 +310,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
        ret = iwl_wait_notification(&mvm->notif_wait, &calib_wait,
                        MVM_UCODE_CALIB_TIMEOUT);
        if (!ret)
-               mvm->init_ucode_run = true;
+               mvm->init_ucode_complete = true;
        goto out;
 
 error:
@@ -353,8 +353,12 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
        if (ret)
                return ret;
 
-       /* If we were in RFKILL during module loading, load init ucode now */
-       if (!mvm->init_ucode_run) {
+       /*
+        * If we haven't completed the run of the init ucode during
+        * module loading, load init ucode now
+        * (for example, if we were in RFKILL)
+        */
+       if (!mvm->init_ucode_complete) {
                ret = iwl_run_init_mvm_ucode(mvm, false);
                if (ret && !iwlmvm_mod_params.init_dbg) {
                        IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", ret);

diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 33dbc7cefeba638cf08d31c41559cb3fbb7917d1..18c0ae9656581773da1162e73880e641d6b5bc49 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -441,7 +441,7 @@ struct iwl_mvm {
 
        enum iwl_ucode_type cur_ucode;
        bool ucode_loaded;
-       bool init_ucode_run;
+       bool init_ucode_complete;
        u32 error_event_table;
        u32 log_event_table;