Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9834781c authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: remove superfluous flush_work() 



Since iwl_mvm_start_p2p_roc() is only called from iwl_mvm_roc(),
which already flushes the same work item, doing it again in it
is superfluous. Remove it and move the comment to the first one.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 5cd2d8fc

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+4 −0
Original line number Diff line number Diff line
@@ -3192,6 +3192,10 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw, 
	IWL_DEBUG_MAC80211(mvm, "enter (%d, %d, %d)\n", channel->hw_value,

			   duration, type);



	/*

	 * Flush the done work, just in case it's still pending, so that

	 * the work it does can complete and we can accept new frames.

	 */

	flush_work(&mvm->roc_done_wk);



	mutex_lock(&mvm->mutex);

drivers/net/wireless/intel/iwlwifi/mvm/time-event.c

+0 −6
Original line number Diff line number Diff line
@@ -759,12 +759,6 @@ int iwl_mvm_start_p2p_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
		return -EBUSY;

	}



	/*

	 * Flush the done work, just in case it's still pending, so that

	 * the work it does can complete and we can accept new frames.

	 */

	flush_work(&mvm->roc_done_wk);



	time_cmd.action = cpu_to_le32(FW_CTXT_ACTION_ADD);

	time_cmd.id_and_color =

		cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id, mvmvif->color));