|
 |
deb259 |
From 7bb5884d5829f80853f441a7e7869b569a7a1f17 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 17:39:38 +0200
|
|
|
deb259 |
Subject: [PATCH 06/43] Revert "iwlwifi: mvm: radiotap: remove UL_DL bit in HE
|
|
|
deb259 |
TRIG_BASED"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 7969454b37f25d38a48bdbd9932e8aa49ed2ed77.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 9 +++------
|
|
|
deb259 |
1 file changed, 3 insertions(+), 6 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:41.303345545 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:41.483343249 +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_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 |
@@ -1119,13 +1120,9 @@
|
|
|
deb259 |
he->data3 |= le16_encode_bits(le32_get_bits(phy_data->d0,
|
|
|
deb259 |
IWL_RX_PHY_DATA0_HE_BSS_COLOR_MASK),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR);
|
|
|
deb259 |
- if (phy_data->info_type != IWL_RX_PHY_INFO_TYPE_HE_TB &&
|
|
|
deb259 |
- phy_data->info_type != IWL_RX_PHY_INFO_TYPE_HE_TB_EXT) {
|
|
|
deb259 |
- he->data1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN);
|
|
|
deb259 |
- he->data3 |= le16_encode_bits(le32_get_bits(phy_data->d0,
|
|
|
deb259 |
+ he->data3 |= le16_encode_bits(le32_get_bits(phy_data->d0,
|
|
|
deb259 |
IWL_RX_PHY_DATA0_HE_UPLINK),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA3_UL_DL);
|
|
|
deb259 |
- }
|
|
|
deb259 |
+ IEEE80211_RADIOTAP_HE_DATA3_UL_DL);
|
|
|
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);
|