diff options
| author | Javier Cardona <javier@cozybit.com> | 2012-10-25 11:10:18 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-11-16 16:46:56 +0000 |
| commit | 600c1eef55f14967c43819a34108ca2c7dabbbdd (patch) | |
| tree | 2106cc2b0ff4389ef4f72f426e8af8738c96b4db /net | |
| parent | e39761ee8faf2e80dc4ad22bfac43a122d9fd3a8 (diff) | |
mac80211: don't inspect Sequence Control field on control frames
commit f7fbf70ee9db6da6033ae50d100e017ac1f26555 upstream.
Per IEEE Std. 802.11-2012, Sec 8.2.4.4.1, the sequence Control field is
not present in control frames. We noticed this problem when processing
Block Ack Requests.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Javier Lopez <jlopex@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c2172749896..8c6f3378984 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1449,6 +1449,10 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) hdr = (struct ieee80211_hdr *)rx->skb->data; fc = hdr->frame_control; + + if (ieee80211_is_ctl(fc)) + return RX_CONTINUE; + sc = le16_to_cpu(hdr->seq_ctrl); frag = sc & IEEE80211_SCTL_FRAG; |