Эх сурвалжийг харах

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>
Sara Sharon 8 жил өмнө
parent
commit
30d23c3cd0

+ 0 - 8
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;
 		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 */
 	/* Read the NVM only at driver load time, no need to do this twice */
 	if (read_nvm) {
 	if (read_nvm) {
 		/* Read nvm */
 		/* Read nvm */

+ 2 - 1
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)
 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;
 	mvm->ucode_loaded = false;
 	iwl_trans_stop_device(mvm->trans);
 	iwl_trans_stop_device(mvm->trans);
 }
 }