Commit 4dde3c36 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Johannes Berg
Browse files

mac80211: update channel context before station state 



Currently channel context is updated only after station got an update about
new assoc state, this results in station using the old channel context.

Fix this by moving the update channel context before updating station,
enabling the driver to immediately use the updated channel context in
the new assoc state.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211129152938.1c80c17ffd8a.I94ae31378b363c1182cfdca46c4b7e7165cff984@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f22d9813

net/mac80211/sta_info.c

+9 −6
Original line number Diff line number Diff line
@@ -667,6 +667,15 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) 


	list_add_tail_rcu(&sta->list, &local->sta_list);



	/* update channel context before notifying the driver about state

	 * change, this enables driver using the updated channel context right away.

	 */

	if (sta->sta_state >= IEEE80211_STA_ASSOC) {

		ieee80211_recalc_min_chandef(sta->sdata);

		if (!sta->sta.support_p2p_ps)

			ieee80211_recalc_p2p_go_ps_allowed(sta->sdata);

	}



	/* notify driver */

	err = sta_info_insert_drv_state(local, sdata, sta);

	if (err)
@@ -674,12 +683,6 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) 


	set_sta_flag(sta, WLAN_STA_INSERTED);



	if (sta->sta_state >= IEEE80211_STA_ASSOC) {

		ieee80211_recalc_min_chandef(sta->sdata);

		if (!sta->sta.support_p2p_ps)

			ieee80211_recalc_p2p_go_ps_allowed(sta->sdata);

	}



	/* accept BA sessions now */

	clear_sta_flag(sta, WLAN_STA_BLOCK_BA);