diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-01-20 13:55:18 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:48:24 -0500 |
| commit | 077f49392819608084c6d8d20e3dcca230afe07d (patch) | |
| tree | 7b19e4537933e9c7e0524421d16701576c4b74b2 /net/mac80211/sta_info.c | |
| parent | c8987876e9bf9b7b83e75b325586bc77ea8ac825 (diff) | |
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/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index fa0823892b2..8e1e361c223 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -764,14 +764,8 @@ int __must_check __sta_info_destroy(struct sta_info *sta) } } - if (sta->uploaded) { - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) - sdata = container_of(sdata->bss, - struct ieee80211_sub_if_data, - u.ap); + if (sta->uploaded) drv_sta_remove(local, sdata, &sta->sta); - sdata = sta->sdata; - } /* * At this point, after we wait for an RCU grace period, |