|
 |
deb259 |
From 1235f5e955960b66e022f0aca5703b9dfc68ef30 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:46:08 +0200
|
|
|
deb259 |
Subject: [PATCH 18/43] Revert "iwlwifi: mvm: add more information to HE
|
|
|
deb259 |
radiotap"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit fed3c4ea6f8f12cb73010c969070f7dbed46ff3f.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 35 +++------------------------
|
|
|
deb259 |
1 file changed, 4 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.370319180 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:43.541316998 +0200
|
|
|
deb259 |
@@ -1044,7 +1044,6 @@
|
|
|
deb259 |
int queue)
|
|
|
deb259 |
{
|
|
|
deb259 |
u32 he_type = rate_n_flags & RATE_MCS_HE_TYPE_MSK;
|
|
|
deb259 |
- bool sigb_data;
|
|
|
deb259 |
|
|
|
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 |
@@ -1056,8 +1055,9 @@
|
|
|
deb259 |
he_phy_data),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA6_TXOP);
|
|
|
deb259 |
|
|
|
deb259 |
- switch (he_type) {
|
|
|
deb259 |
- case RATE_MCS_HE_TYPE_MU:
|
|
|
deb259 |
+ if (he_mu) {
|
|
|
deb259 |
+ bool sigb_data;
|
|
|
deb259 |
+
|
|
|
deb259 |
he_mu->flags1 |=
|
|
|
deb259 |
le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_MU_SIGB_DCM,
|
|
|
deb259 |
he_phy_data),
|
|
|
deb259 |
@@ -1091,28 +1091,13 @@
|
|
|
deb259 |
le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_HE_LTF_NUM_MASK,
|
|
|
deb259 |
he_phy_data),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA5_NUM_LTF_SYMS);
|
|
|
deb259 |
- break;
|
|
|
deb259 |
- case RATE_MCS_HE_TYPE_SU:
|
|
|
deb259 |
- case RATE_MCS_HE_TYPE_EXT_SU:
|
|
|
deb259 |
- he->data1 |=
|
|
|
deb259 |
- cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_BEAM_CHANGE_KNOWN);
|
|
|
deb259 |
- he->data3 |=
|
|
|
deb259 |
- le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_BEAM_CHNG,
|
|
|
deb259 |
- he_phy_data),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA3_BEAM_CHANGE);
|
|
|
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 |
+ IEEE80211_RADIOTAP_HE_DATA1_UL_DL_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 |
@@ -1120,18 +1105,6 @@
|
|
|
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)) {
|