diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-10 04:11:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-07-14 14:52:57 -0400 |
commit | 1411f9b531f0a910cd1c85a337737c1e6ffbae6a (patch) | |
tree | f39bd48a6a3163b913dd165167a8a16dd64b054f /net/mac80211/rx.c | |
parent | 2560b6e2e4b87df211ea39b3b02498959b70b4e8 (diff) |
mac80211: fix RX sequence number check
According to 802.11-2007, we are doing the wrong thing in the
sequence number checks when receiving frames. This fixes it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index ba332c9dc19a..6d9ae67c27ca 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -334,13 +334,18 @@ static void ieee80211_parse_qos(struct ieee80211_rx_data *rx) | |||
334 | else | 334 | else |
335 | rx->flags &= ~IEEE80211_RX_AMSDU; | 335 | rx->flags &= ~IEEE80211_RX_AMSDU; |
336 | } else { | 336 | } else { |
337 | if (unlikely(ieee80211_is_mgmt(hdr->frame_control))) { | 337 | /* |
338 | /* Separate TID for management frames */ | 338 | * IEEE 802.11-2007, 7.1.3.4.1 ("Sequence Number field"): |
339 | tid = NUM_RX_DATA_QUEUES - 1; | 339 | * |
340 | } else { | 340 | * Sequence numbers for management frames, QoS data |
341 | /* no qos control present */ | 341 | * frames with a broadcast/multicast address in the |
342 | tid = 0; /* 802.1d - Best Effort */ | 342 | * Address 1 field, and all non-QoS data frames sent |
343 | } | 343 | * by QoS STAs are assigned using an additional single |
344 | * modulo-4096 counter, [...] | ||
345 | * | ||
346 | * We also use that counter for non-QoS STAs. | ||
347 | */ | ||
348 | tid = NUM_RX_DATA_QUEUES - 1; | ||
344 | } | 349 | } |
345 | 350 | ||
346 | rx->queue = tid; | 351 | rx->queue = tid; |