Commit a7201a6c authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

mac80211: Recalc min chandef when station is associated 



The minimum chandef bandwidth calculation was done only in case
a new station was inserted (or when an existing station was removed).
However, it is possible that stations are inserted before they are
associated, e.g., when FULL_AP_CLIENT_STATE is supported and user
space adds stations unassociated.

Fix this by calling ieee80211_recalc_min_chandef() whenever
a station transitions in/out the associated state, and only
consider station marked as associated.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 17883048

net/mac80211/chan.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ ieee80211_get_max_required_bw(struct ieee80211_sub_if_data *sdata) 
		    !(sta->sdata->bss && sta->sdata->bss == sdata->bss))

			continue;



		if (!sta->uploaded)

		if (!sta->uploaded || !test_sta_flag(sta, WLAN_STA_ASSOC))

			continue;



		max_bw = max(max_bw, ieee80211_get_sta_bw(&sta->sta));

net/mac80211/sta_info.c

+5 −4
Original line number Diff line number Diff line
@@ -530,7 +530,6 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) 
	/* accept BA sessions now */

	clear_sta_flag(sta, WLAN_STA_BLOCK_BA);



	ieee80211_recalc_min_chandef(sdata);

	ieee80211_sta_debugfs_add(sta);

	rate_control_add_sta_debugfs(sta);
@@ -941,7 +940,6 @@ static void __sta_info_destroy_part2(struct sta_info *sta) 


	rate_control_remove_sta_debugfs(sta);

	ieee80211_sta_debugfs_remove(sta);

	ieee80211_recalc_min_chandef(sdata);



	cleanup_single_sta(sta);

}
@@ -1808,14 +1806,17 @@ int sta_info_move_state(struct sta_info *sta, 
			clear_bit(WLAN_STA_AUTH, &sta->_flags);

		break;

	case IEEE80211_STA_AUTH:

		if (sta->sta_state == IEEE80211_STA_NONE)

		if (sta->sta_state == IEEE80211_STA_NONE) {

			set_bit(WLAN_STA_AUTH, &sta->_flags);

		else if (sta->sta_state == IEEE80211_STA_ASSOC)

		} else if (sta->sta_state == IEEE80211_STA_ASSOC) {

			clear_bit(WLAN_STA_ASSOC, &sta->_flags);

			ieee80211_recalc_min_chandef(sta->sdata);

		}

		break;

	case IEEE80211_STA_ASSOC:

		if (sta->sta_state == IEEE80211_STA_AUTH) {

			set_bit(WLAN_STA_ASSOC, &sta->_flags);

			ieee80211_recalc_min_chandef(sta->sdata);

		} else if (sta->sta_state == IEEE80211_STA_AUTHORIZED) {

			if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||

			    (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE