aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-23 09:09:49 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-28 14:43:52 -0500
commitbc192f8918ab8e41ba53b9ef881bc425ae92ed1b (patch)
treea7a0e2e7eefda7fefdd1942821b9d71ab7610a5c /net/mac80211/sta_info.c
parent5ccc32ff46065f031075cdbbdfe21b9e3b05aaad (diff)
mac80211: do not pass AP VLAN vif pointers to drivers
This fixes frequent WARN_ONs when using AP VLAN + aggregation, as these vifs are virtual and not registered with drivers. Use sta_info_get_bss instead of sta_info_get in aggregation callbacks, so that these callbacks can find the station entry when called with the AP vif. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 8eaa746ec7a2..f98235262006 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -351,10 +351,6 @@ static int sta_info_finish_insert(struct sta_info *sta,
351 351
352 if (!sta->dummy || dummy_reinsert) { 352 if (!sta->dummy || dummy_reinsert) {
353 /* notify driver */ 353 /* notify driver */
354 if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
355 sdata = container_of(sdata->bss,
356 struct ieee80211_sub_if_data,
357 u.ap);
358 err = drv_sta_add(local, sdata, &sta->sta); 354 err = drv_sta_add(local, sdata, &sta->sta);
359 if (err) { 355 if (err) {
360 if (!async) 356 if (!async)