iwlwifi: mvm: remove call for paging in new init flow

Now that transport inits the paging in the context info -
remove the call in mvm.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 286f186097295667136da9a1ac7906615c154fee..e481bb050c6e7357a59fa4a49d2bad62bdd977e3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -850,14 +850,6 @@ int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
                goto error;
        }
 
-       /* TODO: remove when integrating context info */
-       ret = iwl_mvm_init_paging(mvm);
-       if (ret) {
-               IWL_ERR(mvm, "Failed to init paging: %d\n",
-                       ret);
-               goto error;
-       }
-
        /* Read the NVM only at driver load time, no need to do this twice */
        if (read_nvm) {
                /* Read nvm */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index b3f67fe982032845ee0ee08ff4287796250b1721..91bd5ebd5b65373fabe91b64ac9e568479421710 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1709,7 +1709,8 @@ void iwl_mvm_enable_ac_txq(struct iwl_mvm *mvm, int queue, int mac80211_queue,
 
 static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)
 {
-       iwl_free_fw_paging(mvm);
+       if (!iwl_mvm_has_new_tx_api(mvm))
+               iwl_free_fw_paging(mvm);
        mvm->ucode_loaded = false;
        iwl_trans_stop_device(mvm->trans);
 }