summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2016-02-11 16:25:16 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2016-02-11 16:25:16 +0000
commitc6cfe527534dedca82523f2ce16c537bf9e0507c (patch)
treef7e3e2394266ac7cb09db37cf95bccf6e4e46527
parent3bd4b5178ed6919db31bd4f8fd7e867a17ef7faf (diff)
Don't pass QoS "no data" frames to the A-MPDU reordering logic. Such frames
will cause major confusion since they don't carry a sequence number. ok mpi@ sthen@
-rw-r--r--sys/net80211/ieee80211_input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 5dc48198686..2e3f8a31546 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.162 2016/02/09 13:48:31 stsp Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.163 2016/02/11 16:25:15 stsp Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -275,6 +275,7 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni,
}
if (type == IEEE80211_FC0_TYPE_DATA && hasqos &&
+ (subtype & IEEE80211_FC0_SUBTYPE_NODATA) == 0 &&
!(rxi->rxi_flags & IEEE80211_RXI_AMPDU_DONE)) {
int ba_state = ni->ni_rx_ba[tid].ba_state;