summaryrefslogtreecommitdiffstats
path: root/net/mac80211/agg-rx.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-23 15:09:49 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-28 20:43:52 +0100
commitbc192f8918ab8e41ba53b9ef881bc425ae92ed1b (patch)
treea7a0e2e7eefda7fefdd1942821b9d71ab7610a5c /net/mac80211/agg-rx.c
parentmac80211: log reason and initiator when rx agg is stopped (diff)
downloadlinux-bc192f8918ab8e41ba53b9ef881bc425ae92ed1b.tar.xz
linux-bc192f8918ab8e41ba53b9ef881bc425ae92ed1b.zip
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/agg-rx.c')
-rw-r--r--net/mac80211/agg-rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 98208b6d9d7a..e844e5a38408 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -112,7 +112,7 @@ void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap,
int i;
rcu_read_lock();
- sta = sta_info_get(sdata, addr);
+ sta = sta_info_get_bss(sdata, addr);
if (!sta) {
rcu_read_unlock();
return;