From 0ab65af8e1594a39ef35c3195607a694bdede213 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 10 Jul 2008 10:11:02 +0200
Subject: [PATCH] --- yaml --- r: 103425 b: refs/heads/master c:
 1411f9b531f0a910cd1c85a337737c1e6ffbae6a h: refs/heads/master i:   103423:
 088dc7586fbfbea8d144e0fec084998e251b670f v: v3

---
 [refs]                  |  2 +-
 trunk/net/mac80211/rx.c | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 23814044451c..12fc57ffec47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2560b6e2e4b87df211ea39b3b02498959b70b4e8
+refs/heads/master: 1411f9b531f0a910cd1c85a337737c1e6ffbae6a
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index ba332c9dc19a..6d9ae67c27ca 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -334,13 +334,18 @@ static void ieee80211_parse_qos(struct ieee80211_rx_data *rx)
 		else
 			rx->flags &= ~IEEE80211_RX_AMSDU;
 	} else {
-		if (unlikely(ieee80211_is_mgmt(hdr->frame_control))) {
-			/* Separate TID for management frames */
-			tid = NUM_RX_DATA_QUEUES - 1;
-		} else {
-			/* no qos control present */
-			tid = 0; /* 802.1d - Best Effort */
-		}
+		/*
+		 * IEEE 802.11-2007, 7.1.3.4.1 ("Sequence Number field"):
+		 *
+		 *	Sequence numbers for management frames, QoS data
+		 *	frames with a broadcast/multicast address in the
+		 *	Address 1 field, and all non-QoS data frames sent
+		 *	by QoS STAs are assigned using an additional single
+		 *	modulo-4096 counter, [...]
+		 *
+		 * We also use that counter for non-QoS STAs.
+		 */
+		tid = NUM_RX_DATA_QUEUES - 1;
 	}
 
 	rx->queue = tid;