From 44713c22f8513d21aef3c4148e412d5a042f3b28 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 22 Jun 2016 16:08:09 +0200 Subject: mac80211: update to wireless-testing 2016-05-12 Signed-off-by: Felix Fietkau --- ...ac80211-parse-VHT-info-in-injected-frames.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch (limited to 'package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch') diff --git a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch b/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch deleted file mode 100644 index ac1f2517f2..0000000000 --- a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Lorenzo Bianconi -Date: Tue, 23 Feb 2016 15:43:35 +0100 -Subject: [PATCH] mac80211: parse VHT info in injected frames - -Add VHT radiotap parsing support to ieee80211_parse_tx_radiotap(). -That capability has been tested using a d-link dir-860l rev b1 running -OpenWrt trunk and mt76 driver - -Signed-off-by: Lorenzo Bianconi ---- - ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -1690,6 +1690,8 @@ static bool ieee80211_parse_tx_radiotap( - u8 rate_retries = 0; - u16 rate_flags = 0; - u8 mcs_known, mcs_flags, mcs_bw; -+ u16 vht_known; -+ u8 vht_mcs = 0, vht_nss = 0; - int i; - - info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT | -@@ -1771,6 +1773,32 @@ static bool ieee80211_parse_tx_radiotap( - rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH; - break; - -+ case IEEE80211_RADIOTAP_VHT: -+ vht_known = get_unaligned_le16(iterator.this_arg); -+ rate_found = true; -+ -+ rate_flags = IEEE80211_TX_RC_VHT_MCS; -+ if ((vht_known & IEEE80211_RADIOTAP_VHT_KNOWN_GI) && -+ (iterator.this_arg[2] & -+ IEEE80211_RADIOTAP_VHT_FLAG_SGI)) -+ rate_flags |= IEEE80211_TX_RC_SHORT_GI; -+ if (vht_known & -+ IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH) { -+ if (iterator.this_arg[3] == 1) -+ rate_flags |= -+ IEEE80211_TX_RC_40_MHZ_WIDTH; -+ else if (iterator.this_arg[3] == 4) -+ rate_flags |= -+ IEEE80211_TX_RC_80_MHZ_WIDTH; -+ else if (iterator.this_arg[3] == 11) -+ rate_flags |= -+ IEEE80211_TX_RC_160_MHZ_WIDTH; -+ } -+ -+ vht_mcs = iterator.this_arg[4] >> 4; -+ vht_nss = iterator.this_arg[4] & 0xF; -+ break; -+ - /* - * Please update the file - * Documentation/networking/mac80211-injection.txt -@@ -1796,6 +1824,9 @@ static bool ieee80211_parse_tx_radiotap( - - if (rate_flags & IEEE80211_TX_RC_MCS) { - info->control.rates[0].idx = rate; -+ } else if (rate_flags & IEEE80211_TX_RC_VHT_MCS) { -+ ieee80211_rate_set_vht(info->control.rates, vht_mcs, -+ vht_nss); - } else { - for (i = 0; i < sband->n_bitrates; i++) { - if (rate * 5 != sband->bitrates[i].bitrate) -- cgit v1.2.3