|
 |
deb259 |
From 561fda1e84ed74901a9e95ce348318de9d800071 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 17:39:33 +0200
|
|
|
deb259 |
Subject: [PATCH 05/43] Revert "iwlwifi: mvm: fix HE radiotap data4 for HE-TB
|
|
|
deb259 |
PPDUs"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 2286a99c32344c41bf2d046e74d20d5c1839026e.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 18 ++++--------------
|
|
|
deb259 |
1 file changed, 4 insertions(+), 14 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-06-27 14:54:04.139678265 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:41.303345545 +0200
|
|
|
deb259 |
@@ -1109,6 +1109,7 @@
|
|
|
deb259 |
case IWL_RX_PHY_INFO_TYPE_HE_TB:
|
|
|
deb259 |
/* HE common */
|
|
|
deb259 |
he->data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_LDPC_XSYMSEG_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 |
he->data2 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRE_FEC_PAD_KNOWN |
|
|
|
deb259 |
@@ -1128,6 +1129,9 @@
|
|
|
deb259 |
he->data3 |= le16_encode_bits(le32_get_bits(phy_data->d0,
|
|
|
deb259 |
IWL_RX_PHY_DATA0_HE_LDPC_EXT_SYM),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG);
|
|
|
deb259 |
+ he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
|
|
|
deb259 |
+ IWL_RX_PHY_DATA0_HE_SPATIAL_REUSE_MASK),
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE);
|
|
|
deb259 |
he->data5 |= le16_encode_bits(le32_get_bits(phy_data->d0,
|
|
|
deb259 |
IWL_RX_PHY_DATA0_HE_PRE_FEC_PAD_MASK),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA5_PRE_FEC_PAD);
|
|
|
deb259 |
@@ -1146,20 +1150,6 @@
|
|
|
deb259 |
break;
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
- switch (phy_data->info_type) {
|
|
|
deb259 |
- case IWL_RX_PHY_INFO_TYPE_HE_MU_EXT:
|
|
|
deb259 |
- case IWL_RX_PHY_INFO_TYPE_HE_MU:
|
|
|
deb259 |
- case IWL_RX_PHY_INFO_TYPE_HE_SU:
|
|
|
deb259 |
- he->data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_SPTL_REUSE_KNOWN);
|
|
|
deb259 |
- he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d0,
|
|
|
deb259 |
- IWL_RX_PHY_DATA0_HE_SPATIAL_REUSE_MASK),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE);
|
|
|
deb259 |
- break;
|
|
|
deb259 |
- default:
|
|
|
deb259 |
- /* nothing here */
|
|
|
deb259 |
- break;
|
|
|
deb259 |
- }
|
|
|
deb259 |
-
|
|
|
deb259 |
switch (phy_data->info_type) {
|
|
|
deb259 |
case IWL_RX_PHY_INFO_TYPE_HE_MU_EXT:
|
|
|
deb259 |
he_mu->flags1 |=
|