Commit f82c8339 authored by Ilan Peer's avatar Ilan Peer Committed by Luca Coelho
Browse files

iwlwifi: mvm: Correctly update MAC context on add/del station 



Commit "iwlwifi: mvm: don't ask beacons when AP vif and no
assoc sta" directly called iwl_mvm_mac_ctxt_cmd_ap() to update the
MAC context when adding/removing a station. However, this ignores
the case that the vif is actually a P2P GO.

Fix this by calling iwl_mvm_mac_ctxt_changed() that handles P2P GO
case as well.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 69191afe

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1126,7 +1126,7 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm, 
	ctxt_ap->beacon_template = cpu_to_le32(mvmvif->id);

	ctxt_ap->beacon_template = cpu_to_le32(mvmvif->id);

}

}





int iwl_mvm_mac_ctxt_cmd_ap(struct iwl_mvm *mvm,

static int iwl_mvm_mac_ctxt_cmd_ap(struct iwl_mvm *mvm,

				   struct ieee80211_vif *vif,

				   struct ieee80211_vif *vif,

				   u32 action)

				   u32 action)

{

{

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2616,7 +2616,7 @@ static void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw, 




	if (mvm_sta->vif->type == NL80211_IFTYPE_AP) {

	if (mvm_sta->vif->type == NL80211_IFTYPE_AP) {

		mvmvif->ap_assoc_sta_count--;

		mvmvif->ap_assoc_sta_count--;

		iwl_mvm_mac_ctxt_cmd_ap(mvm, vif, FW_CTXT_ACTION_MODIFY);

		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

	}

	}





	mutex_unlock(&mvm->mutex);

	mutex_unlock(&mvm->mutex);

drivers/net/wireless/iwlwifi/mvm/mvm.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -1129,10 +1129,6 @@ void iwl_mvm_mac_ctxt_recalc_tsf_id(struct iwl_mvm *mvm, 
				    struct ieee80211_vif *vif);

				    struct ieee80211_vif *vif);

unsigned long iwl_mvm_get_used_hw_queues(struct iwl_mvm *mvm,

unsigned long iwl_mvm_get_used_hw_queues(struct iwl_mvm *mvm,

					 struct ieee80211_vif *exclude_vif);

					 struct ieee80211_vif *exclude_vif);

int iwl_mvm_mac_ctxt_cmd_ap(struct iwl_mvm *mvm,

			    struct ieee80211_vif *vif,

			    u32 action);



/* Bindings */

/* Bindings */

int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -277,7 +277,7 @@ int iwl_mvm_add_sta(struct iwl_mvm *mvm, 




	if (vif->type == NL80211_IFTYPE_AP) {

	if (vif->type == NL80211_IFTYPE_AP) {

		mvmvif->ap_assoc_sta_count++;

		mvmvif->ap_assoc_sta_count++;

		iwl_mvm_mac_ctxt_cmd_ap(mvm, vif, FW_CTXT_ACTION_MODIFY);

		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

	}

	}





	spin_lock_init(&mvm_sta->lock);

	spin_lock_init(&mvm_sta->lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE