summaryrefslogtreecommitdiff
path: root/net/mac80211/pm.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-01-20 16:55:18 +0400
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 23:48:24 +0400
commit077f49392819608084c6d8d20e3dcca230afe07d (patch)
tree7b19e4537933e9c7e0524421d16701576c4b74b2 /net/mac80211/pm.c
parentc8987876e9bf9b7b83e75b325586bc77ea8ac825 (diff)
downloadlinux-077f49392819608084c6d8d20e3dcca230afe07d.tar.xz
mac80211: simplify AP_VLAN handling
Setting keys and updating TKIP keys must use the BSS sdata (not AP_VLAN), so we translate. Move the translation into driver-ops wrappers instead of having it inline in the code to simplify the normal code flow. The same can be done for sta_add/remove which already does the translation in the wrapper. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/pm.c')
-rw-r--r--net/mac80211/pm.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 596efaf50e09..c65ff471acce 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -97,15 +97,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
/* tear down aggregation sessions and remove STAs */
mutex_lock(&local->sta_mtx);
list_for_each_entry(sta, &local->sta_list, list) {
- if (sta->uploaded) {
- sdata = sta->sdata;
- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
- sdata = container_of(sdata->bss,
- struct ieee80211_sub_if_data,
- u.ap);
-
- drv_sta_remove(local, sdata, &sta->sta);
- }
+ if (sta->uploaded)
+ drv_sta_remove(local, sta->sdata, &sta->sta);
mesh_plink_quiesce(sta);
}