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

Commit 6ea29ce5 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: set AID to firmware only for associated stations 



The firmware will soon actually look at the AID field, and
when it does that it'll try to ensure that the AID is never
changing. Due to the way the station is added, it may start
with an invalid AID before it's associated, so to ensure a
constant AID (once it becomes non-zero), track the station
state and set the AID only when the station is associated
and when it disassociates.

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

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

+4 −2
Original line number Diff line number Diff line
@@ -2552,6 +2552,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	int ret;



	IWL_DEBUG_MAC80211(mvm, "station %pM state change %d->%d\n",
@@ -2580,8 +2581,6 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
	if (old_state == IEEE80211_STA_NONE &&

	    new_state == IEEE80211_STA_NOTEXIST &&

	    iwl_mvm_is_dqa_supported(mvm)) {

		struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);



		iwl_mvm_purge_deferred_tx_frames(mvm, mvm_sta);

		flush_work(&mvm->add_stream_wk);
@@ -2592,6 +2591,9 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
	}



	mutex_lock(&mvm->mutex);

	/* track whether or not the station is associated */

	mvm_sta->associated = new_state >= IEEE80211_STA_ASSOC;



	if (old_state == IEEE80211_STA_NOTEXIST &&

	    new_state == IEEE80211_STA_NONE) {

		/*

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

+2 −1
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
		cpu_to_le32(agg_size << STA_FLG_MAX_AGG_SIZE_SHIFT);

	add_sta_cmd.station_flags |=

		cpu_to_le32(mpdu_dens << STA_FLG_AGG_MPDU_DENS_SHIFT);

	if (mvm_sta->associated)

		add_sta_cmd.assoc_id = cpu_to_le16(sta->aid);



	if (sta->wme) {

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

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ struct iwl_mvm_sta { 
	bool disable_tx;

	bool tlc_amsdu;

	bool sleeping;

	bool associated;

	u8 agg_tids;

	u8 sleep_tx_count;

	u8 avg_energy;