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

Commit 7d9bb2f0 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: iterate using station list in AP SMPS 



When changing AP SMPS, we need to look up all the stations
for this interface, so there's no reason to iterate over
hash chains rather than doing the simpler iteration over
the station list.

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

net/mac80211/cfg.c

+30 −39
Original line number Original line Diff line number Diff line
@@ -2273,7 +2273,6 @@ int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata, 
{

{

	struct sta_info *sta;

	struct sta_info *sta;

	enum ieee80211_smps_mode old_req;

	enum ieee80211_smps_mode old_req;

	int i;





	if (WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_AP))

	if (WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_AP))

		return -EINVAL;

		return -EINVAL;
@@ -2301,12 +2300,7 @@ int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata, 
	       smps_mode, atomic_read(&sdata->u.ap.num_mcast_sta));

	       smps_mode, atomic_read(&sdata->u.ap.num_mcast_sta));





	mutex_lock(&sdata->local->sta_mtx);

	mutex_lock(&sdata->local->sta_mtx);

	for (i = 0; i < STA_HASH_SIZE; i++) {

	list_for_each_entry(sta, &sdata->local->sta_list, list) {

		for (sta = rcu_dereference_protected(sdata->local->sta_hash[i],

				lockdep_is_held(&sdata->local->sta_mtx));

		     sta;

		     sta = rcu_dereference_protected(sta->hnext,

				lockdep_is_held(&sdata->local->sta_mtx))) {

		/*

		/*

		 * Only stations associated to our AP and

		 * Only stations associated to our AP and

		 * associated VLANs

		 * associated VLANs
@@ -2325,8 +2319,7 @@ int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata, 
		if (test_sta_flag(sta, WLAN_STA_PS_STA) &&

		if (test_sta_flag(sta, WLAN_STA_PS_STA) &&

		    !ieee80211_smps_is_restrictive(sta->known_smps_mode,

		    !ieee80211_smps_is_restrictive(sta->known_smps_mode,

						   smps_mode)) {

						   smps_mode)) {

				ht_dbg(sdata,

			ht_dbg(sdata, "Won't send SMPS to sleeping STA %pM\n",

				       "Won't send SMPS to sleeping STA %pM\n",

			       sta->sta.addr);

			       sta->sta.addr);

			continue;

			continue;

		}

		}
@@ -2339,11 +2332,9 @@ int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata, 
			continue;

			continue;





		ht_dbg(sdata, "Sending SMPS to %pM\n", sta->sta.addr);

		ht_dbg(sdata, "Sending SMPS to %pM\n", sta->sta.addr);

			ieee80211_send_smps_action(sdata, smps_mode,

		ieee80211_send_smps_action(sdata, smps_mode, sta->sta.addr,

						   sta->sta.addr,

					   sdata->vif.bss_conf.bssid);

					   sdata->vif.bss_conf.bssid);

	}

	}

	}

	mutex_unlock(&sdata->local->sta_mtx);

	mutex_unlock(&sdata->local->sta_mtx);





	sdata->smps_mode = smps_mode;

	sdata->smps_mode = smps_mode;