UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-02-13 21:31:07 +01:00
parent 9d6b106b54
commit 7d9bb2f065
1 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
net/mac80211/cfg.c
View File

@ -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,48 +2300,40 @@ 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)); * Only stations associated to our AP and
sta; * associated VLANs
sta = rcu_dereference_protected(sta->hnext, */
lockdep_is_held(&sdata->local->sta_mtx))) { if (sta->sdata->bss != &sdata->u.ap)
/* continue;
* Only stations associated to our AP and
* associated VLANs
*/
if (sta->sdata->bss != &sdata->u.ap)
continue;
/* This station doesn't support MIMO - skip it */ /* This station doesn't support MIMO - skip it */
if (sta_info_tx_streams(sta) == 1) if (sta_info_tx_streams(sta) == 1)
continue; continue;
/* /*
* Don't wake up a STA just to send the action frame * Don't wake up a STA just to send the action frame
* unless we are getting more restrictive. * unless we are getting more restrictive.
*/ */
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;
}
/*
* If the STA is not authorized, wait until it gets
* authorized and the action frame will be sent then.
*/
if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED))
continue;
ht_dbg(sdata, "Sending SMPS to %pM\n", sta->sta.addr);
ieee80211_send_smps_action(sdata, smps_mode,
sta->sta.addr,
sdata->vif.bss_conf.bssid);
} }
/*
* If the STA is not authorized, wait until it gets
* authorized and the action frame will be sent then.
*/
if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED))
continue;
ht_dbg(sdata, "Sending SMPS to %pM\n", sta->sta.addr);
ieee80211_send_smps_action(sdata, smps_mode, sta->sta.addr,
sdata->vif.bss_conf.bssid);
} }
mutex_unlock(&sdata->local->sta_mtx); mutex_unlock(&sdata->local->sta_mtx);