1 From: Sven Eckelmann <sven@narfation.org>
2 Date: Wed, 24 Feb 2016 16:25:49 +0100
3 Subject: [PATCH] mac80211: fix parsing of 40Mhz in injected radiotap
6 The MCS bandwidth part of the radiotap header is 2 bits wide. The full 2
7 bit have to compared against IEEE80211_RADIOTAP_MCS_BW_40 and not only if
8 the first bit is set. Otherwise IEEE80211_RADIOTAP_MCS_BW_40 can be
9 confused with IEEE80211_RADIOTAP_MCS_BW_20U.
11 Fixes: 5ec3aed9ba4c ("mac80211: Parse legacy and HT rate in injected frames")
12 Signed-off-by: Sven Eckelmann <sven@narfation.org>
15 --- a/net/mac80211/tx.c
16 +++ b/net/mac80211/tx.c
17 @@ -1689,7 +1689,7 @@ static bool ieee80211_parse_tx_radiotap(
18 bool rate_found = false;
21 - u8 mcs_known, mcs_flags;
22 + u8 mcs_known, mcs_flags, mcs_bw;
25 info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
26 @@ -1765,8 +1765,9 @@ static bool ieee80211_parse_tx_radiotap(
27 mcs_flags & IEEE80211_RADIOTAP_MCS_SGI)
28 rate_flags |= IEEE80211_TX_RC_SHORT_GI;
30 + mcs_bw = mcs_flags & IEEE80211_RADIOTAP_MCS_BW_MASK;
31 if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW &&
32 - mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40)
33 + mcs_bw == IEEE80211_RADIOTAP_MCS_BW_40)
34 rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;