diff options
| author | Johannes Berg | 2013-12-04 23:18:37 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-12-16 11:29:47 +0100 |
| commit | e716251d776ce92eb5169522f565ada3deed2a2a (patch) | |
| tree | 70615090a03c61e6f0d3f29b8b93e54cd8622f90 /net/mac80211/sta_info.c | |
| parent | mac80211: optimise synchronize_net() for sta_info_flush (diff) | |
| download | kernel-qcow2-linux-e716251d776ce92eb5169522f565ada3deed2a2a.tar.gz kernel-qcow2-linux-e716251d776ce92eb5169522f565ada3deed2a2a.tar.xz kernel-qcow2-linux-e716251d776ce92eb5169522f565ada3deed2a2a.zip | |
mac80211: optimise mixed AP/VLAN station removal
Teach sta_info_flush() to optionally also remove stations
from all VLANs associated with an AP interface to optimise
the station removal (in particular, synchronize_net().)
To not have to add the vlans argument throughout, do some
refactoring.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 89d449d0de6d..4576ba0ff221 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -960,7 +960,7 @@ void sta_info_stop(struct ieee80211_local *local) } -int sta_info_flush(struct ieee80211_sub_if_data *sdata) +int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans) { struct ieee80211_local *local = sdata->local; struct sta_info *sta, *tmp; @@ -969,9 +969,13 @@ int sta_info_flush(struct ieee80211_sub_if_data *sdata) might_sleep(); + WARN_ON(vlans && sdata->vif.type != NL80211_IFTYPE_AP); + WARN_ON(vlans && !sdata->bss); + mutex_lock(&local->sta_mtx); list_for_each_entry_safe(sta, tmp, &local->sta_list, list) { - if (sdata == sta->sdata) { + if (sdata == sta->sdata || + (vlans && sdata->bss == sta->sdata->bss)) { if (!WARN_ON(__sta_info_destroy_part1(sta))) list_add(&sta->free_list, &free_list); ret++; |