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

Commit 0ce04ce7 authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: set the TX disable bit when doing a chanctx switch 



During a channel switch we should tell the firmware to disable TX
temporarily and re-enable it after the switch is done.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 8b4139dc

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

+20 −0
Original line number Diff line number Diff line
@@ -2748,6 +2748,19 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm, 
		iwl_mvm_mac_ctxt_changed(mvm, vif, false);

	}



	if (vif->csa_active && vif->type == NL80211_IFTYPE_STATION) {

		struct iwl_mvm_sta *mvmsta;



		mvmsta = iwl_mvm_sta_from_staid_protected(mvm,

							  mvmvif->ap_sta_id);



		if (WARN_ON(!mvmsta))

			goto out;



		/* TODO: only re-enable after the first beacon */

		iwl_mvm_sta_modify_disable_tx(mvm, mvmsta, false);

	}



	goto out;



out_remove_binding:
@@ -2779,6 +2792,7 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm, 
{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct ieee80211_vif *disabled_vif = NULL;

	struct iwl_mvm_sta *mvmsta;



	lockdep_assert_held(&mvm->mutex);
@@ -2810,6 +2824,12 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm, 


		disabled_vif = vif;



		mvmsta = iwl_mvm_sta_from_staid_protected(mvm,

							  mvmvif->ap_sta_id);



		if (!WARN_ON(!mvmsta))

			iwl_mvm_sta_modify_disable_tx(mvm, mvmsta, true);



		iwl_mvm_mac_ctxt_changed(mvm, vif, true);

		break;

	default: