diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-05-14 17:38:56 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-05-15 20:55:39 +0200 |
| commit | df93d53a4b7a5ce284dc0c6509057979f233cb92 (patch) | |
| tree | d99034d6d05295b9e27648dcbcf743b51c8a0c5b /package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch | |
| parent | ace946152dd0806b25bcb3812b33ab5df95966b7 (diff) | |
| download | upstream-df93d53a4b7a5ce284dc0c6509057979f233cb92.tar.gz upstream-df93d53a4b7a5ce284dc0c6509057979f233cb92.tar.bz2 upstream-df93d53a4b7a5ce284dc0c6509057979f233cb92.zip | |
mac80211: update to wireless-testing 2016-05-12
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch b/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch deleted file mode 100644 index de1b38625c..0000000000 --- a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Sven Eckelmann <sven@narfation.org> -Date: Wed, 24 Feb 2016 16:25:49 +0100 -Subject: [PATCH] mac80211: fix parsing of 40Mhz in injected radiotap - header - -The MCS bandwidth part of the radiotap header is 2 bits wide. The full 2 -bit have to compared against IEEE80211_RADIOTAP_MCS_BW_40 and not only if -the first bit is set. Otherwise IEEE80211_RADIOTAP_MCS_BW_40 can be -confused with IEEE80211_RADIOTAP_MCS_BW_20U. - -Fixes: 5ec3aed9ba4c ("mac80211: Parse legacy and HT rate in injected frames") -Signed-off-by: Sven Eckelmann <sven@narfation.org> ---- - ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -1689,7 +1689,7 @@ static bool ieee80211_parse_tx_radiotap( - bool rate_found = false; - u8 rate_retries = 0; - u16 rate_flags = 0; -- u8 mcs_known, mcs_flags; -+ u8 mcs_known, mcs_flags, mcs_bw; - int i; - - info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT | -@@ -1765,8 +1765,9 @@ static bool ieee80211_parse_tx_radiotap( - mcs_flags & IEEE80211_RADIOTAP_MCS_SGI) - rate_flags |= IEEE80211_TX_RC_SHORT_GI; - -+ mcs_bw = mcs_flags & IEEE80211_RADIOTAP_MCS_BW_MASK; - if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW && -- mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40) -+ mcs_bw == IEEE80211_RADIOTAP_MCS_BW_40) - rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH; - break; - |