dasharo/linux
0
0
Fork 0
mirror of https://github.com/Dasharo/linux.git synced 2026-03-06 15:25:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: simplify AP_VLAN handling

Browse Source 
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>
This commit is contained in:
Johannes Berg
2012-01-20 13:55:18 +01:00
committed by John W. Linville
parent c8987876e9
commit 077f493928
5 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/mac80211/util.c
+2 -9
View File
@@ -1184,15 +1184,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
/* add STAs back */
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);
WARN_ON(drv_sta_add(local, sdata, &sta->sta));
}
if (sta->uploaded)
WARN_ON(drv_sta_add(local, sta->sdata, &sta->sta));
}
mutex_unlock(&local->sta_mtx);