diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-10 10:11:02 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-14 20:52:57 +0200 |
| commit | 1411f9b531f0a910cd1c85a337737c1e6ffbae6a (patch) | |
| tree | f39bd48a6a3163b913dd165167a8a16dd64b054f /net/mac80211/rx.c | |
| parent | mac80211: Fix ieee80211_rx_reorder_ampdu: ignore QoS null packets (diff) | |
| download | linux-1411f9b531f0a910cd1c85a337737c1e6ffbae6a.tar.xz linux-1411f9b531f0a910cd1c85a337737c1e6ffbae6a.zip | |
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) 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; |