66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
|
From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
|
||
|
|
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 <lorenzo.bianconi83@gmail.com>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- 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)
|