summaryrefslogtreecommitdiff
path: root/net/mac80211/agg-rx.c
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2011-06-23 01:15:27 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-06-27 15:09:40 -0400
commit15b4d843ab66bc0ac2cd46baa20a3ce9638604e6 (patch)
treedb7cf59ddae2635a3b5746e8aeb274f2f2adbd35 /net/mac80211/agg-rx.c
parentdaf4ce85cd5221a3609e68419d01730170975e94 (diff)
downloadlinux-3.10-15b4d843ab66bc0ac2cd46baa20a3ce9638604e6.tar.gz
linux-3.10-15b4d843ab66bc0ac2cd46baa20a3ce9638604e6.tar.bz2
linux-3.10-15b4d843ab66bc0ac2cd46baa20a3ce9638604e6.zip
mac80211: reestablish mis-configured existing Rx BA sessions
When forming a Rx BA session, sometimes the ADDBA response gets lost. This leads to a situation where the session is configured locally, but doesn't exist on the remote side. Subsequent ADDBA requests are declined by mac80211. Fix this by assuming the session state of the initiator is the correct one. When receiving an unexpected ADDBA request on a TID with an active Rx BA session, delete the existing one and establish a new session. Signed-off-by: Arik Nemtsov <arik@wizery.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/agg-rx.c')
-rw-r--r--net/mac80211/agg-rx.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 89b0b2ca6db..ebadb9ac9a7 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -262,7 +262,11 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
"%pM on tid %u\n",
mgmt->sa, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */
- goto end;
+
+ /* delete existing Rx BA session on the same tid */
+ ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
+ WLAN_STATUS_UNSPECIFIED_QOS,
+ false);
}
/* prepare A-MPDU MLME for Rx aggregation */