|
 |
deb259 |
From 60ebb3bcd2e41735bd3ac849e7cee373022d3804 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:45:50 +0200
|
|
|
deb259 |
Subject: [PATCH 16/43] Revert "iwlwifi: mvm: show more HE radiotap data for TB
|
|
|
deb259 |
PPDUs"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 69f3ca8ed33dd39937ba0ea0c6643d78663db46a.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 67 ++++++++++++++-------------
|
|
|
deb259 |
1 file changed, 36 insertions(+), 31 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:43.040323389 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:43.205321284 +0200
|
|
|
deb259 |
@@ -1045,41 +1045,16 @@
|
|
|
deb259 |
{
|
|
|
deb259 |
u32 he_type = rate_n_flags & RATE_MCS_HE_TYPE_MSK;
|
|
|
deb259 |
bool sigb_data;
|
|
|
deb259 |
- u16 d1known = IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN |
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN |
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN |
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN |
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN;
|
|
|
deb259 |
- u16 d2known = IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN |
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN;
|
|
|
deb259 |
|
|
|
deb259 |
- he->data1 |= cpu_to_le16(d1known);
|
|
|
deb259 |
- he->data2 |= cpu_to_le16(d2known);
|
|
|
deb259 |
+ he->data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BSS_COLOR_KNOWN);
|
|
|
deb259 |
he->data3 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_BSS_COLOR_MASK,
|
|
|
deb259 |
he_phy_data),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR);
|
|
|
deb259 |
- he->data3 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_UPLINK,
|
|
|
deb259 |
- he_phy_data),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA3_UL_DL);
|
|
|
deb259 |
- he->data3 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_LDPC_EXT_SYM,
|
|
|
deb259 |
- he_phy_data),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG);
|
|
|
deb259 |
- he->data4 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_SPATIAL_REUSE_MASK,
|
|
|
deb259 |
- he_phy_data),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE);
|
|
|
deb259 |
- he->data5 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_PRE_FEC_PAD_MASK,
|
|
|
deb259 |
- he_phy_data),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD);
|
|
|
deb259 |
- he->data5 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_PE_DISAMBIG,
|
|
|
deb259 |
- he_phy_data),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG);
|
|
|
deb259 |
+
|
|
|
deb259 |
+ he->data2 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN);
|
|
|
deb259 |
he->data6 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_TXOP_DUR_MASK,
|
|
|
deb259 |
he_phy_data),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA6_TXOP);
|
|
|
deb259 |
- he->data6 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_DOPPLER,
|
|
|
deb259 |
- he_phy_data),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA6_DOPPLER);
|
|
|
deb259 |
|
|
|
deb259 |
switch (he_type) {
|
|
|
deb259 |
case RATE_MCS_HE_TYPE_MU:
|
|
|
deb259 |
@@ -1109,8 +1084,7 @@
|
|
|
deb259 |
IWL_RX_HE_PHY_INFO_TYPE_MU_EXT_INFO;
|
|
|
deb259 |
if (sigb_data)
|
|
|
deb259 |
iwl_mvm_decode_he_sigb(mvm, desc, rate_n_flags, he_mu);
|
|
|
deb259 |
- /* fall through */
|
|
|
deb259 |
- case RATE_MCS_HE_TYPE_TRIG:
|
|
|
deb259 |
+
|
|
|
deb259 |
he->data2 |=
|
|
|
deb259 |
cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_NUM_LTF_SYMS_KNOWN);
|
|
|
deb259 |
he->data5 |=
|
|
|
deb259 |
@@ -1129,6 +1103,37 @@
|
|
|
deb259 |
break;
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
+ if (he_type != RATE_MCS_HE_TYPE_TRIG) {
|
|
|
deb259 |
+ u16 d1known = IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_KNOWN |
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN |
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN |
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA1_DOPPLER_KNOWN;
|
|
|
deb259 |
+ u16 d2known = IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN;
|
|
|
deb259 |
+
|
|
|
deb259 |
+ he->data1 |= cpu_to_le16(d1known);
|
|
|
deb259 |
+ he->data2 |= cpu_to_le16(d2known);
|
|
|
deb259 |
+
|
|
|
deb259 |
+ he->data3 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_UPLINK,
|
|
|
deb259 |
+ he_phy_data),
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA3_UL_DL);
|
|
|
deb259 |
+ he->data3 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_LDPC_EXT_SYM,
|
|
|
deb259 |
+ he_phy_data),
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG);
|
|
|
deb259 |
+ he->data4 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_SPATIAL_REUSE_MASK,
|
|
|
deb259 |
+ he_phy_data),
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE);
|
|
|
deb259 |
+ he->data5 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_PRE_FEC_PAD_MASK,
|
|
|
deb259 |
+ he_phy_data),
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD);
|
|
|
deb259 |
+ he->data5 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_PE_DISAMBIG,
|
|
|
deb259 |
+ he_phy_data),
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG);
|
|
|
deb259 |
+ he->data6 |= le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_DOPPLER,
|
|
|
deb259 |
+ he_phy_data),
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA6_DOPPLER);
|
|
|
deb259 |
+ }
|
|
|
deb259 |
+
|
|
|
deb259 |
switch (FIELD_GET(IWL_RX_HE_PHY_INFO_TYPE_MASK, he_phy_data)) {
|
|
|
deb259 |
case IWL_RX_HE_PHY_INFO_TYPE_MU:
|
|
|
deb259 |
case IWL_RX_HE_PHY_INFO_TYPE_MU_EXT_INFO:
|