| Message ID | 1354746579-20734-1-git-send-email-herton.krzesinski@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 33c49d5..4e4fc93 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1465,6 +1465,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;
This is a note to let you know that I have just added a patch titled mac80211: don't inspect Sequence Control field on control to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ From d4e316f99b944a1d5a6b0cf9a786160a764e452e Mon Sep 17 00:00:00 2001 From: Javier Cardona <javier@cozybit.com> Date: Thu, 25 Oct 2012 11:10:18 -0700 Subject: [PATCH] mac80211: don't inspect Sequence Control field on control frames X-Extended-Stable: 3.5 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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> --- net/mac80211/rx.c | 4 ++++ 1 file changed, 4 insertions(+) -- 1.7.9.5